From 1a4ab069c9f3bb595fad80de8a2c0a40b48a26e3 Mon Sep 17 00:00:00 2001 From: bresch Date: Tue, 22 Oct 2019 13:26:52 +0200 Subject: [PATCH] rate controller: add override specifiers whenever needed --- attitude_fw/ecl_pitch_controller.h | 6 +++--- attitude_fw/ecl_roll_controller.h | 6 +++--- attitude_fw/ecl_wheel_controller.h | 6 +++--- attitude_fw/ecl_yaw_controller.h | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/attitude_fw/ecl_pitch_controller.h b/attitude_fw/ecl_pitch_controller.h index b3b0183792..459ef1e1e6 100644 --- a/attitude_fw/ecl_pitch_controller.h +++ b/attitude_fw/ecl_pitch_controller.h @@ -60,9 +60,9 @@ public: ECL_PitchController() = default; ~ECL_PitchController() = default; - float control_attitude(const struct ECL_ControlData &ctl_data); - float control_euler_rate(const struct ECL_ControlData &ctl_data); - float control_bodyrate(const struct ECL_ControlData &ctl_data); + float control_attitude(const struct ECL_ControlData &ctl_data) override; + float control_euler_rate(const struct ECL_ControlData &ctl_data) override; + float control_bodyrate(const struct ECL_ControlData &ctl_data) override; /* Additional Setters */ void set_max_rate_pos(float max_rate_pos) diff --git a/attitude_fw/ecl_roll_controller.h b/attitude_fw/ecl_roll_controller.h index 1efbcb1116..e0fe925325 100644 --- a/attitude_fw/ecl_roll_controller.h +++ b/attitude_fw/ecl_roll_controller.h @@ -58,9 +58,9 @@ public: ECL_RollController() = default; ~ECL_RollController() = default; - float control_attitude(const struct ECL_ControlData &ctl_data); - float control_euler_rate(const struct ECL_ControlData &ctl_data); - float control_bodyrate(const struct ECL_ControlData &ctl_data); + float control_attitude(const struct ECL_ControlData &ctl_data) override; + float control_euler_rate(const struct ECL_ControlData &ctl_data) override; + float control_bodyrate(const struct ECL_ControlData &ctl_data) override; }; #endif // ECL_ROLL_CONTROLLER_H diff --git a/attitude_fw/ecl_wheel_controller.h b/attitude_fw/ecl_wheel_controller.h index de07c24486..861943b147 100644 --- a/attitude_fw/ecl_wheel_controller.h +++ b/attitude_fw/ecl_wheel_controller.h @@ -58,11 +58,11 @@ public: ECL_WheelController() = default; ~ECL_WheelController() = default; - float control_attitude(const struct ECL_ControlData &ctl_data); + float control_attitude(const struct ECL_ControlData &ctl_data) override; - float control_bodyrate(const struct ECL_ControlData &ctl_data); + float control_bodyrate(const struct ECL_ControlData &ctl_data) override; - float control_euler_rate(const struct ECL_ControlData &ctl_data) { (void)ctl_data; return 0; } + float control_euler_rate(const struct ECL_ControlData &ctl_data) override { (void)ctl_data; return 0; } }; #endif // ECL_HEADING_CONTROLLER_H diff --git a/attitude_fw/ecl_yaw_controller.h b/attitude_fw/ecl_yaw_controller.h index 41b9bda4fd..5ec6cd6f26 100644 --- a/attitude_fw/ecl_yaw_controller.h +++ b/attitude_fw/ecl_yaw_controller.h @@ -57,9 +57,9 @@ public: ECL_YawController() = default; ~ECL_YawController() = default; - float control_attitude(const struct ECL_ControlData &ctl_data); - float control_euler_rate(const struct ECL_ControlData &ctl_data); - float control_bodyrate(const struct ECL_ControlData &ctl_data); + float control_attitude(const struct ECL_ControlData &ctl_data) override; + float control_euler_rate(const struct ECL_ControlData &ctl_data) override; + float control_bodyrate(const struct ECL_ControlData &ctl_data) override; /* Additional setters */ void set_coordinated_min_speed(float coordinated_min_speed)