Skip to content

Commit

Permalink
Fix cpplint uncrustify (#4341)
Browse files Browse the repository at this point in the history
Signed-off-by: Mike Wake <[email protected]>
  • Loading branch information
aosmw committed Aug 28, 2024
1 parent 3e9f7c1 commit 64a0123
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 11 deletions.
7 changes: 2 additions & 5 deletions nav2_bt_navigator/src/navigators/navigate_through_poses.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -92,16 +92,13 @@ NavigateThroughPosesNavigator::goalCompleted(
typename ActionT::Result::SharedPtr result,
const nav2_behavior_tree::BtStatus /*final_bt_status*/)
{
if (result->error_code == 0 && internal_error_code_ != 0)
{
if (result->error_code == 0 && internal_error_code_ != 0) {
RCLCPP_WARN(logger_,

Check warning on line 96 in nav2_bt_navigator/src/navigators/navigate_through_poses.cpp

View check run for this annotation

Codecov / codecov/patch

nav2_bt_navigator/src/navigators/navigate_through_poses.cpp#L96

Added line #L96 was not covered by tests
"NavigateThroughPosesNavigator::goalCompleted, set result to internal error %d:'%s'.",
internal_error_code_, internal_error_msg_.c_str());
result->error_code = internal_error_code_;
result->error_msg = internal_error_msg_;

Check warning on line 100 in nav2_bt_navigator/src/navigators/navigate_through_poses.cpp

View check run for this annotation

Codecov / codecov/patch

nav2_bt_navigator/src/navigators/navigate_through_poses.cpp#L99-L100

Added lines #L99 - L100 were not covered by tests
}
else
{
} else {
RCLCPP_INFO(logger_, "NavigateThroughPosesNavigator::goalCompleted result %d:'%s'.",
result->error_code,
result->error_msg.c_str());
Expand Down
7 changes: 2 additions & 5 deletions nav2_bt_navigator/src/navigators/navigate_to_pose.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -106,16 +106,13 @@ NavigateToPoseNavigator::goalCompleted(
typename ActionT::Result::SharedPtr result,
const nav2_behavior_tree::BtStatus /*final_bt_status*/)
{
if (result->error_code == 0 && !internal_error_code_ == 0)
{
if (result->error_code == 0 && !internal_error_code_ == 0) {
RCLCPP_WARN(logger_,

Check warning on line 110 in nav2_bt_navigator/src/navigators/navigate_to_pose.cpp

View check run for this annotation

Codecov / codecov/patch

nav2_bt_navigator/src/navigators/navigate_to_pose.cpp#L110

Added line #L110 was not covered by tests
"NavigateThroughPosesNavigator::goalCompleted, set result to internal error %d:%s.",
internal_error_code_, internal_error_msg_.c_str());
result->error_code = internal_error_code_;
result->error_msg = internal_error_msg_;

Check warning on line 114 in nav2_bt_navigator/src/navigators/navigate_to_pose.cpp

View check run for this annotation

Codecov / codecov/patch

nav2_bt_navigator/src/navigators/navigate_to_pose.cpp#L113-L114

Added lines #L113 - L114 were not covered by tests
}
else
{
} else {
RCLCPP_INFO(logger_, "NavigateThroughPosesNavigator::goalCompleted result %d:%s.",
result->error_code,
result->error_msg.c_str());
Expand Down
3 changes: 2 additions & 1 deletion nav2_waypoint_follower/src/waypoint_follower.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -453,7 +453,8 @@ WaypointFollower::goalResponseCallback(
if (!goal) {
current_goal_status_.status = ActionStatus::FAILED;
current_goal_status_.error_code = nav2_msgs::action::FollowWaypoints::Result::UNKNOWN;
current_goal_status_.error_msg = "navigate_to_pose action client failed to send goal to server.";
current_goal_status_.error_msg =
"navigate_to_pose action client failed to send goal to server.";
RCLCPP_ERROR(get_logger(), current_goal_status_.error_msg.c_str());
}
}
Expand Down

0 comments on commit 64a0123

Please sign in to comment.