Commit 563402a7 authored 4 years ago by ArmarX User

Merge branch 'kitgripper'

parents e4ed6753 00f1d3e5

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 4 additions, 0 deletions

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

...nterface/units/RobotUnit/NJointTaskSpaceDMPController.ice
source/RobotAPI/libraries/CMakeLists.txt 0 additions, 1 deletion

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

...botAPI/libraries/DMPController/TaskSpaceDMPController.cpp
source/RobotAPI/libraries/DMPController/TaskSpaceDMPController.h 13 additions, 1 deletion

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

...GripperBasisBoard/JointController/PWMVelocityController.h

with 46 additions and 1490 deletions

Please register or to comment