Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

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

Snippets Groups Projects

6589b703

Commit 6589b703 authored 1 year ago by Fabian Reister

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/master' into feature/end-effector-trajectories

parents 42d2aa93 07369a39

No related branches found

No related tags found

2 merge requests!443Feature/end effector trajectories,!437Feature/armarde tof fix

Pipeline #18146 passed 1 year ago

Stage: build-and-test

Changes 5
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

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

...API/components/armem/server/ObjectMemory/ObjectMemory.cpp
source/RobotAPI/libraries/ArmarXObjects/ObjectInfo.cpp 159 additions, 88 deletions

source/RobotAPI/libraries/ArmarXObjects/ObjectInfo.cpp
source/RobotAPI/libraries/armem_objects/server/class/Segment.cpp 20 additions, 0 deletions

...RobotAPI/libraries/armem_objects/server/class/Segment.cpp
source/RobotAPI/libraries/armem_objects/server/class/Segment.h 1 addition, 1 deletion

...e/RobotAPI/libraries/armem_objects/server/class/Segment.h
source/RobotAPI/libraries/armem_objects/server/instance/Segment.cpp 2 additions, 0 deletions

...otAPI/libraries/armem_objects/server/instance/Segment.cpp

with 185 additions and 92 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