Merge branch 'master' into 61-implement-resolution-of-memory-links-in-aron-data-during-query
# Conflicts: # source/RobotAPI/components/armem/client/ExampleMemoryClient/ExampleMemoryClient.cpp # source/RobotAPI/libraries/armem/server/ltm/disk/detail/util/filesystem_util.h
No related branches found
No related tags found
Showing
- source/RobotAPI/components/ArticulatedObjectLocalizerExample/ArticulatedObjectLocalizerExample.cpp 10 additions, 8 deletions...ectLocalizerExample/ArticulatedObjectLocalizerExample.cpp
- source/RobotAPI/components/ObjectPoseProviderExample/ObjectPoseProviderExample.cpp 1 addition, 1 deletion...s/ObjectPoseProviderExample/ObjectPoseProviderExample.cpp
- source/RobotAPI/components/armem/addon/LegacyRobotStateMemoryAdapter/LegacyRobotStateMemoryAdapter.cpp 7 additions, 7 deletions...RobotStateMemoryAdapter/LegacyRobotStateMemoryAdapter.cpp
- source/RobotAPI/components/armem/client/ExampleMemoryClient/ExampleMemoryClient.cpp 14 additions, 15 deletions.../armem/client/ExampleMemoryClient/ExampleMemoryClient.cpp
- source/RobotAPI/components/armem/client/ExampleMemoryClient/ExampleMemoryClient.h 1 addition, 1 deletion...ts/armem/client/ExampleMemoryClient/ExampleMemoryClient.h
- source/RobotAPI/components/armem/client/GraspProviderExample/GraspProviderExample.cpp 3 additions, 3 deletions...rmem/client/GraspProviderExample/GraspProviderExample.cpp
- source/RobotAPI/components/armem/client/VirtualRobotReaderExampleClient/VirtualRobotReaderExampleClient.cpp 2 additions, 5 deletions...otReaderExampleClient/VirtualRobotReaderExampleClient.cpp
- source/RobotAPI/components/armem/server/ExampleMemory/ExampleMemory.cpp 1 addition, 1 deletion...I/components/armem/server/ExampleMemory/ExampleMemory.cpp
- source/RobotAPI/components/armem/server/ExampleMemory/test/ExampleMemoryTest.cpp 1 addition, 1 deletion...nts/armem/server/ExampleMemory/test/ExampleMemoryTest.cpp
- source/RobotAPI/components/armem/server/ObjectMemory/ObjectMemory.cpp 2 additions, 0 deletions...API/components/armem/server/ObjectMemory/ObjectMemory.cpp
- source/RobotAPI/components/armem/server/RobotStateMemory/RobotStateMemory.cpp 2 additions, 2 deletions...onents/armem/server/RobotStateMemory/RobotStateMemory.cpp
- source/RobotAPI/components/units/GraspCandidateObserver.cpp 1 addition, 1 deletionsource/RobotAPI/components/units/GraspCandidateObserver.cpp
- source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointCartesianWaypointController.cpp 13 additions, 0 deletions...t/NJointControllers/NJointCartesianWaypointController.cpp
- source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointCartesianWaypointController.h 1 addition, 0 deletions...nit/NJointControllers/NJointCartesianWaypointController.h
- source/RobotAPI/gui-plugins/ObjectPoseGui/ObjectPoseGuiWidgetController.cpp 1 addition, 1 deletion...i-plugins/ObjectPoseGui/ObjectPoseGuiWidgetController.cpp
- source/RobotAPI/interface/armem/commit.ice 3 additions, 3 deletionssource/RobotAPI/interface/armem/commit.ice
- source/RobotAPI/interface/armem/memory.ice 7 additions, 5 deletionssource/RobotAPI/interface/armem/memory.ice
- source/RobotAPI/interface/armem/query.ice 7 additions, 7 deletionssource/RobotAPI/interface/armem/query.ice
- source/RobotAPI/interface/objectpose/object_pose_types.ice 3 additions, 3 deletionssource/RobotAPI/interface/objectpose/object_pose_types.ice
- source/RobotAPI/interface/units/RobotUnit/NJointCartesianWaypointController.ice 1 addition, 0 deletions...ace/units/RobotUnit/NJointCartesianWaypointController.ice
Loading
Please register or sign in to comment