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

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

* origin/master:
  added some debug output
  increased minimum simox version to 2.3.64
  try to solve torque sudden stop problem 1
  tried to fix nullspace problem 1
  added NjointTaskSpaceImpedanceDmpController
parents a543c497 bf56000a
No related branches found
No related tags found
No related merge requests found
Showing
with 714 additions and 566 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