Commit 2987fc99 authored 6 years ago by Raphael Grimm

Merge branch 'master' into RobotUnit_v3

Conflicts:
	source/RobotAPI/libraries/RobotAPINJointControllers/DMPController/NJointBimanualCCDMPController.cpp

parents 23c5415d cf1a6e25

No related branches found

No related tags found

No related merge requests found

Expand all Hide whitespace changes

Inline Side-by-side

Showing

source/RobotAPI/components/units/RobotUnit/CMakeLists.txt 3 additions, 0 deletions

source/RobotAPI/components/units/RobotUnit/CMakeLists.txt
source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointCartesianVelocityControllerWithRamp.cpp 359 additions, 0 deletions

...Controllers/NJointCartesianVelocityControllerWithRamp.cpp
source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointCartesianVelocityControllerWithRamp.h 144 additions, 0 deletions

...ntControllers/NJointCartesianVelocityControllerWithRamp.h
source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointTaskSpaceImpedanceController.cpp 236 additions, 0 deletions

.../NJointControllers/NJointTaskSpaceImpedanceController.cpp
source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointTaskSpaceImpedanceController.h 130 additions, 0 deletions

...it/NJointControllers/NJointTaskSpaceImpedanceController.h
source/RobotAPI/components/units/RobotUnit/SensorValues/SensorValue1DoFActuator.h 12 additions, 0 deletions

...ts/units/RobotUnit/SensorValues/SensorValue1DoFActuator.h
source/RobotAPI/interface/CMakeLists.txt 3 additions, 0 deletions

source/RobotAPI/interface/CMakeLists.txt
source/RobotAPI/interface/core/CartesianSelection.ice 38 additions, 0 deletions

source/RobotAPI/interface/core/CartesianSelection.ice
source/RobotAPI/interface/units/RobotUnit/NJointCartesianVelocityControllerWithRamp.ice 50 additions, 0 deletions

...s/RobotUnit/NJointCartesianVelocityControllerWithRamp.ice
source/RobotAPI/interface/units/RobotUnit/NJointCartesianVelocityControllerWithRamps.ice 0 additions, 0 deletions

.../RobotUnit/NJointCartesianVelocityControllerWithRamps.ice
source/RobotAPI/interface/units/RobotUnit/NJointTaskSpaceDMPController.ice 23 additions, 11 deletions

...nterface/units/RobotUnit/NJointTaskSpaceDMPController.ice
source/RobotAPI/interface/units/RobotUnit/TaskSpaceActiveImpedanceControl.ice 53 additions, 0 deletions

...rface/units/RobotUnit/TaskSpaceActiveImpedanceControl.ice
source/RobotAPI/libraries/DMPController/TaskSpaceDMPController.cpp 35 additions, 15 deletions

...botAPI/libraries/DMPController/TaskSpaceDMPController.cpp
source/RobotAPI/libraries/DMPController/TaskSpaceDMPController.h 3 additions, 3 deletions

...RobotAPI/libraries/DMPController/TaskSpaceDMPController.h
source/RobotAPI/libraries/RobotAPINJointControllers/DMPController/NJointBimanualCCDMPController.cpp 142 additions, 363 deletions

...ntrollers/DMPController/NJointBimanualCCDMPController.cpp
source/RobotAPI/libraries/RobotAPINJointControllers/DMPController/NJointBimanualCCDMPController.h 36 additions, 16 deletions

...Controllers/DMPController/NJointBimanualCCDMPController.h
source/RobotAPI/libraries/RobotAPINJointControllers/DMPController/NJointBimanualDMPForceController.cpp 1098 additions, 0 deletions

...ollers/DMPController/NJointBimanualDMPForceController.cpp
source/RobotAPI/libraries/RobotAPINJointControllers/DMPController/NJointBimanualDMPForceController.h 240 additions, 0 deletions

...trollers/DMPController/NJointBimanualDMPForceController.h
source/RobotAPI/libraries/RobotAPINJointControllers/DMPController/NJointTSDMPController.cpp 104 additions, 65 deletions

...NJointControllers/DMPController/NJointTSDMPController.cpp
source/RobotAPI/libraries/RobotAPINJointControllers/DMPController/NJointTSDMPController.h 9 additions, 2 deletions

...PINJointControllers/DMPController/NJointTSDMPController.h

with 2718 additions and 475 deletions

Please register or to comment