Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

RobotAPI
- Activity
- Members
- Labels
- Container Registry
- Model registry

Snippets Groups Projects

1bc0e038

Commit 1bc0e038 authored 3 years ago by Fabian Reister

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/master' into feature/armem-object-memory-articulated-objects

parents 1ded09b3 a32fb42d

No related branches found

No related tags found

2 merge requests!157armem/dev => master,!141Feature/armem object memory articulated objects

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

data/RobotAPI/robotStateMemoryConfig.txt 202 additions, 0 deletions

data/RobotAPI/robotStateMemoryConfig.txt
source/RobotAPI/components/armem/server/CMakeLists.txt 1 addition, 1 deletion

source/RobotAPI/components/armem/server/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 103 additions, 177 deletions

...onents/armem/server/RobotStateMemory/RobotStateMemory.cpp
source/RobotAPI/components/armem/server/RobotStateMemory/RobotStateMemory.h 14 additions, 41 deletions

...mponents/armem/server/RobotStateMemory/RobotStateMemory.h
source/RobotAPI/libraries/armem_robot_mapping/MappingDataReader.cpp 16 additions, 6 deletions

...otAPI/libraries/armem_robot_mapping/MappingDataReader.cpp
source/RobotAPI/libraries/aron/core/CMakeLists.txt 0 additions, 1 deletion

source/RobotAPI/libraries/aron/core/CMakeLists.txt

with 339 additions and 229 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment