Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

AP_Mount: remove pointless virtual declarations

This commit is contained in:
Peter Barker 2018-11-08 11:49:14 +11:00 committed by Randy Mackay
parent 2d5e4dcfa2
commit edc8401457
5 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libraries/AP_Mount/AP_Mount_Alexmos.h
View File

@ -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:

10
libraries/AP_Mount/AP_Mount_SToRM32.h
View File

@ -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:

10
libraries/AP_Mount/AP_Mount_SToRM32_serial.h
View File

@ -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:

10
libraries/AP_Mount/AP_Mount_Servo.h
View File

@ -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:

12
libraries/AP_Mount/AP_Mount_SoloGimbal.h
View File

@ -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