Merge remote-tracking branch 'origin/armem/dev' into statechart_memory_3
No related branches found
No related tags found
This commit is part of merge request !157. Comments created here will be created in the context of that merge request.
Showing
- .gitignore 1 addition, 0 deletions.gitignore
- scenarios/ArMemObjectMemory/ArMemObjectMemory.scx 1 addition, 0 deletionsscenarios/ArMemObjectMemory/ArMemObjectMemory.scx
- scenarios/ArMemObjectMemory/config/ArticulatedObjectExampleMemoryWriterClient.cfg 251 additions, 0 deletions...ory/config/ArticulatedObjectExampleMemoryWriterClient.cfg
- scenarios/ArMemObjectMemory/config/ArticulatedObjectStateProviderExample.cfg 204 additions, 0 deletions...ctMemory/config/ArticulatedObjectStateProviderExample.cfg
- scenarios/ArMemObjectMemory/config/ObjectMemory.cfg 52 additions, 0 deletionsscenarios/ArMemObjectMemory/config/ObjectMemory.cfg
- source/RobotAPI/components/ObjectPoseProviderExample/CMakeLists.txt 3 additions, 1 deletion...otAPI/components/ObjectPoseProviderExample/CMakeLists.txt
- source/RobotAPI/components/ObjectPoseProviderExample/ObjectPoseProviderExample.cpp 0 additions, 1 deletion...s/ObjectPoseProviderExample/ObjectPoseProviderExample.cpp
- source/RobotAPI/components/armem/client/ArticulatedObjectExampleMemoryWriterClient/ArticulatedObjectExampleMemoryWriterClient.cpp 133 additions, 0 deletions...iterClient/ArticulatedObjectExampleMemoryWriterClient.cpp
- source/RobotAPI/components/armem/client/ArticulatedObjectExampleMemoryWriterClient/ArticulatedObjectExampleMemoryWriterClient.h 65 additions, 0 deletions...WriterClient/ArticulatedObjectExampleMemoryWriterClient.h
- source/RobotAPI/components/armem/client/ArticulatedObjectExampleMemoryWriterClient/CMakeLists.txt 30 additions, 0 deletions...ArticulatedObjectExampleMemoryWriterClient/CMakeLists.txt
- source/RobotAPI/components/armem/client/CMakeLists.txt 1 addition, 0 deletionssource/RobotAPI/components/armem/client/CMakeLists.txt
- source/RobotAPI/components/armem/server/ObjectMemory/ObjectMemory.cpp 63 additions, 16 deletions...API/components/armem/server/ObjectMemory/ObjectMemory.cpp
- source/RobotAPI/components/armem/server/ObjectMemory/ObjectMemory.h 6 additions, 1 deletion...otAPI/components/armem/server/ObjectMemory/ObjectMemory.h
- source/RobotAPI/libraries/armem/CMakeLists.txt 2 additions, 0 deletionssource/RobotAPI/libraries/armem/CMakeLists.txt
- source/RobotAPI/libraries/armem/client/MemoryConnector.cpp 0 additions, 0 deletionssource/RobotAPI/libraries/armem/client/MemoryConnector.cpp
- source/RobotAPI/libraries/armem/client/MemoryConnector.h 0 additions, 0 deletionssource/RobotAPI/libraries/armem/client/MemoryConnector.h
- source/RobotAPI/libraries/armem/core/MemoryID.h 5 additions, 5 deletionssource/RobotAPI/libraries/armem/core/MemoryID.h
- source/RobotAPI/libraries/armem_objects/CMakeLists.txt 33 additions, 0 deletionssource/RobotAPI/libraries/armem_objects/CMakeLists.txt
- source/RobotAPI/libraries/armem_objects/aron/Attachment.xml 30 additions, 0 deletionssource/RobotAPI/libraries/armem_objects/aron/Attachment.xml
- source/RobotAPI/libraries/armem_objects/aron/Constraint.xml 93 additions, 0 deletionssource/RobotAPI/libraries/armem_objects/aron/Constraint.xml
Loading
Please register or sign in to comment