Commit 01848e88 authored by Florent Lamiraux's avatar Florent Lamiraux
Browse files

Merge remote-tracking branch 'trac/master' into stable

parents 43e6e618 ac660d14
......@@ -31,11 +31,11 @@ ps.setNumericalConstraints ("balance", ["balance/relative-com",
# lock hands in closed position
lockedDofs = robot.leftHandClosed ()
for name, value in lockedDofs.iteritems ():
ps.lockDof (name, value, 0, 0)
ps.lockJoint (name, value)
lockedDofs = robot.rightHandClosed ()
for name, value in lockedDofs.iteritems ():
ps.lockDof (name, value, 0, 0)
ps.lockJoint (name, value)
q1 = [0.0, 0.0, 0.705, 1.0, 0., 0., 0.0, 0.0, 0.0, 0.0, 0.0, -0.4, 0, -1.2, -1.0, 0.0, 0.0, 0.174532, -0.174532, 0.174532, -0.174532, 0.174532, -0.174532, 0.261799, -0.17453, 0.0, -0.523599, 0.0, 0.0, 0.174532, -0.174532, 0.174532, -0.174532, 0.174532, -0.174532, 0.0, 0.0, -0.453786, 0.872665, -0.418879, 0.0, 0.0, 0.0, -0.453786, 0.872665, -0.418879, 0.0]
......
......@@ -23,7 +23,7 @@
#include <Eigen/Core>
#include <fcl/shape/geometric_shapes.h>
#include <hpp/fcl/shape/geometric_shapes.h>
#include <hpp/util/debug.hh>
#include <hpp/model/body.hh>
......
......@@ -23,7 +23,7 @@
#include <Eigen/Core>
#include <fcl/shape/geometric_shapes.h>
#include <hpp/fcl/shape/geometric_shapes.h>
#include <hpp/util/debug.hh>
#include <hpp/model/body.hh>
......
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