Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

RobotAPI
- Activity
- Members
- Labels
- Terraform modules

Snippets Groups Projects

e067cf90

Commit e067cf90 authored 3 years ago by Fabian Reister

Downloads
- Plain Diff

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

parents a9559e49 85ff0d8e

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

source/RobotAPI/components/ArViz/CMakeLists.txt 2 additions, 0 deletions

source/RobotAPI/components/ArViz/CMakeLists.txt
source/RobotAPI/components/ArViz/Client/Client.h 1 addition, 1 deletion

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

source/RobotAPI/components/ArViz/Client/Elements.h
source/RobotAPI/components/ArViz/Client/ScopedClient.cpp 43 additions, 0 deletions

source/RobotAPI/components/ArViz/Client/ScopedClient.cpp
source/RobotAPI/components/ArViz/Client/ScopedClient.h 52 additions, 0 deletions

source/RobotAPI/components/ArViz/Client/ScopedClient.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 110 additions and 5 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