Skip to content
Snippets Groups Projects
Commit 2567fa7c authored by Olivier Stasse's avatar Olivier Stasse
Browse files

[wip/jrl-walkgen-v3] Release 4.2.0

Switch to eigen.
Untabify and cut to 80 cols.
All the first stage have been checked.
Pb with all second stages.
parent 071e3bcc
No related branches found
No related tags found
No related merge requests found
......@@ -4,7 +4,7 @@
ORG= stack-of-tasks
NAME= jrl-walkgen
VERSION= 4.0.4
VERSION= 4.2.0
DISTNAME= ${NAME}-${VERSION}
PKGNAME= ${NAME}-v3-${VERSION}
......@@ -24,7 +24,7 @@ CMAKE_ARGS+= -DCMAKE_INSTALL_LIBDIR=lib
DYNAMIC_PLIST_DIRS+= share/doc/${NAME}
DEPEND_ABI.pinocchio= pinocchio<2
DEPEND_ABI.pinocchio= pinocchio>2
include ../../graphics/simple-humanoid-description/depend.mk
include ../../interfaces/jrl-mal/depend.mk
......
SHA1 (jrl-walkgen-4.0.4.tar.gz) = 1f9bcd5447dfd43b16955a276dd82d70590f934d
RMD160 (jrl-walkgen-4.0.4.tar.gz) = c05a3e06bff1a50fc452400ab9aab67019d878d5
Size (jrl-walkgen-4.0.4.tar.gz) = 16028021 bytes
SHA1 (patch-aa) = b05edcefd62be5dad8592e7b6f40079d50e61783
SHA1 (jrl-walkgen-4.2.0.tar.gz) = 94e2bbd57f17fbe4af110c53026ca56fd3261a49
RMD160 (jrl-walkgen-4.2.0.tar.gz) = c2897d2322906e8aa80842b48fea4204c4edc607
Size (jrl-walkgen-4.2.0.tar.gz) = 15500455 bytes
use se3::SINCOS, fix compilation with recent version of pinocchio
--- src/RobotDynamics/pinocchiorobot.cpp
+++ src/RobotDynamics/pinocchiorobot.cpp
@@ -238,7 +238,7 @@ bool PinocchioRobot::testInverseKinematics()
leftLegJointName.push_back("JointModelRY");
leftLegJointName.push_back("JointModelRY");
leftLegJointName.push_back("JointModelRX");
-
+
rightLegJointName.push_back("JointModelFreeFlyer");
rightLegJointName.push_back("JointModelRZ");
rightLegJointName.push_back("JointModelRX");
@@ -246,7 +246,7 @@ bool PinocchioRobot::testInverseKinematics()
rightLegJointName.push_back("JointModelRY");
rightLegJointName.push_back("JointModelRY");
rightLegJointName.push_back("JointModelRX");
-
+
leftArmJointName.push_back("JointModelRY");
leftArmJointName.push_back("JointModelRX");
leftArmJointName.push_back("JointModelRZ");
@@ -342,9 +342,9 @@ void PinocchioRobot::RPYToSpatialFreeFlyer(Eigen::Vector3d & rpy,
Eigen::AngleAxisd(rpy(1), Eigen::Vector3d::UnitY()) *
Eigen::AngleAxisd(rpy(0), Eigen::Vector3d::UnitX()) ) ;
quat.normalize();
- double c0,s0; SINCOS (rpy(2), &s0, &c0);
- double c1,s1; SINCOS (rpy(1), &s1, &c1);
- double c2,s2; SINCOS (rpy(0), &s2, &c2);
+ double c0,s0; se3::SINCOS (rpy(2), &s0, &c0);
+ double c1,s1; se3::SINCOS (rpy(1), &s1, &c1);
+ double c2,s2; se3::SINCOS (rpy(0), &s2, &c2);
m_S << -s1, 0., 1., c1 * s2, c2, 0, c1 * c2, -s2, 0;
omega = m_S * drpy ;
domega = m_S * ddrpy ;
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