Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix error message text about invalid servo parameters (backport #2769) #2771

Open
wants to merge 1 commit into
base: iron
Choose a base branch
from
+8 −0
Open

Fix error message text about invalid servo parameters (backport #2769) #2771

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions moveit_ros/moveit_servo/src/servo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,9 +193,17 @@ bool Servo::validateParams(const servo::Params& servo_params)
if ((servo_params.command_out_type == "std_msgs/Float64MultiArray") && servo_params.publish_joint_positions &&
servo_params.publish_joint_velocities)
{
<<<<<<< HEAD
RCLCPP_ERROR(LOGGER, "When publishing a std_msgs/Float64MultiArray, "
"you must select positions OR velocities."
"Check the parameters YAML file used to launch this node.");
=======
RCLCPP_ERROR_STREAM(
logger_, "When publishing a std_msgs/Float64MultiArray, "
"either the parameter 'publish_joint_positions' OR the parameter 'publish_joint_velocities' must "
"be set to true. But both are set to true."
<< check_yaml_string);
>>>>>>> df78880a0 (Fix error message text in servo.cpp (#2769))
params_valid = false;
}

Expand Down
Loading