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

Merge remote-tracking branch 'origin/master' into TCPUnitWithNewController

* 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
  ...
parents 11cbae96 cf1a6e25
Loading
Showing
with 2722 additions and 476 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