Accomodate DART 6.9

Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>
gazebosim · Jul 22, 2021 · 4984cec · 4984cec
1 parent b22bfea
commit 4984cec
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/dartsim/src/JointFeatures.cc b/dartsim/src/JointFeatures.cc
@@ -200,7 +200,11 @@ void JointFeatures::SetJointMinPosition(
            << "]. The command will be ignored\n";
     return;
   }
+#if DART_VERSION_AT_LEAST(6, 10, 0)
   joint->setLimitEnforcement(true);
+#else
+  joint->setPositionLimitEnforced(true);
+#endif
   // We do not check min/max mismatch, we leave that to DART.
   joint->setPositionLowerLimit(_dof, _value);
 }
@@ -221,7 +225,11 @@ void JointFeatures::SetJointMaxPosition(
            << "]. The command will be ignored\n";
     return;
   }
+#if DART_VERSION_AT_LEAST(6, 10, 0)
   joint->setLimitEnforcement(true);
+#else
+  joint->setPositionLimitEnforced(true);
+#endif
   // We do not check min/max mismatch, we leave that to DART.
   joint->setPositionUpperLimit(_dof, _value);
 }
@@ -242,7 +250,11 @@ void JointFeatures::SetJointMinVelocity(
            << "]. The command will be ignored\n";
     return;
   }
+#if DART_VERSION_AT_LEAST(6, 10, 0)
   joint->setLimitEnforcement(true);
+#else
+  joint->setPositionLimitEnforced(true);
+#endif
   // We do not check min/max mismatch, we leave that to DART.
   joint->setVelocityLowerLimit(_dof, _value);
 }
@@ -263,7 +275,11 @@ void JointFeatures::SetJointMaxVelocity(
            << "]. The command will be ignored\n";
     return;
   }
+#if DART_VERSION_AT_LEAST(6, 10, 0)
   joint->setLimitEnforcement(true);
+#else
+  joint->setPositionLimitEnforced(true);
+#endif
   // We do not check min/max mismatch, we leave that to DART.
   joint->setVelocityUpperLimit(_dof, _value);
 }

diff --git a/dartsim/src/JointFeatures_TEST.cc b/dartsim/src/JointFeatures_TEST.cc
@@ -230,6 +230,7 @@ TEST_F(JointFeaturesFixture, JointSetPositionLimitsWithForceControl)
   EXPECT_LT(pos + 0.5, joint->GetPosition(0));
 }
 
+#if DART_VERSION_AT_LEAST(6, 10, 0)
 TEST_F(JointFeaturesFixture, JointSetVelocityLimitsWithForceControl)
 {
   sdf::Root root;
@@ -632,6 +633,7 @@ TEST_F(JointFeaturesFixture, JointSetCombinedLimitsWithVelocityControl)
   }
   EXPECT_NEAR(-0.5, joint->GetVelocity(0), 1e-6);
 }
+#endif
 
 // Test detaching joints.
 TEST_F(JointFeaturesFixture, JointDetach)