Commit 4617e18a authored 6 years ago by ArmarX User

Merge remote-tracking branch 'origin/IMAGINERefactoring' into ImagineTest

parents 60f8fb6a 691e0e39

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

source/RobotAPI/components/units/RobotUnit/test/BasicControllerTest.cpp 12 additions, 98 deletions

...I/components/units/RobotUnit/test/BasicControllerTest.cpp
source/RobotAPI/components/units/RobotUnit/test/eval_script.inc 98 additions, 0 deletions

.../RobotAPI/components/units/RobotUnit/test/eval_script.inc
source/RobotAPI/libraries/ArmarXEtherCAT/EtherCAT.cpp 4 additions, 4 deletions

source/RobotAPI/libraries/ArmarXEtherCAT/EtherCAT.cpp
source/RobotAPI/libraries/CMakeLists.txt 1 addition, 0 deletions

source/RobotAPI/libraries/CMakeLists.txt
source/RobotAPI/libraries/KITGripperEtherCAT/CMakeLists.txt 85 additions, 0 deletions

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

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

.../JointController/JointKITGripperEmergencyStopController.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 245 additions, 0 deletions

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

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

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

...erBasisBoard/JointController/JointPWMVelocityController.h
source/RobotAPI/libraries/KITGripperEtherCAT/KITGripperBasisBoard/JointController/JointZeroTorqueController.cpp 218 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 102 additions, 0 deletions

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

...GripperBasisBoard/JointController/PWMVelocityController.h
source/RobotAPI/libraries/KITGripperEtherCAT/KITGripperBasisBoard/JointController/ParallelGripperPositionController.cpp 66 additions, 0 deletions

...ard/JointController/ParallelGripperPositionController.cpp
source/RobotAPI/libraries/KITGripperEtherCAT/KITGripperBasisBoard/JointController/ParallelGripperPositionController.h 45 additions, 0 deletions

...Board/JointController/ParallelGripperPositionController.h
source/RobotAPI/libraries/KITGripperEtherCAT/KITGripperBasisBoard/JointController/ParallelGripperVelocityController.cpp 61 additions, 0 deletions

...ard/JointController/ParallelGripperVelocityController.cpp

with 1580 additions and 102 deletions

Please register or to comment