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

Remove empty callbacks #1488

Open
wants to merge 2 commits into
base: master
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
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,6 @@ class AdmittanceController : public controller_interface::ChainableControllerInt
controller_interface::CallbackReturn on_deactivate(
const rclcpp_lifecycle::State & previous_state) override;

controller_interface::CallbackReturn on_cleanup(
const rclcpp_lifecycle::State & previous_state) override;

controller_interface::CallbackReturn on_error(
const rclcpp_lifecycle::State & previous_state) override;

Expand Down
6 changes: 0 additions & 6 deletions admittance_controller/src/admittance_controller.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -479,12 +479,6 @@ controller_interface::CallbackReturn AdmittanceController::on_deactivate(
return CallbackReturn::SUCCESS;
}

controller_interface::CallbackReturn AdmittanceController::on_cleanup(
const rclcpp_lifecycle::State & /*previous_state*/)
{
return controller_interface::CallbackReturn::SUCCESS;
}

controller_interface::CallbackReturn AdmittanceController::on_error(
const rclcpp_lifecycle::State & /*previous_state*/)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,6 @@ class JointTrajectoryController : public controller_interface::ControllerInterfa
controller_interface::CallbackReturn on_deactivate(
const rclcpp_lifecycle::State & previous_state) override;

controller_interface::CallbackReturn on_cleanup(
const rclcpp_lifecycle::State & previous_state) override;

controller_interface::CallbackReturn on_error(
const rclcpp_lifecycle::State & previous_state) override;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1043,12 +1043,6 @@ controller_interface::CallbackReturn JointTrajectoryController::on_deactivate(
return CallbackReturn::SUCCESS;
}

controller_interface::CallbackReturn JointTrajectoryController::on_cleanup(
const rclcpp_lifecycle::State &)
{
return CallbackReturn::SUCCESS;
}

controller_interface::CallbackReturn JointTrajectoryController::on_error(
const rclcpp_lifecycle::State &)
{
Expand Down
3 changes: 0 additions & 3 deletions pid_controller/include/pid_controller/pid_controller.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,6 @@ class PidController : public controller_interface::ChainableControllerInterface
controller_interface::CallbackReturn on_activate(
const rclcpp_lifecycle::State & previous_state) override;

controller_interface::CallbackReturn on_deactivate(
const rclcpp_lifecycle::State & previous_state) override;

controller_interface::return_type update_reference_from_subscribers(
const rclcpp::Time & time, const rclcpp::Duration & period) override;

Expand Down
6 changes: 0 additions & 6 deletions pid_controller/src/pid_controller.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -443,12 +443,6 @@ controller_interface::CallbackReturn PidController::on_activate(
return controller_interface::CallbackReturn::SUCCESS;
}

controller_interface::CallbackReturn PidController::on_deactivate(
const rclcpp_lifecycle::State & /*previous_state*/)
{
return controller_interface::CallbackReturn::SUCCESS;
}

controller_interface::return_type PidController::update_reference_from_subscribers(
const rclcpp::Time & /*time*/, const rclcpp::Duration & /*period*/)
{
Expand Down
Loading