Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

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

Snippets Groups Projects

9f397dc0

Commit 9f397dc0 authored 4 years ago by Fabian Paus

Downloads
- Plain Diff

Merge branch 'master' of gitlab.com:ArmarX/RobotAPI

parents d4f509d5 2db19150

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

source/RobotAPI/components/units/RobotUnit/Units/TrajectoryControllerSubUnit.h 3 additions, 0 deletions

...nents/units/RobotUnit/Units/TrajectoryControllerSubUnit.h
source/RobotAPI/interface/components/TrajectoryPlayerInterface.ice 4 additions, 0 deletions

...botAPI/interface/components/TrajectoryPlayerInterface.ice
source/RobotAPI/interface/units/RobotUnit/NJointTaskSpaceDMPController.ice 1 addition, 0 deletions

...nterface/units/RobotUnit/NJointTaskSpaceDMPController.ice
source/RobotAPI/libraries/RobotAPINJointControllers/BimanualForceControllers/NJointBimanualObjLevelController.cpp 1 addition, 2 deletions

...nualForceControllers/NJointBimanualObjLevelController.cpp
source/RobotAPI/libraries/RobotAPINJointControllers/DMPController/NJointAnomalyDetectionAdaptiveWipingController.cpp 21 additions, 4 deletions

...roller/NJointAnomalyDetectionAdaptiveWipingController.cpp
source/RobotAPI/libraries/RobotAPINJointControllers/DMPController/NJointAnomalyDetectionAdaptiveWipingController.h 1 addition, 0 deletions

...ntroller/NJointAnomalyDetectionAdaptiveWipingController.h

with 31 additions and 6 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