Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

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

Snippets Groups Projects

c016953f

Commit c016953f authored 3 years ago by Rainer Kartmann

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/refactor/new_arch' into refactor/new_arch_armem

parents a732df97 75a886b5

No related branches found

No related tags found

1 merge request!198Refactor/new arch armem

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

source/RobotAPI/components/armem/server/RobotStateMemory/RobotStateMemory.cpp 0 additions, 4 deletions

...onents/armem/server/RobotStateMemory/RobotStateMemory.cpp
source/RobotAPI/libraries/armem_robot/aron_conversions.cpp 0 additions, 25 deletions

source/RobotAPI/libraries/armem_robot/aron_conversions.cpp
source/RobotAPI/libraries/armem_robot/aron_conversions.h 0 additions, 7 deletions

source/RobotAPI/libraries/armem_robot/aron_conversions.h
source/RobotAPI/libraries/armem_robot_state/aron_conversions.cpp 48 additions, 14 deletions

...RobotAPI/libraries/armem_robot_state/aron_conversions.cpp
source/RobotAPI/libraries/armem_robot_state/aron_conversions.h 12 additions, 1 deletion

...e/RobotAPI/libraries/armem_robot_state/aron_conversions.h
source/RobotAPI/libraries/armem_robot_state/client/common/RobotReader.cpp 78 additions, 6 deletions

...libraries/armem_robot_state/client/common/RobotReader.cpp
source/RobotAPI/libraries/armem_robot_state/client/common/RobotReader.h 10 additions, 0 deletions

...I/libraries/armem_robot_state/client/common/RobotReader.h
source/RobotAPI/libraries/armem_robot_state/server/proprioception/RobotStateWriter.cpp 1 addition, 1 deletion

...em_robot_state/server/proprioception/RobotStateWriter.cpp
source/RobotAPI/libraries/armem_robot_state/server/proprioception/RobotStateWriter.h 0 additions, 1 deletion

...rmem_robot_state/server/proprioception/RobotStateWriter.h

with 149 additions and 59 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