Merge branch 'master' into robot-state-predictions
No related branches found
No related tags found
Showing
- scenarios/ArMemObjectMemory/ArMemObjectMemory.scx 1 addition, 1 deletionscenarios/ArMemObjectMemory/ArMemObjectMemory.scx
- scenarios/ArMemObjectMemory/config/ObjectMemory.cfg 21 additions, 115 deletionsscenarios/ArMemObjectMemory/config/ObjectMemory.cfg
- scenarios/ArMemObjectMemory/config/RobotStateMemory.cfg 353 additions, 0 deletionsscenarios/ArMemObjectMemory/config/RobotStateMemory.cfg
- source/RobotAPI/components/armem/server/ObjectMemory/ObjectMemory.cpp 0 additions, 15 deletions...API/components/armem/server/ObjectMemory/ObjectMemory.cpp
- source/RobotAPI/components/armem/server/ObjectMemory/ObjectMemory.h 0 additions, 1 deletion...otAPI/components/armem/server/ObjectMemory/ObjectMemory.h
- source/RobotAPI/components/armem/server/RobotStateMemory/RobotStateMemory.cpp 1 addition, 1 deletion...onents/armem/server/RobotStateMemory/RobotStateMemory.cpp
- source/RobotAPI/interface/objectpose/object_pose_types.ice 12 additions, 7 deletionssource/RobotAPI/interface/objectpose/object_pose_types.ice
- source/RobotAPI/libraries/ArmarXObjects/ObjectPose.cpp 55 additions, 24 deletionssource/RobotAPI/libraries/ArmarXObjects/ObjectPose.cpp
- source/RobotAPI/libraries/ArmarXObjects/ObjectPose.h 15 additions, 4 deletionssource/RobotAPI/libraries/ArmarXObjects/ObjectPose.h
- source/RobotAPI/libraries/ArmarXObjects/aron/ObjectPose.xml 4 additions, 0 deletionssource/RobotAPI/libraries/ArmarXObjects/aron/ObjectPose.xml
- source/RobotAPI/libraries/ArmarXObjects/aron_conversions/objpose.cpp 2 additions, 2 deletions...tAPI/libraries/ArmarXObjects/aron_conversions/objpose.cpp
- source/RobotAPI/libraries/RobotAPIComponentPlugins/RobotUnitComponentPlugin.cpp 2 additions, 2 deletions...ies/RobotAPIComponentPlugins/RobotUnitComponentPlugin.cpp
- source/RobotAPI/libraries/armem_objects/server/instance/Segment.cpp 108 additions, 22 deletions...otAPI/libraries/armem_objects/server/instance/Segment.cpp
- source/RobotAPI/libraries/armem_objects/server/instance/Segment.h 12 additions, 2 deletions...obotAPI/libraries/armem_objects/server/instance/Segment.h
- source/RobotAPI/libraries/armem_objects/server/instance/SegmentAdapter.cpp 14 additions, 13 deletions...ibraries/armem_objects/server/instance/SegmentAdapter.cpp
- source/RobotAPI/libraries/armem_objects/server/instance/SegmentAdapter.h 1 addition, 1 deletion.../libraries/armem_objects/server/instance/SegmentAdapter.h
- source/RobotAPI/libraries/armem_robot_state/client/common/RobotReader.cpp 14 additions, 4 deletions...libraries/armem_robot_state/client/common/RobotReader.cpp
- source/RobotAPI/libraries/armem_robot_state/client/common/RobotReader.h 2 additions, 1 deletion...I/libraries/armem_robot_state/client/common/RobotReader.h
- source/RobotAPI/libraries/armem_robot_state/client/common/VirtualRobotReader.cpp 11 additions, 6 deletions...es/armem_robot_state/client/common/VirtualRobotReader.cpp
- source/RobotAPI/libraries/armem_robot_state/client/common/VirtualRobotReader.h 2 additions, 1 deletion...ries/armem_robot_state/client/common/VirtualRobotReader.h
Loading
Please register or sign in to comment