Merge branch 'master' into feature/aron-python-conv
No related branches found
No related tags found
This commit is part of merge request !325. Comments created here will be created in the context of that merge request.
Showing
- source/RobotAPI/components/armem/server/RobotStateMemory/RobotStateMemory.cpp 3 additions, 0 deletions...onents/armem/server/RobotStateMemory/RobotStateMemory.cpp
- source/RobotAPI/components/armem/server/RobotStateMemory/RobotStateMemory.h 4 additions, 0 deletions...mponents/armem/server/RobotStateMemory/RobotStateMemory.h
- source/RobotAPI/libraries/ArmarXObjects/ObjectInfo.cpp 11 additions, 8 deletionssource/RobotAPI/libraries/ArmarXObjects/ObjectInfo.cpp
- source/RobotAPI/libraries/ArmarXObjects/ObjectInfo.h 2 additions, 2 deletionssource/RobotAPI/libraries/ArmarXObjects/ObjectInfo.h
- source/RobotAPI/libraries/armem/client/util/MemoryListener.h 5 additions, 1 deletionsource/RobotAPI/libraries/armem/client/util/MemoryListener.h
- source/RobotAPI/libraries/armem_objects/client/articulated_object/ArticulatedObjectWriter.cpp 32 additions, 23 deletions...cts/client/articulated_object/ArticulatedObjectWriter.cpp
- source/RobotAPI/libraries/armem_objects/server/instance/Segment.cpp 11 additions, 2 deletions...otAPI/libraries/armem_objects/server/instance/Segment.cpp
- source/RobotAPI/libraries/armem_objects/server/instance/Visu.cpp 1 addition, 1 deletion...RobotAPI/libraries/armem_objects/server/instance/Visu.cpp
- source/RobotAPI/libraries/armem_robot/types.h 6 additions, 0 deletionssource/RobotAPI/libraries/armem_robot/types.h
- source/RobotAPI/libraries/armem_robot_state/CMakeLists.txt 1 addition, 0 deletionssource/RobotAPI/libraries/armem_robot_state/CMakeLists.txt
- source/RobotAPI/libraries/armem_robot_state/aron/Exteroception.xml 35 additions, 0 deletions...botAPI/libraries/armem_robot_state/aron/Exteroception.xml
- source/RobotAPI/libraries/armem_robot_state/aron/Proprioception.xml 0 additions, 16 deletions...otAPI/libraries/armem_robot_state/aron/Proprioception.xml
- source/RobotAPI/libraries/armem_robot_state/aron_conversions.cpp 3 additions, 2 deletions...RobotAPI/libraries/armem_robot_state/aron_conversions.cpp
- source/RobotAPI/libraries/armem_robot_state/aron_conversions.h 6 additions, 3 deletions...e/RobotAPI/libraries/armem_robot_state/aron_conversions.h
- source/RobotAPI/libraries/armem_robot_state/client/common/RobotReader.cpp 86 additions, 21 deletions...libraries/armem_robot_state/client/common/RobotReader.cpp
- source/RobotAPI/libraries/armem_robot_state/client/common/RobotReader.h 10 additions, 4 deletions...I/libraries/armem_robot_state/client/common/RobotReader.h
- source/RobotAPI/libraries/armem_robot_state/client/common/VirtualRobotReader.cpp 3 additions, 3 deletions...es/armem_robot_state/client/common/VirtualRobotReader.cpp
- source/RobotAPI/libraries/armem_robot_state/client/common/VirtualRobotReader.h 3 additions, 5 deletions...ries/armem_robot_state/client/common/VirtualRobotReader.h
- source/RobotAPI/libraries/armem_robot_state/client/common/constants.h 1 addition, 0 deletions...API/libraries/armem_robot_state/client/common/constants.h
- source/RobotAPI/libraries/armem_robot_state/memory_ids.cpp 1 addition, 0 deletionssource/RobotAPI/libraries/armem_robot_state/memory_ids.cpp
Loading
Please register or sign in to comment