-
- Downloads
Merge branch 'armar6demo' into RampedAcceleration
* armar6demo: (67 commits) added haertbeat for laser scanners (uncommited from robot) improved head control fixed ethercat shutdown task space dmp controller: moved setting of target workspace to after phase stop check less spam more startup output Added SpeechObserver to RobotAPI added soft control by force; target trigger by distance added changed wiping position fixed the onInitComponent() compiling error added force adaptive control added deadzone for adaptivekp added adaptive position control added missing member added missing member KinematicUnitObserver rejects now joint that are not in the joint set instead of throwing an error KinematicSubUnit reports now also linked joints fixed robot visu for joints that are not in the jointset added debug viewer for target pose added workspace for controller ... Conflicts: source/RobotAPI/components/units/RobotUnit/BasicControllers.cpp
No related branches found
No related tags found
Showing
- etc/cmake/FindSOEM.cmake 63 additions, 0 deletionsetc/cmake/FindSOEM.cmake
- source/RobotAPI/components/units/KinematicUnitObserver.cpp 11 additions, 4 deletionssource/RobotAPI/components/units/KinematicUnitObserver.cpp
- source/RobotAPI/components/units/KinematicUnitObserver.h 1 addition, 0 deletionssource/RobotAPI/components/units/KinematicUnitObserver.h
- source/RobotAPI/components/units/RobotUnit/BasicControllers.cpp 51 additions, 11 deletions.../RobotAPI/components/units/RobotUnit/BasicControllers.cpp
- source/RobotAPI/components/units/RobotUnit/BasicControllers.h 11 additions, 1 deletion...ce/RobotAPI/components/units/RobotUnit/BasicControllers.h
- source/RobotAPI/components/units/RobotUnit/ControlModes.h 1 addition, 0 deletionssource/RobotAPI/components/units/RobotUnit/ControlModes.h
- source/RobotAPI/components/units/RobotUnit/ControlTargets/ControlTarget1DoFActuator.h 3 additions, 0 deletions...nits/RobotUnit/ControlTargets/ControlTarget1DoFActuator.h
- source/RobotAPI/components/units/RobotUnit/Devices/ControlDevice.cpp 5 additions, 0 deletions...tAPI/components/units/RobotUnit/Devices/ControlDevice.cpp
- source/RobotAPI/components/units/RobotUnit/Devices/ControlDevice.h 2 additions, 0 deletions...botAPI/components/units/RobotUnit/Devices/ControlDevice.h
- source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointController.cpp 39 additions, 21 deletions...ts/units/RobotUnit/NJointControllers/NJointController.cpp
- source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointController.h 14 additions, 3 deletions...ents/units/RobotUnit/NJointControllers/NJointController.h
- source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointHolonomicPlatformRelativePositionController.cpp 1 addition, 1 deletion...ers/NJointHolonomicPlatformRelativePositionController.cpp
- source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointHolonomicPlatformRelativePositionController.h 0 additions, 3 deletions...llers/NJointHolonomicPlatformRelativePositionController.h
- source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointHolonomicPlatformUnitVelocityPassThroughController.cpp 27 additions, 5 deletions...intHolonomicPlatformUnitVelocityPassThroughController.cpp
- source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointHolonomicPlatformUnitVelocityPassThroughController.h 5 additions, 2 deletions...JointHolonomicPlatformUnitVelocityPassThroughController.h
- source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointKinematicUnitPassThroughController.h 0 additions, 3 deletions...intControllers/NJointKinematicUnitPassThroughController.h
- source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointTrajectoryController.cpp 2 additions, 2 deletions...obotUnit/NJointControllers/NJointTrajectoryController.cpp
- source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointTrajectoryController.h 2 additions, 2 deletions.../RobotUnit/NJointControllers/NJointTrajectoryController.h
- source/RobotAPI/components/units/RobotUnit/RobotUnitModules/RobotUnitModulePublisher.cpp 1 addition, 1 deletion...s/RobotUnit/RobotUnitModules/RobotUnitModulePublisher.cpp
- source/RobotAPI/components/units/RobotUnit/Units/KinematicSubUnit.cpp 30 additions, 2 deletions...API/components/units/RobotUnit/Units/KinematicSubUnit.cpp
Loading
Please register or sign in to comment