Skip to content
Snippets Groups Projects
Commit 23a76abb authored by Mirko Wächter's avatar Mirko Wächter
Browse files

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
parents 358bb68f b0df92e0
No related branches found
No related tags found
No related merge requests found
Showing
with 269 additions and 61 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment