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

Merge branch 'master' of https://gitlab.com/ArmarX/RobotAPI 

* 'master' of https://gitlab.com/ArmarX/RobotAPI:
  implemented bimanualccdmp impedance control
  added torque-based bimanual
  changed collision check for zero joint
  added limited velocities
parents cbd04604 05823e4c
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 465 additions and 56 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment