Merge branch 'armem/robotstatememory_updates' of https://gitlab.com/ArmarX/RobotAPI into aron/dev
# Conflicts: # source/RobotAPI/libraries/armem_robot_mapping/MappingDataReader.cpp # source/RobotAPI/libraries/aron/core/CMakeLists.txt
No related branches found
No related tags found
Showing
- data/RobotAPI/robotStateMemoryConfig.txt 202 additions, 0 deletionsdata/RobotAPI/robotStateMemoryConfig.txt
- source/RobotAPI/components/armem/CMakeLists.txt 1 addition, 1 deletionsource/RobotAPI/components/armem/CMakeLists.txt
- source/RobotAPI/components/armem/server/RobotStateMemory/CMakeLists.txt 3 additions, 3 deletions...I/components/armem/server/RobotStateMemory/CMakeLists.txt
- source/RobotAPI/components/armem/server/RobotStateMemory/RobotStateMemory.cpp 86 additions, 171 deletions...onents/armem/server/RobotStateMemory/RobotStateMemory.cpp
- source/RobotAPI/components/armem/server/RobotStateMemory/RobotStateMemory.h 7 additions, 42 deletions...mponents/armem/server/RobotStateMemory/RobotStateMemory.h
- source/RobotAPI/libraries/armem_robot_mapping/MappingDataReader.cpp 17 additions, 14 deletions...otAPI/libraries/armem_robot_mapping/MappingDataReader.cpp
- source/RobotAPI/libraries/aron/core/CMakeLists.txt 1 addition, 1 deletionsource/RobotAPI/libraries/aron/core/CMakeLists.txt
Loading
Please register or sign in to comment