Skip to content
Snippets Groups Projects
  1. Jun 06, 2019
  2. Jun 04, 2019
  3. Jun 03, 2019
  4. May 28, 2019
  5. May 21, 2019
  6. May 13, 2019
  7. May 11, 2019
  8. May 10, 2019
  9. May 09, 2019
  10. May 08, 2019
  11. May 03, 2019
  12. May 02, 2019
  13. Apr 30, 2019
  14. Apr 25, 2019
  15. Apr 23, 2019
  16. Apr 16, 2019
  17. Apr 15, 2019
  18. Apr 13, 2019
  19. Apr 12, 2019
    • Mirko Wächter's avatar
      Merge branch 'armar6demo' into RampedAcceleration · 23a76abb
      Mirko Wächter authored
      * 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
      23a76abb
    • Mirko Wächter's avatar
      manual revert · 358bb68f
      Mirko Wächter authored and Mirko Wächter's avatar Mirko Wächter committed
      358bb68f
Loading