Commit 9aeaa2bc authored 6 years ago by Raphael Grimm

Merge branch 'master' into RobotUnit_v3

parents 806a6049 f08f5d48

No related branches found

No related tags found

1 merge request!39Robot unit v3

Expand all Hide whitespace changes

Inline Side-by-side

Showing

source/RobotAPI/components/units/RobotUnit/ControlTargets/ControlTarget1DoFActuator.h 7 additions, 7 deletions

...nits/RobotUnit/ControlTargets/ControlTarget1DoFActuator.h
source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointKinematicUnitPassThroughController.cpp 4 additions, 14 deletions

...tControllers/NJointKinematicUnitPassThroughController.cpp
source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointKinematicUnitPassThroughController.h 0 additions, 5 deletions

...intControllers/NJointKinematicUnitPassThroughController.h
source/RobotAPI/interface/units/RobotUnit/NJointTaskSpaceDMPController.ice 75 additions, 5 deletions

...nterface/units/RobotUnit/NJointTaskSpaceDMPController.ice
source/RobotAPI/interface/visualization/DebugDrawerInterface.ice 7 additions, 3 deletions

...RobotAPI/interface/visualization/DebugDrawerInterface.ice
source/RobotAPI/libraries/CMakeLists.txt 2 additions, 0 deletions

source/RobotAPI/libraries/CMakeLists.txt
source/RobotAPI/libraries/DMPController/CMakeLists.txt 50 additions, 0 deletions

source/RobotAPI/libraries/DMPController/CMakeLists.txt
source/RobotAPI/libraries/DMPController/TaskSpaceDMPController.cpp 327 additions, 0 deletions

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

...RobotAPI/libraries/DMPController/TaskSpaceDMPController.h
source/RobotAPI/libraries/DMPController/test/CMakeLists.txt 5 additions, 0 deletions

source/RobotAPI/libraries/DMPController/test/CMakeLists.txt
source/RobotAPI/libraries/DMPController/test/DMPControllerTest.cpp 36 additions, 0 deletions

...botAPI/libraries/DMPController/test/DMPControllerTest.cpp
source/RobotAPI/libraries/RobotAPINJointControllers/CMakeLists.txt 4 additions, 3 deletions

...botAPI/libraries/RobotAPINJointControllers/CMakeLists.txt
source/RobotAPI/libraries/RobotAPINJointControllers/DMPController/NJointBimanualCCDMPController.cpp 914 additions, 0 deletions

...ntrollers/DMPController/NJointBimanualCCDMPController.cpp
source/RobotAPI/libraries/RobotAPINJointControllers/DMPController/NJointBimanualCCDMPController.h 218 additions, 0 deletions

...Controllers/DMPController/NJointBimanualCCDMPController.h
source/RobotAPI/libraries/RobotAPINJointControllers/DMPController/NJointCCDMPController.cpp 134 additions, 129 deletions

...NJointControllers/DMPController/NJointCCDMPController.cpp
source/RobotAPI/libraries/RobotAPINJointControllers/DMPController/NJointCCDMPController.h 13 additions, 5 deletions

...PINJointControllers/DMPController/NJointCCDMPController.h
source/RobotAPI/libraries/RobotAPINJointControllers/DMPController/NJointJSDMPController.cpp 4 additions, 1 deletion

...NJointControllers/DMPController/NJointJSDMPController.cpp
source/RobotAPI/libraries/RobotAPINJointControllers/DMPController/NJointJSDMPController.h 1 addition, 0 deletions

...PINJointControllers/DMPController/NJointJSDMPController.h
source/RobotAPI/libraries/RobotAPINJointControllers/DMPController/NJointTSDMPController.cpp 123 additions, 244 deletions

...NJointControllers/DMPController/NJointTSDMPController.cpp
source/RobotAPI/libraries/RobotAPINJointControllers/DMPController/NJointTSDMPController.h 33 additions, 35 deletions

...PINJointControllers/DMPController/NJointTSDMPController.h

with 2153 additions and 451 deletions

Please register or to comment