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

Merge branch 'master' into TCPUnitWithNewController

* master:
  color utils
  works on bimanual ccdmp controller
  added filter for njointbimanualccdmp:
  test force control bimanual
  refactored HSV color utils
  implemented bimanualccdmp impedance control
  added torque-based bimanual
  changed collision check for zero joint
  added limited velocities
parents 26667450 c9477feb
No related branches found
No related tags found
Loading
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