Commit a67e8cf5 authored by Andrea Del Prete's avatar Andrea Del Prete
Browse files

Fix warnings, stop using deprecated functions of Pinocchio

Conflicts:
	src/robots/robot-wrapper.cpp
parent 12a9565b
......@@ -290,6 +290,7 @@ bool InverseDynamicsFormulationAccForce::updateRigidContactWeights(const std::st
}
}
}
return false;
}
......
......@@ -31,8 +31,7 @@ namespace tsid
bool InverseDynamicsFormulationBase::addRigidContact(ContactBase & contact)
{
addRigidContact(contact, 1e-5);
return addRigidContact(contact, 1e-5);
}
}
......@@ -72,7 +72,7 @@ namespace tsid
= data.M.transpose().triangularView<Eigen::StrictlyLower>();
// computeAllTerms does not compute the com acceleration, so we need to call centerOfMass
pinocchio::centerOfMass(m_model, data, 2, false);
pinocchio::framesForwardKinematics(m_model, data);
pinocchio::updateFramePlacements(m_model, data);
pinocchio::centerOfMass(m_model, data, q, v, Eigen::VectorXd::Zero(nv()));
}
......@@ -170,14 +170,14 @@ namespace tsid
const Model::JointIndex index,
Data::Matrix6x & J) const
{
return pinocchio::getJacobian<pinocchio::WORLD>(m_model, data, index, J);
return pinocchio::getJointJacobian(m_model, data, index, pinocchio::WORLD, J);
}
void RobotWrapper::jacobianLocal(const Data & data,
const Model::JointIndex index,
Data::Matrix6x & J) const
{
return pinocchio::getJacobian<pinocchio::LOCAL>(m_model, data, index, J);
return pinocchio::getJointJacobian(m_model, data, index, pinocchio::LOCAL, J);
}
SE3 RobotWrapper::framePosition(const Data & data,
......@@ -249,14 +249,14 @@ namespace tsid
const Model::FrameIndex index,
Data::Matrix6x & J) const
{
return pinocchio::getJacobian<pinocchio::WORLD>(m_model, data, m_model.frames[index].parent, J);
return pinocchio::getFrameJacobian(m_model, data, index, pinocchio::WORLD, J);
}
void RobotWrapper::frameJacobianLocal(const Data & data,
const Model::FrameIndex index,
Data::Matrix6x & J) const
{
return pinocchio::getFrameJacobian(m_model, data, index, J);
return pinocchio::getFrameJacobian(m_model, data, index, pinocchio::LOCAL, J);
}
// const Vector3 & com(Data & data,const Vector & q,
......
Supports Markdown
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