Skip to content

Commit f96151e

Browse files
Merge branch 'master' into feat/jtc-jerk-limits
2 parents 89d71c5 + 4027aad commit f96151e

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

joint_limits/include/joint_limits/joint_limits_rosparam.hpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -225,8 +225,8 @@ inline bool declare_parameters(
225225
* server will overwrite existing values. Values in @p limits not specified in the parameter server
226226
* remain unchanged.
227227
*
228-
* @return True if a limits specification is found (i.e., the @p joint_limits/joint_name parameter
229-
* exists in @p node), false otherwise.
228+
* @return True if a limits specification is found (i.e., if at least one parameter exists under
229+
* the `joint_limits.joint_name` namespace), false otherwise.
230230
*/
231231
inline bool get_joint_limits(
232232
const std::string & joint_name,
@@ -665,8 +665,8 @@ inline bool check_for_limits_update(
665665
* @param[out] soft_limits Where soft joint limit data gets written into. Limits specified in the
666666
* parameter server will overwrite existing values.
667667
* @return True if a complete soft limits specification is found (i.e., if all @p k_position,
668-
* @p k_velocity, @p soft_lower_limit and @p soft_upper_limit exist in
669-
* @p joint_limits/joint_name namespace), false otherwise.
668+
* @p k_velocity, @p soft_lower_limit and @p soft_upper_limit exist under
669+
* the `joint_limits.joint_name` namespace), false otherwise.
670670
*/
671671
inline bool get_joint_limits(
672672
const std::string & joint_name,

0 commit comments

Comments
 (0)