Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

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

Snippets Groups Projects

ef7189ca

Commit ef7189ca authored 2 years ago by Fabian Reister

Downloads
- Plain Diff

Merge branch 'aruco_object_memory' into 'master'

Aruco object memory

See merge request !289

parents eb4d2fc0 00c36ec6

No related branches found

No related tags found

1 merge request!289Aruco object memory

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

source/RobotAPI/components/armem/server/ObjectMemory/ObjectMemory.cpp 11 additions, 0 deletions

...API/components/armem/server/ObjectMemory/ObjectMemory.cpp
source/RobotAPI/components/armem/server/ObjectMemory/ObjectMemory.h 6 additions, 0 deletions

...otAPI/components/armem/server/ObjectMemory/ObjectMemory.h
source/RobotAPI/libraries/armem_objects/CMakeLists.txt 3 additions, 0 deletions

source/RobotAPI/libraries/armem_objects/CMakeLists.txt
source/RobotAPI/libraries/armem_objects/aron/Marker.xml 32 additions, 0 deletions

source/RobotAPI/libraries/armem_objects/aron/Marker.xml
source/RobotAPI/libraries/armem_objects/aron_conversions.cpp 46 additions, 18 deletions

source/RobotAPI/libraries/armem_objects/aron_conversions.cpp
source/RobotAPI/libraries/armem_objects/aron_conversions.h 3 additions, 0 deletions

source/RobotAPI/libraries/armem_objects/aron_conversions.h
source/RobotAPI/libraries/armem_objects/aron_forward_declarations.h 2 additions, 0 deletions

...otAPI/libraries/armem_objects/aron_forward_declarations.h
source/RobotAPI/libraries/armem_objects/types.cpp 64 additions, 0 deletions

source/RobotAPI/libraries/armem_objects/types.cpp
source/RobotAPI/libraries/armem_objects/types.h 30 additions, 3 deletions

source/RobotAPI/libraries/armem_objects/types.h

with 197 additions and 21 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