Commit 27eb3ffc authored 6 years ago by Armar6

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

parents 2fd2ffc0 49fed662

No related branches found

No related tags found

Hide whitespace changes

Inline Side-by-side

Showing

data/RobotAPI/VariantInfo-RobotAPI.xml 4 additions, 0 deletions

data/RobotAPI/VariantInfo-RobotAPI.xml
source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointCartesianTorqueController.h 4 additions, 0 deletions

...tUnit/NJointControllers/NJointCartesianTorqueController.h
source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointCartesianVelocityController.h 4 additions, 0 deletions

...nit/NJointControllers/NJointCartesianVelocityController.h
source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointCartesianVelocityControllerWithRamp.h 4 additions, 0 deletions

...ntControllers/NJointCartesianVelocityControllerWithRamp.h
source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointController.h 6 additions, 2 deletions

...ents/units/RobotUnit/NJointControllers/NJointController.h
source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointHolonomicPlatformRelativePositionController.cpp 3 additions, 2 deletions

...ers/NJointHolonomicPlatformRelativePositionController.cpp
source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointHolonomicPlatformRelativePositionController.h 7 additions, 2 deletions

...llers/NJointHolonomicPlatformRelativePositionController.h
source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointHolonomicPlatformUnitVelocityPassThroughController.h 4 additions, 0 deletions

...JointHolonomicPlatformUnitVelocityPassThroughController.h
source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointKinematicUnitPassThroughController.h 4 additions, 0 deletions

...intControllers/NJointKinematicUnitPassThroughController.h
source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointTCPController.h 4 additions, 0 deletions

...s/units/RobotUnit/NJointControllers/NJointTCPController.h
source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointTaskSpaceImpedanceController.h 1 addition, 1 deletion

...it/NJointControllers/NJointTaskSpaceImpedanceController.h
source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointTrajectoryController.h 5 additions, 0 deletions

.../RobotUnit/NJointControllers/NJointTrajectoryController.h
source/RobotAPI/components/units/RobotUnit/Units/PlatformSubUnit.cpp 1 addition, 1 deletion

...tAPI/components/units/RobotUnit/Units/PlatformSubUnit.cpp
source/RobotAPI/libraries/DMPController/TaskSpaceDMPController.h 1 addition, 1 deletion

...RobotAPI/libraries/DMPController/TaskSpaceDMPController.h
source/RobotAPI/libraries/RobotAPINJointControllers/DMPController/NJointBimanualCCDMPController.h 4 additions, 0 deletions

...Controllers/DMPController/NJointBimanualCCDMPController.h
source/RobotAPI/libraries/RobotAPINJointControllers/DMPController/NJointCCDMPController.h 4 additions, 0 deletions

...PINJointControllers/DMPController/NJointCCDMPController.h
source/RobotAPI/libraries/RobotAPINJointControllers/DMPController/NJointJSDMPController.h 4 additions, 0 deletions

...PINJointControllers/DMPController/NJointJSDMPController.h
source/RobotAPI/libraries/RobotAPINJointControllers/DMPController/NJointJointSpaceDMPController.h 4 additions, 0 deletions

...Controllers/DMPController/NJointJointSpaceDMPController.h
source/RobotAPI/libraries/RobotAPINJointControllers/DMPController/NJointTSDMPController.h 4 additions, 0 deletions

...PINJointControllers/DMPController/NJointTSDMPController.h
source/RobotAPI/libraries/RobotAPINJointControllers/DMPController/NJointTaskSpaceImpedanceDMPController.h 4 additions, 0 deletions

...ers/DMPController/NJointTaskSpaceImpedanceDMPController.h

with 76 additions and 9 deletions

Please register or to comment