Skip to content

Commit ea15808

Browse files
committed
comments Steve
Signed-off-by: Rein Appeldoorn <rein.appeldoorn@nobleo.nl>
1 parent 6e5e0c3 commit ea15808

File tree

1 file changed

+1
-4
lines changed

1 file changed

+1
-4
lines changed

‎nav2_controller/src/controller_server.cpp‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -301,9 +301,6 @@ ControllerServer::on_deactivate(const rclcpp_lifecycle::State & /*state*/)
301301
costmap_ros_->deactivate();
302302

303303
publishZeroVelocity();
304-
for (auto & controller : controllers_) {
305-
controller.second->reset();
306-
}
307304
vel_publisher_->on_deactivate();
308305

309306
remove_on_set_parameters_callback(dyn_params_handler_.get());
@@ -560,7 +557,7 @@ void ControllerServer::computeControl()
560557
return;
561558
} catch (nav2_core::ControllerTimedOut & e) {
562559
RCLCPP_ERROR(this->get_logger(), "%s", e.what());
563-
publishZeroVelocity();
560+
onGoalExit();
564561
std::shared_ptr<Action::Result> result = std::make_shared<Action::Result>();
565562
result->error_code = Action::Result::CONTROLLER_TIMED_OUT;
566563
action_server_->terminate_current(result);

0 commit comments

Comments
 (0)