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.

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

Added publishZeroVelocity() when state_ is changed to PLANNING. #1180

Open
wants to merge 2 commits into
base: melodic-devel
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions move_base/cfg/MoveBase.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,7 @@ gen.add("oscillation_distance", double_t, 0, "How far in meters the robot must m
gen.add("make_plan_clear_costmap", bool_t, 0, "Whether or not to clear the global costmap on make_plan service call.", True)
gen.add("make_plan_add_unreachable_goal", bool_t, 0, "Whether or not to add the original goal to the path if it is unreachable in the make_plan service call.", True)

gen.add("stop_before_planning", bool_t, 0, "Whether or not to publish a zero velocity command before planning.", False)

gen.add("restore_defaults", bool_t, 0, "Restore to the original configuration", False)
exit(gen.generate(PACKAGE, "move_base_node", "MoveBase"))
1 change: 1 addition & 0 deletions move_base/include/move_base/move_base.h
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,7 @@ namespace move_base {
ros::ServiceServer make_plan_srv_, clear_costmaps_srv_;
bool shutdown_costmaps_, clearing_rotation_allowed_, recovery_behavior_enabled_;
bool make_plan_clear_costmap_, make_plan_add_unreachable_goal_;
bool stop_before_planning_;
double oscillation_timeout_, oscillation_distance_;

MoveBaseState state_;
Expand Down
10 changes: 10 additions & 0 deletions move_base/src/move_base.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,8 @@ namespace move_base {
private_nh.param("oscillation_timeout", oscillation_timeout_, 0.0);
private_nh.param("oscillation_distance", oscillation_distance_, 0.5);

private_nh.param("stop_before_planning", stop_before_planning_, false);

// parameters of make_plan service
private_nh.param("make_plan_clear_costmap", make_plan_clear_costmap_, true);
private_nh.param("make_plan_add_unreachable_goal", make_plan_add_unreachable_goal_, true);
Expand Down Expand Up @@ -269,6 +271,8 @@ namespace move_base {
make_plan_clear_costmap_ = config.make_plan_clear_costmap;
make_plan_add_unreachable_goal_ = config.make_plan_add_unreachable_goal;

stop_before_planning_ = config.stop_before_planning;

last_config_ = config;
}

Expand Down Expand Up @@ -706,6 +710,9 @@ namespace move_base {
//we'll make sure that we reset our state for the next execution cycle
recovery_index_ = 0;
state_ = PLANNING;
if(stop_before_planning_){
publishZeroVelocity();
}

//we have a new goal so make sure the planner is awake
lock.lock();
Expand Down Expand Up @@ -744,6 +751,9 @@ namespace move_base {
//we want to go back to the planning state for the next execution cycle
recovery_index_ = 0;
state_ = PLANNING;
if(stop_before_planning_){
publishZeroVelocity();
}

//we have a new goal so make sure the planner is awake
lock.lock();
Expand Down