Commit e6a52c16 authored 4 years ago by ArmarX User

Revert "Merge branch 'kitgripper'"

This reverts commit 563402a7, reversing
changes made to e4ed6753.

parent 563402a7

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

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

...terface/units/RobotUnit/NJointJointSpaceDMPController.ice
source/RobotAPI/interface/units/RobotUnit/NJointTaskSpaceDMPController.ice 3 additions, 19 deletions

...nterface/units/RobotUnit/NJointTaskSpaceDMPController.ice
source/RobotAPI/libraries/CMakeLists.txt 1 addition, 0 deletions

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

...botAPI/libraries/DMPController/TaskSpaceDMPController.cpp
source/RobotAPI/libraries/DMPController/TaskSpaceDMPController.h 1 addition, 13 deletions

...RobotAPI/libraries/DMPController/TaskSpaceDMPController.h
source/RobotAPI/libraries/KITGripperEtherCAT/CMakeLists.txt 87 additions, 0 deletions

source/RobotAPI/libraries/KITGripperEtherCAT/CMakeLists.txt
source/RobotAPI/libraries/KITGripperEtherCAT/KITGripperBasisBoard/JointController/JointKITGripperEmergencyStopController.cpp 40 additions, 0 deletions

...ointController/JointKITGripperEmergencyStopController.cpp
source/RobotAPI/libraries/KITGripperEtherCAT/KITGripperBasisBoard/JointController/JointKITGripperEmergencyStopController.h 39 additions, 0 deletions

.../JointController/JointKITGripperEmergencyStopController.h
source/RobotAPI/libraries/KITGripperEtherCAT/KITGripperBasisBoard/JointController/JointKITGripperPWMPassThroughController.cpp 29 additions, 0 deletions

...intController/JointKITGripperPWMPassThroughController.cpp
source/RobotAPI/libraries/KITGripperEtherCAT/KITGripperBasisBoard/JointController/JointKITGripperPWMPassThroughController.h 31 additions, 0 deletions

...JointController/JointKITGripperPWMPassThroughController.h
source/RobotAPI/libraries/KITGripperEtherCAT/KITGripperBasisBoard/JointController/JointKITGripperStopMovementController.cpp 25 additions, 0 deletions

...JointController/JointKITGripperStopMovementController.cpp
source/RobotAPI/libraries/KITGripperEtherCAT/KITGripperBasisBoard/JointController/JointKITGripperStopMovementController.h 34 additions, 0 deletions

...d/JointController/JointKITGripperStopMovementController.h
source/RobotAPI/libraries/KITGripperEtherCAT/KITGripperBasisBoard/JointController/JointPWMPositionController.cpp 327 additions, 0 deletions

...BasisBoard/JointController/JointPWMPositionController.cpp
source/RobotAPI/libraries/KITGripperEtherCAT/KITGripperBasisBoard/JointController/JointPWMPositionController.h 88 additions, 0 deletions

...erBasisBoard/JointController/JointPWMPositionController.h
source/RobotAPI/libraries/KITGripperEtherCAT/KITGripperBasisBoard/JointController/JointPWMVelocityController.cpp 252 additions, 0 deletions

...BasisBoard/JointController/JointPWMVelocityController.cpp
source/RobotAPI/libraries/KITGripperEtherCAT/KITGripperBasisBoard/JointController/JointPWMVelocityController.h 63 additions, 0 deletions

...erBasisBoard/JointController/JointPWMVelocityController.h
source/RobotAPI/libraries/KITGripperEtherCAT/KITGripperBasisBoard/JointController/JointZeroTorqueController.cpp 211 additions, 0 deletions

...rBasisBoard/JointController/JointZeroTorqueController.cpp
source/RobotAPI/libraries/KITGripperEtherCAT/KITGripperBasisBoard/JointController/JointZeroTorqueController.h 73 additions, 0 deletions

...perBasisBoard/JointController/JointZeroTorqueController.h
source/RobotAPI/libraries/KITGripperEtherCAT/KITGripperBasisBoard/JointController/PWMVelocityController.cpp 108 additions, 0 deletions

...ipperBasisBoard/JointController/PWMVelocityController.cpp
source/RobotAPI/libraries/KITGripperEtherCAT/KITGripperBasisBoard/JointController/PWMVelocityController.h 78 additions, 0 deletions

...GripperBasisBoard/JointController/PWMVelocityController.h

with 1490 additions and 46 deletions

Please register or to comment