Skip to content

Commit 9f53422

Browse files
Fixed compatibility issues with Model::gravity
1 parent 30f464e commit 9f53422

File tree

1 file changed

+9
-1
lines changed

1 file changed

+9
-1
lines changed

src/model.cpp

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,15 @@ Vector7d Model::gravity(const RobotState &state, const Eigen::Vector3d &gravity_
6666
return gravity(state.q, state.m_total, state.F_x_Ctotal, gravity_earth);
6767
}
6868

69-
Vector7d Model::gravity(const RobotState &state) const { return gravity(state, state.O_ddP_O); }
69+
Vector7d Model::gravity(const RobotState &state) const {
70+
#ifdef FRANKA_0_9
71+
return gravity(state, state.O_ddP_O);
72+
#else
73+
franka::RobotState franka_robot_state;
74+
franka_robot_state.q = toStdD<7>(state.q);
75+
return toEigenD(model_.gravity(franka_robot_state));
76+
#endif
77+
}
7078

7179
Vector7d Model::gravity(
7280
const Vector7d &q, double m_total, const Eigen::Vector3d &F_x_Ctotal, const Eigen::Vector3d &gravity_earth) const {

0 commit comments

Comments
 (0)