Merge remote-tracking branch 'origin/master' into...
Merge remote-tracking branch 'origin/master' into 72-add-gui-actions-to-grasp-memory-to-visualize-grasps
No related branches found
No related tags found
Showing
- scenarios/ArMemObjectMemory/config/RobotToArVizApp.cfg 9 additions, 1 deletionscenarios/ArMemObjectMemory/config/RobotToArVizApp.cfg
- source/RobotAPI/components/ObjectPoseClientExample/ObjectPoseClientExample.cpp 79 additions, 2 deletions...nents/ObjectPoseClientExample/ObjectPoseClientExample.cpp
- source/RobotAPI/components/ObjectPoseClientExample/ObjectPoseClientExample.h 10 additions, 0 deletions...ponents/ObjectPoseClientExample/ObjectPoseClientExample.h
- source/RobotAPI/components/armem/server/ExampleMemory/ExampleMemory.cpp 9 additions, 7 deletions...I/components/armem/server/ExampleMemory/ExampleMemory.cpp
- source/RobotAPI/components/armem/server/ExampleMemory/ExampleMemory.h 1 addition, 1 deletion...API/components/armem/server/ExampleMemory/ExampleMemory.h
- source/RobotAPI/components/armem/server/ObjectMemory/ObjectMemory.cpp 90 additions, 2 deletions...API/components/armem/server/ObjectMemory/ObjectMemory.cpp
- source/RobotAPI/components/armem/server/ObjectMemory/ObjectMemory.h 15 additions, 3 deletions...otAPI/components/armem/server/ObjectMemory/ObjectMemory.h
- source/RobotAPI/components/units/RobotUnit/BasicControllers.h 0 additions, 15 deletions...ce/RobotAPI/components/units/RobotUnit/BasicControllers.h
- source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointControllerBase.h 1 addition, 0 deletions.../units/RobotUnit/NJointControllers/NJointControllerBase.h
- source/RobotAPI/interface/armem/prediction.ice 1 addition, 0 deletionssource/RobotAPI/interface/armem/prediction.ice
- source/RobotAPI/interface/armem/server/PredictingMemoryInterface.ice 4 additions, 3 deletions...tAPI/interface/armem/server/PredictingMemoryInterface.ice
- source/RobotAPI/interface/objectpose/ObjectPoseStorageInterface.ice 26 additions, 0 deletions...otAPI/interface/objectpose/ObjectPoseStorageInterface.ice
- source/RobotAPI/libraries/ArmarXObjects/CMakeLists.txt 2 additions, 0 deletionssource/RobotAPI/libraries/ArmarXObjects/CMakeLists.txt
- source/RobotAPI/libraries/ArmarXObjects/predictions.cpp 87 additions, 0 deletionssource/RobotAPI/libraries/ArmarXObjects/predictions.cpp
- source/RobotAPI/libraries/ArmarXObjects/predictions.h 50 additions, 0 deletionssource/RobotAPI/libraries/ArmarXObjects/predictions.h
- source/RobotAPI/libraries/armem/client/Prediction.cpp 2 additions, 2 deletionssource/RobotAPI/libraries/armem/client/Prediction.cpp
- source/RobotAPI/libraries/armem/client/Prediction.h 1 addition, 1 deletionsource/RobotAPI/libraries/armem/client/Prediction.h
- source/RobotAPI/libraries/armem/client/Reader.cpp 9 additions, 9 deletionssource/RobotAPI/libraries/armem/client/Reader.cpp
- source/RobotAPI/libraries/armem/client/Reader.h 2 additions, 1 deletionsource/RobotAPI/libraries/armem/client/Reader.h
- source/RobotAPI/libraries/armem/server/plugins/ReadWritePluginUser.cpp 3 additions, 3 deletions...PI/libraries/armem/server/plugins/ReadWritePluginUser.cpp
Loading
Please register or sign in to comment