Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

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

Snippets Groups Projects

78a1e1ed

Commit 78a1e1ed authored 3 years ago by Fabian Reister

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/master' into feature/arviz_scoped_client

parents 27dd7ff3 e7951fc6

No related branches found

No related tags found

2 merge requests!155Feature/arviz scoped client,!154armem_robot_state: updates

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

source/RobotAPI/components/ArViz/Client/Elements.h 7 additions, 0 deletions

source/RobotAPI/components/ArViz/Client/Elements.h
source/RobotAPI/libraries/RobotStatechartHelpers/VelocityControllerHelper.cpp 1 addition, 1 deletion

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

...braries/RobotStatechartHelpers/VelocityControllerHelper.h
source/RobotAPI/libraries/armem/util/util.h 2 additions, 1 deletion

source/RobotAPI/libraries/armem/util/util.h
source/RobotAPI/libraries/core/CartesianVelocityControllerWithRamp.h 1 addition, 1 deletion

...tAPI/libraries/core/CartesianVelocityControllerWithRamp.h

with 12 additions and 4 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