Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

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

Snippets Groups Projects

00ee4e44

Commit 00ee4e44 authored 2 years ago by Fabian Tërnava

Downloads
- Plain Diff

Merge branch 'master' of https://git.h2t.iar.kit.edu/sw/armarx/robot-api into...

Merge branch 'master' of https://git.h2t.iar.kit.edu/sw/armarx/robot-api into test/merge-branch-skills-to-master

parents d857c966 a15a7c10

No related branches found

No related tags found

Loading

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

source/RobotAPI/components/armem/server/RobotStateMemory/RobotStateMemory.h 9 additions, 13 deletions

...mponents/armem/server/RobotStateMemory/RobotStateMemory.h
source/RobotAPI/libraries/armem_robot_state/server/proprioception/RobotStateWriter.cpp 49 additions, 41 deletions

...em_robot_state/server/proprioception/RobotStateWriter.cpp
source/RobotAPI/libraries/armem_robot_state/server/proprioception/RobotStateWriter.h 2 additions, 3 deletions

...rmem_robot_state/server/proprioception/RobotStateWriter.h
source/RobotAPI/libraries/armem_robot_state/server/proprioception/RobotUnitData.h 5 additions, 2 deletions

...s/armem_robot_state/server/proprioception/RobotUnitData.h
source/RobotAPI/libraries/armem_robot_state/server/proprioception/RobotUnitReader.cpp 24 additions, 32 deletions

...mem_robot_state/server/proprioception/RobotUnitReader.cpp
source/RobotAPI/libraries/armem_robot_state/server/proprioception/RobotUnitReader.h 9 additions, 18 deletions

...armem_robot_state/server/proprioception/RobotUnitReader.h
source/RobotAPI/libraries/obstacle_avoidance/CollisionModelHelper.cpp 25 additions, 0 deletions

...API/libraries/obstacle_avoidance/CollisionModelHelper.cpp
source/RobotAPI/libraries/obstacle_avoidance/CollisionModelHelper.h 5 additions, 0 deletions

...otAPI/libraries/obstacle_avoidance/CollisionModelHelper.h

with 128 additions and 109 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