Merge remote-tracking branch 'origin/master' into Ice3.7
# Conflicts: # source/RobotAPI/components/units/RobotUnit/test/BasicControllerTest.cpp
No related branches found
No related tags found
Showing
- source/RobotAPI/components/units/RobotUnit/BasicControllers.cpp 755 additions, 1 deletion.../RobotAPI/components/units/RobotUnit/BasicControllers.cpp
- source/RobotAPI/components/units/RobotUnit/BasicControllers.h 155 additions, 1 deletion...ce/RobotAPI/components/units/RobotUnit/BasicControllers.h
- source/RobotAPI/components/units/RobotUnit/CMakeLists.txt 1 addition, 0 deletionssource/RobotAPI/components/units/RobotUnit/CMakeLists.txt
- source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointController.cpp 1 addition, 1 deletion...ts/units/RobotUnit/NJointControllers/NJointController.cpp
- source/RobotAPI/components/units/RobotUnit/test/BasicControllerTest.cpp 606 additions, 233 deletions...I/components/units/RobotUnit/test/BasicControllerTest.cpp
- source/RobotAPI/components/units/RobotUnit/test/eval_script.inc 5 additions, 4 deletions.../RobotAPI/components/units/RobotUnit/test/eval_script.inc
- source/RobotAPI/components/units/RobotUnit/util/CtrlUtil.h 186 additions, 0 deletionssource/RobotAPI/components/units/RobotUnit/util/CtrlUtil.h
- source/RobotAPI/gui-plugins/KinematicUnitPlugin/kinematicunitguiplugin.ui 1 addition, 1 deletion...gui-plugins/KinematicUnitPlugin/kinematicunitguiplugin.ui
- source/RobotAPI/libraries/KITGripperEtherCAT/CMakeLists.txt 2 additions, 0 deletionssource/RobotAPI/libraries/KITGripperEtherCAT/CMakeLists.txt
- 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/JointPWMPositionController.cpp 192 additions, 136 deletions...BasisBoard/JointController/JointPWMPositionController.cpp
- source/RobotAPI/libraries/KITGripperEtherCAT/KITGripperBasisBoard/JointController/JointPWMPositionController.h 31 additions, 5 deletions...erBasisBoard/JointController/JointPWMPositionController.h
- source/RobotAPI/libraries/KITGripperEtherCAT/KITGripperBasisBoard/JointController/JointPWMVelocityController.cpp 120 additions, 109 deletions...BasisBoard/JointController/JointPWMVelocityController.cpp
- source/RobotAPI/libraries/KITGripperEtherCAT/KITGripperBasisBoard/JointController/JointPWMVelocityController.h 3 additions, 2 deletions...erBasisBoard/JointController/JointPWMVelocityController.h
- source/RobotAPI/libraries/KITGripperEtherCAT/KITGripperBasisBoard/JointController/PWMVelocityController.cpp 11 additions, 5 deletions...ipperBasisBoard/JointController/PWMVelocityController.cpp
- source/RobotAPI/libraries/KITGripperEtherCAT/KITGripperBasisBoard/JointController/PWMVelocityController.h 2 additions, 1 deletion...GripperBasisBoard/JointController/PWMVelocityController.h
- source/RobotAPI/libraries/KITGripperEtherCAT/KITGripperBasisBoard/JointController/ParallelGripperPositionController.cpp 2 additions, 2 deletions...ard/JointController/ParallelGripperPositionController.cpp
- source/RobotAPI/libraries/KITGripperEtherCAT/KITGripperBasisBoard/JointController/ParallelGripperPositionController.h 1 addition, 1 deletion...Board/JointController/ParallelGripperPositionController.h
- source/RobotAPI/libraries/KITGripperEtherCAT/KITGripperBasisBoard/KITGripperBasisBoard.cpp 10 additions, 2 deletions...perEtherCAT/KITGripperBasisBoard/KITGripperBasisBoard.cpp
Loading
Please register or sign in to comment