Commit 13a0f4e7 authored by Gabriele Buondonno's avatar Gabriele Buondonno

Merge branch 'devel' into 'devel'

Adding 10cm and 20cm walks

See merge request !12
parents 20338a32 a8855281
......@@ -118,7 +118,7 @@ plug(robot.rfToMatrix.sout, wp.footRight)
plug(robot.comTrajGen.dx, wp.vcom)
plug(robot.comTrajGen.ddx, wp.acom)
plug(robot.zmpTrajGen.x, wp.zmp)
#plug(robot.zmpTrajGen.x, wp.zmp)
robot.wp = wp
Markdown is supported
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