Merge branch 'Ice3.7' of https://gitlab.com/ArmarX/RobotAPI into Ice3.7
# Conflicts: # source/RobotAPI/components/units/RobotUnit/test/BasicControllerTest.cpp
No related branches found
No related tags found
Showing
- data/RobotAPI/VariantInfo-RobotAPI.xml 7 additions, 2 deletionsdata/RobotAPI/VariantInfo-RobotAPI.xml
- source/RobotAPI/components/DebugDrawer/DebugDrawerHelper.cpp 28 additions, 5 deletionssource/RobotAPI/components/DebugDrawer/DebugDrawerHelper.cpp
- source/RobotAPI/components/DebugDrawer/DebugDrawerHelper.h 12 additions, 1 deletionsource/RobotAPI/components/DebugDrawer/DebugDrawerHelper.h
- source/RobotAPI/components/GamepadControlUnit/GamepadControlUnit.cpp 8 additions, 1 deletion...tAPI/components/GamepadControlUnit/GamepadControlUnit.cpp
- source/RobotAPI/components/units/GraspCandidateObserver.cpp 21 additions, 9 deletionssource/RobotAPI/components/units/GraspCandidateObserver.cpp
- source/RobotAPI/components/units/GraspCandidateObserver.h 8 additions, 3 deletionssource/RobotAPI/components/units/GraspCandidateObserver.h
- source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointTaskSpaceImpedanceController.cpp 31 additions, 0 deletions.../NJointControllers/NJointTaskSpaceImpedanceController.cpp
- source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointTaskSpaceImpedanceController.h 6 additions, 0 deletions...it/NJointControllers/NJointTaskSpaceImpedanceController.h
- source/RobotAPI/components/units/RobotUnit/test/BasicControllerTest.cpp 14 additions, 14 deletions...I/components/units/RobotUnit/test/BasicControllerTest.cpp
- source/RobotAPI/components/units/RobotUnit/util/CtrlUtil.h 6 additions, 6 deletionssource/RobotAPI/components/units/RobotUnit/util/CtrlUtil.h
- source/RobotAPI/drivers/GamepadUnit/GamepadUnit.cpp 43 additions, 11 deletionssource/RobotAPI/drivers/GamepadUnit/GamepadUnit.cpp
- source/RobotAPI/drivers/GamepadUnit/GamepadUnit.h 10 additions, 0 deletionssource/RobotAPI/drivers/GamepadUnit/GamepadUnit.h
- source/RobotAPI/drivers/GamepadUnit/Joystick.h 6 additions, 0 deletionssource/RobotAPI/drivers/GamepadUnit/Joystick.h
- source/RobotAPI/interface/CMakeLists.txt 1 addition, 0 deletionssource/RobotAPI/interface/CMakeLists.txt
- source/RobotAPI/interface/core/CartesianPositionControllerConfig.ice 49 additions, 0 deletions...tAPI/interface/core/CartesianPositionControllerConfig.ice
- source/RobotAPI/interface/observers/GraspCandidateObserverInterface.ice 5 additions, 1 deletion...I/interface/observers/GraspCandidateObserverInterface.ice
- source/RobotAPI/interface/units/GraspCandidateProviderInterface.ice 22 additions, 8 deletions...otAPI/interface/units/GraspCandidateProviderInterface.ice
- source/RobotAPI/interface/units/RobotUnit/NJointTaskSpaceDMPController.ice 86 additions, 3 deletions...nterface/units/RobotUnit/NJointTaskSpaceDMPController.ice
- source/RobotAPI/interface/units/RobotUnit/TaskSpaceActiveImpedanceControl.ice 1 addition, 0 deletions...rface/units/RobotUnit/TaskSpaceActiveImpedanceControl.ice
- source/RobotAPI/libraries/ArmarXEtherCAT/EtherCAT.cpp 48 additions, 2 deletionssource/RobotAPI/libraries/ArmarXEtherCAT/EtherCAT.cpp
Loading
Please register or sign in to comment