Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

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

Snippets Groups Projects

0eff8401

Commit 0eff8401 authored 5 years ago by Rainer Kartmann

Downloads
- Plain Diff

Merge branch 'master' into DebugDrawerTopic

parents 13030d97 75bce163

No related branches found

No related tags found

Loading

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

source/RobotAPI/interface/units/RobotUnit/NJointJointSpaceDMPController.ice 0 additions, 2 deletions

...terface/units/RobotUnit/NJointJointSpaceDMPController.ice
source/RobotAPI/interface/units/RobotUnit/NJointTaskSpaceDMPController.ice 2 additions, 0 deletions

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

...roller/NJointAnomalyDetectionAdaptiveWipingController.cpp
source/RobotAPI/libraries/RobotAPINJointControllers/DMPController/NJointAnomalyDetectionAdaptiveWipingController.h 2 additions, 0 deletions

...ntroller/NJointAnomalyDetectionAdaptiveWipingController.h
source/RobotAPI/libraries/RobotAPINJointControllers/DMPController/NJointJSDMPController.cpp 77 additions, 19 deletions

...NJointControllers/DMPController/NJointJSDMPController.cpp
source/RobotAPI/libraries/RobotAPINJointControllers/DMPController/NJointJSDMPController.h 11 additions, 6 deletions

...PINJointControllers/DMPController/NJointJSDMPController.h

with 105 additions and 30 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