Skip to content

Commit 1106344

Browse files
bhagyeshagresarnitin2606
authored andcommitted
Simplify on_set_chained_mode implementations avoiding cpplint warnings (ros-controls#1564)
1 parent 2c73c6f commit 1106344

File tree

4 files changed

+4
-20
lines changed

4 files changed

+4
-20
lines changed

diff_drive_controller/src/diff_drive_controller.cpp

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -642,11 +642,7 @@ controller_interface::CallbackReturn DiffDriveController::configure_side(
642642
return controller_interface::CallbackReturn::SUCCESS;
643643
}
644644

645-
bool DiffDriveController::on_set_chained_mode(bool chained_mode)
646-
{
647-
// Always accept switch to/from chained mode (without linting type-cast error)
648-
return true || chained_mode;
649-
}
645+
bool DiffDriveController::on_set_chained_mode(bool /*chained_mode*/) { return true; }
650646

651647
std::vector<hardware_interface::CommandInterface>
652648
DiffDriveController::on_export_reference_interfaces()

mecanum_drive_controller/src/mecanum_drive_controller.cpp

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -298,11 +298,7 @@ MecanumDriveController::on_export_reference_interfaces()
298298
return reference_interfaces;
299299
}
300300

301-
bool MecanumDriveController::on_set_chained_mode(bool chained_mode)
302-
{
303-
// Always accept switch to/from chained mode
304-
return true || chained_mode;
305-
}
301+
bool MecanumDriveController::on_set_chained_mode(bool /*chained_mode*/) { return true; }
306302

307303
controller_interface::CallbackReturn MecanumDriveController::on_activate(
308304
const rclcpp_lifecycle::State & /*previous_state*/)

pid_controller/src/pid_controller.cpp

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -425,11 +425,7 @@ std::vector<hardware_interface::StateInterface> PidController::on_export_state_i
425425
return state_interfaces;
426426
}
427427

428-
bool PidController::on_set_chained_mode(bool chained_mode)
429-
{
430-
// Always accept switch to/from chained mode
431-
return true || chained_mode;
432-
}
428+
bool PidController::on_set_chained_mode(bool /*chained_mode*/) { return true; }
433429

434430
controller_interface::CallbackReturn PidController::on_activate(
435431
const rclcpp_lifecycle::State & /*previous_state*/)

steering_controllers_library/src/steering_controllers_library.cpp

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -513,11 +513,7 @@ SteeringControllersLibrary::on_export_reference_interfaces()
513513
return reference_interfaces;
514514
}
515515

516-
bool SteeringControllersLibrary::on_set_chained_mode(bool chained_mode)
517-
{
518-
// Always accept switch to/from chained mode
519-
return true || chained_mode;
520-
}
516+
bool SteeringControllersLibrary::on_set_chained_mode(bool /*chained_mode*/) { return true; }
521517

522518
controller_interface::CallbackReturn SteeringControllersLibrary::on_activate(
523519
const rclcpp_lifecycle::State & /*previous_state*/)

0 commit comments

Comments
 (0)