Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

RobotAPI
- Activity
- Members
- Labels
- Terraform modules

Snippets Groups Projects

e99f4b6b

Commit e99f4b6b authored 3 years ago by Rainer Kartmann

Downloads
- Plain Diff

Merge branch 'aron-types' into 'master'

Add common ARON types

See merge request ArmarX/RobotAPI!231

parents cec653e7 2184589e

No related branches found

No related tags found

Loading

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

source/RobotAPI/libraries/aron/common/CMakeLists.txt 16 additions, 4 deletions

source/RobotAPI/libraries/aron/common/CMakeLists.txt
source/RobotAPI/libraries/aron/common/aron/Color.xml 26 additions, 0 deletions

source/RobotAPI/libraries/aron/common/aron/Color.xml
source/RobotAPI/libraries/aron/common/aron/Names.xml 25 additions, 0 deletions

source/RobotAPI/libraries/aron/common/aron/Names.xml
source/RobotAPI/libraries/aron/common/aron_conversions/simox.cpp 19 additions, 1 deletion

...RobotAPI/libraries/aron/common/aron_conversions/simox.cpp
source/RobotAPI/libraries/aron/common/aron_conversions/simox.h 6 additions, 3 deletions

...e/RobotAPI/libraries/aron/common/aron_conversions/simox.h
source/RobotAPI/libraries/aron/common/forward_declarations.h 13 additions, 0 deletions

source/RobotAPI/libraries/aron/common/forward_declarations.h
source/RobotAPI/libraries/aron/common/json_conversions.h 3 additions, 0 deletions

source/RobotAPI/libraries/aron/common/json_conversions.h
source/RobotAPI/libraries/aron/common/json_conversions/armarx.cpp 16 additions, 0 deletions

...obotAPI/libraries/aron/common/json_conversions/armarx.cpp
source/RobotAPI/libraries/aron/common/json_conversions/armarx.h 14 additions, 0 deletions

.../RobotAPI/libraries/aron/common/json_conversions/armarx.h

with 138 additions and 8 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