Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

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

Snippets Groups Projects

34fff8b6

Commit 34fff8b6 authored 4 years ago by Fabian Tërnava

Downloads
- Plain Diff

Merge branch 'master' of https://gitlab.com/ArmarX/RobotAPI into aron/dev

parents 2f60e22f 7a1e2cb8

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

source/RobotAPI/components/ObjectPoseObserver/ObjectPoseObserver.cpp 207 additions, 78 deletions

...tAPI/components/ObjectPoseObserver/ObjectPoseObserver.cpp
source/RobotAPI/components/ObjectPoseObserver/ObjectPoseObserver.h 53 additions, 27 deletions

...botAPI/components/ObjectPoseObserver/ObjectPoseObserver.h
source/RobotAPI/interface/objectpose/ObjectPoseObserver.ice 38 additions, 0 deletions

source/RobotAPI/interface/objectpose/ObjectPoseObserver.ice
source/RobotAPI/libraries/GraspingUtility/GraspCandidateHelper.cpp 11 additions, 5 deletions

...botAPI/libraries/GraspingUtility/GraspCandidateHelper.cpp
source/RobotAPI/libraries/GraspingUtility/GraspCandidateHelper.h 2 additions, 0 deletions

...RobotAPI/libraries/GraspingUtility/GraspCandidateHelper.h
source/RobotAPI/libraries/RobotStatechartHelpers/VelocityControllerHelper.cpp 1 addition, 1 deletion

...aries/RobotStatechartHelpers/VelocityControllerHelper.cpp

with 312 additions and 111 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