Merge branch 'armem/dev' of https://gitlab.com/ArmarX/RobotAPI into armem/dev
# Conflicts: # source/RobotAPI/libraries/armem/test/ArMemLTMBenchmark.cpp
No related branches found
No related tags found
Showing
- scenarios/ArMemCore/config/DebugObserver.instance1.cfg 221 additions, 0 deletionsscenarios/ArMemCore/config/DebugObserver.instance1.cfg
- scenarios/ArMemExample/config/ExampleMemory.cfg 19 additions, 42 deletionsscenarios/ArMemExample/config/ExampleMemory.cfg
- scenarios/ArMemMP/ArMemMP.scx 7 additions, 0 deletionsscenarios/ArMemMP/ArMemMP.scx
- scenarios/ArMemMP/config/DebugObserver.cfg 221 additions, 0 deletionsscenarios/ArMemMP/config/DebugObserver.cfg
- scenarios/ArMemMP/config/MPMemory.cfg 263 additions, 0 deletionsscenarios/ArMemMP/config/MPMemory.cfg
- scenarios/ArMemMP/config/RemoteGuiProviderApp.cfg 196 additions, 0 deletionsscenarios/ArMemMP/config/RemoteGuiProviderApp.cfg
- scenarios/ArMemMP/config/global.cfg 4 additions, 0 deletionsscenarios/ArMemMP/config/global.cfg
- source/RobotAPI/components/armem/server/MotionMemory/CMakeLists.txt 1 addition, 0 deletions...otAPI/components/armem/server/MotionMemory/CMakeLists.txt
- source/RobotAPI/components/armem/server/MotionMemory/MotionMemory.cpp 5 additions, 1 deletion...API/components/armem/server/MotionMemory/MotionMemory.cpp
- source/RobotAPI/components/armem/server/MotionMemory/MotionMemory.h 3 additions, 0 deletions...otAPI/components/armem/server/MotionMemory/MotionMemory.h
- source/RobotAPI/libraries/CMakeLists.txt 1 addition, 0 deletionssource/RobotAPI/libraries/CMakeLists.txt
- source/RobotAPI/libraries/DMPController/TaskSpaceDMPController.h 0 additions, 2 deletions...RobotAPI/libraries/DMPController/TaskSpaceDMPController.h
- source/RobotAPI/libraries/armem/client/MemoryNameSystem.cpp 7 additions, 0 deletionssource/RobotAPI/libraries/armem/client/MemoryNameSystem.cpp
- source/RobotAPI/libraries/armem/client/MemoryNameSystem.h 2 additions, 0 deletionssource/RobotAPI/libraries/armem/client/MemoryNameSystem.h
- source/RobotAPI/libraries/armem/client/plugins/Plugin.cpp 1 addition, 1 deletionsource/RobotAPI/libraries/armem/client/plugins/Plugin.cpp
- source/RobotAPI/libraries/armem/client/util/MemoryListener.cpp 5 additions, 0 deletions...e/RobotAPI/libraries/armem/client/util/MemoryListener.cpp
- source/RobotAPI/libraries/armem/server/ltm/base/detail/MemoryBase.h 11 additions, 3 deletions...otAPI/libraries/armem/server/ltm/base/detail/MemoryBase.h
- source/RobotAPI/libraries/armem/server/ltm/base/detail/MemoryItem.h 1 addition, 0 deletions...otAPI/libraries/armem/server/ltm/base/detail/MemoryItem.h
- source/RobotAPI/libraries/armem/server/ltm/disk/CoreSegment.cpp 8 additions, 6 deletions.../RobotAPI/libraries/armem/server/ltm/disk/CoreSegment.cpp
- source/RobotAPI/libraries/armem/server/ltm/disk/CoreSegment.h 2 additions, 0 deletions...ce/RobotAPI/libraries/armem/server/ltm/disk/CoreSegment.h
Loading
Please register or sign in to comment