Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

RobotAPI
- Activity
- Members
- Labels
- Terraform modules

Snippets Groups Projects

6149152e

Commit 6149152e authored 4 years ago by Rainer Kartmann

Downloads
- Plain Diff

Merge branch 'master' into 'armem/dev'

Update armem/dev to master

See merge request ArmarX/RobotAPI!127

parents eb4e6cab 9f5d0a93

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

source/RobotAPI/components/ArViz/Coin/VisualizationArrowCircle.h 155 additions, 31 deletions

...RobotAPI/components/ArViz/Coin/VisualizationArrowCircle.h
source/RobotAPI/components/ArViz/Coin/VisualizationMesh.h 6 additions, 10 deletions

source/RobotAPI/components/ArViz/Coin/VisualizationMesh.h
source/RobotAPI/components/ArViz/Coin/Visualizer.cpp 3 additions, 3 deletions

source/RobotAPI/components/ArViz/Coin/Visualizer.cpp
source/RobotAPI/components/ArViz/Coin/Visualizer.h 1 addition, 1 deletion

source/RobotAPI/components/ArViz/Coin/Visualizer.h
source/RobotAPI/interface/units/RobotUnit/NJointTaskSpaceDMPController.ice 7 additions, 0 deletions

...nterface/units/RobotUnit/NJointTaskSpaceDMPController.ice
source/RobotAPI/libraries/RobotAPINJointControllers/DMPController/NJointPeriodicTSDMPCompliantController.cpp 61 additions, 3 deletions

.../DMPController/NJointPeriodicTSDMPCompliantController.cpp
source/RobotAPI/libraries/RobotAPINJointControllers/DMPController/NJointPeriodicTSDMPCompliantController.h 10 additions, 1 deletion

...rs/DMPController/NJointPeriodicTSDMPCompliantController.h

with 243 additions and 49 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