- May 22, 2018
-
-
Raphael Grimm authored
-
Raphael Grimm authored
-
- May 18, 2018
-
-
Raphael Grimm authored
Conflicts: source/RobotAPI/libraries/RobotAPINJointControllers/CMakeLists.txt
-
- May 17, 2018
-
-
Lukas Kaul authored
-
https://gitlab.com/ArmarX/RobotAPIMirko Wächter authored
* 'master' of https://gitlab.com/ArmarX/RobotAPI: Adjusted relative platform position controller fixed nullspace joint values debug output added initial version of relative platform controller
-
Mirko Wächter authored
-
Mirko Wächter authored
-
Mirko Wächter authored
-
Raphael Grimm authored
Conflicts: source/RobotAPI/components/units/RobotUnit/RobotUnit.cpp
-
Pascal Weiner authored
Relative platform controller See merge request ArmarX/RobotAPI!38
-
Pascal Weiner authored
-
Pascal Weiner authored
- May 16, 2018
-
-
Raphael Grimm authored
-
Raphael Grimm authored
Conflicts: source/RobotAPI/components/units/RobotUnit/RobotUnit.cpp source/RobotAPI/components/units/RobotUnit/Units/TCPControllerSubUnit.cpp source/RobotAPI/components/units/RobotUnit/Units/TCPControllerSubUnit.h source/RobotAPI/libraries/RobotAPINJointControllers/DMPController/NJointBimanualCCDMPController.cpp source/RobotAPI/libraries/RobotAPINJointControllers/DMPController/NJointTaskSpaceDMPController.cpp source/RobotAPI/libraries/RobotAPINJointControllers/DMPController/NJointTaskSpaceDMPController.h
-
Armar6 authored
-
Armar6 authored
-
Raphael Grimm authored
Also move other batch proxies around (their scope is now limited to their usage).
-
- May 15, 2018
-
-
Pascal Weiner authored
-
Simon Ottenhaus authored
-
Raphael Grimm authored
-
- May 14, 2018
-
-
Mirko Wächter authored
-
Mirko Wächter authored
-
Mirko Wächter authored
-
- May 11, 2018
-
-
Armar6 authored
-
Armar6 authored
-
Mirko Wächter authored
* origin/master: added some debug output increased minimum simox version to 2.3.64 try to solve torque sudden stop problem 1 tried to fix nullspace problem 1 added NjointTaskSpaceImpedanceDmpController
-
You Zhou authored
-
- May 10, 2018
-
-
Mirko Wächter authored
-
Armar6 authored
-
You Zhou authored
-
You Zhou authored
- May 09, 2018
-
-
Mirko Wächter authored
* origin/master: (21 commits) fixed taskspace dmpcontroller added NJointCartesianVelocityControllerWithRamp added eigenhelpers test on jacobi transpose nullspace added finished to dmp added binary phasestop control; modified null-space joint vel added EigenHelpers added more parameters for bimanual ccdmp impedance fixed output of bimanualccdmp added kratio added kratio fixed bimanualccdmp added bimanualdmpforcecontroller added feedback pd control for taskspace DMP controller fixed both arm debug observer added task space impedance control reverted change of tsdmpcontroller test on taskspacecontroller modified njointtaskspacecontroller Added Cartesian Velocity Controller with Ramp ...
-
Raphael Grimm authored
-
Raphael Grimm authored
Update NJointCartesianVelocityControllerWithRamp and NJointTaskSpaceImpedanceController to RobotUnit v3
-
Raphael Grimm authored
Conflicts: source/RobotAPI/libraries/RobotAPINJointControllers/DMPController/NJointBimanualCCDMPController.cpp
-
- May 08, 2018
-
-
Raphael Grimm authored
-
Armar6 authored
-