Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

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

Snippets Groups Projects

400370d5

Commit 400370d5 authored 4 years ago by armar-user

Downloads
- Plain Diff

Merge branch 'master' into fix/obstacle_avoiding_controller_behavior

parents d7d79deb 7a1e2cb8

No related branches found

No related tags found

Loading

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

source/RobotAPI/components/ObjectPoseObserver/ObjectPoseObserver.cpp 302 additions, 85 deletions

...tAPI/components/ObjectPoseObserver/ObjectPoseObserver.cpp
source/RobotAPI/components/ObjectPoseObserver/ObjectPoseObserver.h 58 additions, 9 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 412 additions and 100 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