From edc840145792ed237ef6f96f9ec329c3a5a79aa0 Mon Sep 17 00:00:00 2001 From: Peter Barker Date: Thu, 8 Nov 2018 11:49:14 +1100 Subject: [PATCH] AP_Mount: remove pointless virtual declarations --- libraries/AP_Mount/AP_Mount_Alexmos.h | 10 +++++----- libraries/AP_Mount/AP_Mount_SToRM32.h | 10 +++++----- libraries/AP_Mount/AP_Mount_SToRM32_serial.h | 10 +++++----- libraries/AP_Mount/AP_Mount_Servo.h | 10 +++++----- libraries/AP_Mount/AP_Mount_SoloGimbal.h | 12 ++++++------ 5 files changed, 26 insertions(+), 26 deletions(-) diff --git a/libraries/AP_Mount/AP_Mount_Alexmos.h b/libraries/AP_Mount/AP_Mount_Alexmos.h index fe3ddbda91..8a9d4a5e05 100644 --- a/libraries/AP_Mount/AP_Mount_Alexmos.h +++ b/libraries/AP_Mount/AP_Mount_Alexmos.h @@ -70,19 +70,19 @@ public: {} // init - performs any required initialisation for this instance - virtual void init(const AP_SerialManager& serial_manager) override; + void init(const AP_SerialManager& serial_manager) override; // update mount position - should be called periodically - virtual void update() override; + void update() override; // has_pan_control - returns true if this mount can control it's pan (required for multicopters) - virtual bool has_pan_control() const override; + bool has_pan_control() const override; // set_mode - sets mount's mode - virtual void set_mode(enum MAV_MOUNT_MODE mode) override; + void set_mode(enum MAV_MOUNT_MODE mode) override; // send_mount_status - called to allow mounts to send their status to GCS via MAVLink - virtual void send_mount_status(mavlink_channel_t chan) override; + void send_mount_status(mavlink_channel_t chan) override; private: diff --git a/libraries/AP_Mount/AP_Mount_SToRM32.h b/libraries/AP_Mount/AP_Mount_SToRM32.h index 69d4c21282..d9ed8d3865 100644 --- a/libraries/AP_Mount/AP_Mount_SToRM32.h +++ b/libraries/AP_Mount/AP_Mount_SToRM32.h @@ -22,19 +22,19 @@ public: AP_Mount_SToRM32(AP_Mount &frontend, AP_Mount::mount_state &state, uint8_t instance); // init - performs any required initialisation for this instance - virtual void init(const AP_SerialManager& serial_manager) override {} + void init(const AP_SerialManager& serial_manager) override {} // update mount position - should be called periodically - virtual void update() override; + void update() override; // has_pan_control - returns true if this mount can control it's pan (required for multicopters) - virtual bool has_pan_control() const override; + bool has_pan_control() const override; // set_mode - sets mount's mode - virtual void set_mode(enum MAV_MOUNT_MODE mode) override; + void set_mode(enum MAV_MOUNT_MODE mode) override; // send_mount_status - called to allow mounts to send their status to GCS using the MOUNT_STATUS message - virtual void send_mount_status(mavlink_channel_t chan) override; + void send_mount_status(mavlink_channel_t chan) override; private: diff --git a/libraries/AP_Mount/AP_Mount_SToRM32_serial.h b/libraries/AP_Mount/AP_Mount_SToRM32_serial.h index 6590880ad6..97f4dd29bc 100644 --- a/libraries/AP_Mount/AP_Mount_SToRM32_serial.h +++ b/libraries/AP_Mount/AP_Mount_SToRM32_serial.h @@ -21,19 +21,19 @@ public: AP_Mount_SToRM32_serial(AP_Mount &frontend, AP_Mount::mount_state &state, uint8_t instance); // init - performs any required initialisation for this instance - virtual void init(const AP_SerialManager& serial_manager) override; + void init(const AP_SerialManager& serial_manager) override; // update mount position - should be called periodically - virtual void update() override; + void update() override; // has_pan_control - returns true if this mount can control it's pan (required for multicopters) - virtual bool has_pan_control() const override; + bool has_pan_control() const override; // set_mode - sets mount's mode - virtual void set_mode(enum MAV_MOUNT_MODE mode) override; + void set_mode(enum MAV_MOUNT_MODE mode) override; // send_mount_status - called to allow mounts to send their status to GCS using the MOUNT_STATUS message - virtual void send_mount_status(mavlink_channel_t chan) override; + void send_mount_status(mavlink_channel_t chan) override; private: diff --git a/libraries/AP_Mount/AP_Mount_Servo.h b/libraries/AP_Mount/AP_Mount_Servo.h index 8b5085caa7..b7415c7718 100644 --- a/libraries/AP_Mount/AP_Mount_Servo.h +++ b/libraries/AP_Mount/AP_Mount_Servo.h @@ -24,19 +24,19 @@ public: } // init - performs any required initialisation for this instance - virtual void init(const AP_SerialManager& serial_manager) override; + void init(const AP_SerialManager& serial_manager) override; // update mount position - should be called periodically - virtual void update() override; + void update() override; // has_pan_control - returns true if this mount can control it's pan (required for multicopters) - virtual bool has_pan_control() const override { return _flags.pan_control; } + bool has_pan_control() const override { return _flags.pan_control; } // set_mode - sets mount's mode - virtual void set_mode(enum MAV_MOUNT_MODE mode) override; + void set_mode(enum MAV_MOUNT_MODE mode) override; // send_mount_status - called to allow mounts to send their status to GCS using the MOUNT_STATUS message - virtual void send_mount_status(mavlink_channel_t chan) override; + void send_mount_status(mavlink_channel_t chan) override; private: diff --git a/libraries/AP_Mount/AP_Mount_SoloGimbal.h b/libraries/AP_Mount/AP_Mount_SoloGimbal.h index bfe44c3406..5e8c5e2ea6 100644 --- a/libraries/AP_Mount/AP_Mount_SoloGimbal.h +++ b/libraries/AP_Mount/AP_Mount_SoloGimbal.h @@ -24,19 +24,19 @@ public: AP_Mount_SoloGimbal(AP_Mount &frontend, AP_Mount::mount_state &state, uint8_t instance); // init - performs any required initialisation for this instance - virtual void init(const AP_SerialManager& serial_manager) override; + void init(const AP_SerialManager& serial_manager) override; // update mount position - should be called periodically - virtual void update() override; + void update() override; // has_pan_control - returns true if this mount can control it's pan (required for multicopters) - virtual bool has_pan_control() const override; + bool has_pan_control() const override; // set_mode - sets mount's mode - virtual void set_mode(enum MAV_MOUNT_MODE mode) override; + void set_mode(enum MAV_MOUNT_MODE mode) override; // send_mount_status - called to allow mounts to send their status to GCS using the MOUNT_STATUS message - virtual void send_mount_status(mavlink_channel_t chan) override; + void send_mount_status(mavlink_channel_t chan) override; // handle a GIMBAL_REPORT message void handle_gimbal_report(mavlink_channel_t chan, const mavlink_message_t *msg) override; @@ -46,7 +46,7 @@ public: // send a GIMBAL_REPORT message to the GCS void send_gimbal_report(mavlink_channel_t chan) override; - virtual void update_fast() override; + void update_fast() override; private: // internal variables