AP_Motors: make output_test signatures consistent and ensure override

specifier on derived classes
James-T1 · Jul 2, 2018 · 9ce9f95 · 9ce9f95
1 parent dcd3f83
commit 9ce9f95
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 9 deletions.
diff --git a/libraries/AP_Motors/AP_MotorsCoax.h b/libraries/AP_Motors/AP_MotorsCoax.h
@@ -40,7 +40,7 @@ class AP_MotorsCoax : public AP_MotorsMulticopter {
     // output_test - spin a motor at the pwm value specified
     //  motor_seq is the motor's sequence number from 1 to the number of motors on the frame
     //  pwm value is an actual pwm value that will be output, normally in the range of 1000 ~ 2000
-    virtual void        output_test(uint8_t motor_seq, int16_t pwm);
+    virtual void        output_test(uint8_t motor_seq, int16_t pwm) override;
 
     // output_to_motors - sends minimum values out to the motors
     virtual void        output_to_motors();

diff --git a/libraries/AP_Motors/AP_MotorsHeli.h b/libraries/AP_Motors/AP_MotorsHeli.h
@@ -77,7 +77,7 @@ class AP_MotorsHeli : public AP_Motors {
     // output_test - spin a motor at the pwm value specified
     //  motor_seq is the motor's sequence number from 1 to the number of motors on the frame
     //  pwm value is an actual pwm value that will be output, normally in the range of 1000 ~ 2000
-    virtual void output_test(uint8_t motor_seq, int16_t pwm) = 0;
+    virtual void output_test(uint8_t motor_seq, int16_t pwm) override = 0;
 
     //
     // heli specific methods

diff --git a/libraries/AP_Motors/AP_MotorsHeli_Dual.h b/libraries/AP_Motors/AP_MotorsHeli_Dual.h
@@ -59,7 +59,7 @@ class AP_MotorsHeli_Dual : public AP_MotorsHeli {
     void set_update_rate( uint16_t speed_hz ) override;
 
     // output_test - spin a motor at the pwm value specified
-    void output_test(uint8_t motor_seq, int16_t pwm) override;
+    virtual void output_test(uint8_t motor_seq, int16_t pwm) override;
 
     // set_desired_rotor_speed - sets target rotor speed as a number from 0 ~ 1000
     void set_desired_rotor_speed(float desired_speed) override;

diff --git a/libraries/AP_Motors/AP_MotorsHeli_Quad.h b/libraries/AP_Motors/AP_MotorsHeli_Quad.h
@@ -34,7 +34,7 @@ class AP_MotorsHeli_Quad : public AP_MotorsHeli {
     void set_update_rate( uint16_t speed_hz ) override;
 
     // output_test - spin a motor at the pwm value specified
-    void output_test(uint8_t motor_seq, int16_t pwm) override;
+    virtual void output_test(uint8_t motor_seq, int16_t pwm) override;
 
     // set_desired_rotor_speed - sets target rotor speed as a number from 0 ~ 1000
     void set_desired_rotor_speed(float desired_speed) override;

diff --git a/libraries/AP_Motors/AP_MotorsHeli_Single.h b/libraries/AP_Motors/AP_MotorsHeli_Single.h
@@ -63,7 +63,7 @@ class AP_MotorsHeli_Single : public AP_MotorsHeli {
     // output_test - spin a motor at the pwm value specified
     //  motor_seq is the motor's sequence number from 1 to the number of motors on the frame
     //  pwm value is an actual pwm value that will be output, normally in the range of 1000 ~ 2000
-    void output_test(uint8_t motor_seq, int16_t pwm) override;
+    virtual void output_test(uint8_t motor_seq, int16_t pwm) override;
 
     // set_desired_rotor_speed - sets target rotor speed as a number from 0 ~ 1
     void set_desired_rotor_speed(float desired_speed) override;

diff --git a/libraries/AP_Motors/AP_MotorsMatrix.h b/libraries/AP_Motors/AP_MotorsMatrix.h
@@ -32,7 +32,7 @@ class AP_MotorsMatrix : public AP_MotorsMulticopter {
     // output_test - spin a motor at the pwm value specified
     //  motor_seq is the motor's sequence number from 1 to the number of motors on the frame
     //  pwm value is an actual pwm value that will be output, normally in the range of 1000 ~ 2000
-    void                output_test(uint8_t motor_seq, int16_t pwm);
+    virtual void        output_test(uint8_t motor_seq, int16_t pwm) override;
 
     // output_to_motors - sends minimum values out to the motors
     void                output_to_motors();

diff --git a/libraries/AP_Motors/AP_MotorsSingle.h b/libraries/AP_Motors/AP_MotorsSingle.h
@@ -40,7 +40,7 @@ class AP_MotorsSingle : public AP_MotorsMulticopter {
     // output_test - spin a motor at the pwm value specified
     //  motor_seq is the motor's sequence number from 1 to the number of motors on the frame
     //  pwm value is an actual pwm value that will be output, normally in the range of 1000 ~ 2000
-    virtual void        output_test(uint8_t motor_seq, int16_t pwm);
+    virtual void        output_test(uint8_t motor_seq, int16_t pwm) override;
 
     // output_to_motors - sends minimum values out to the motors
     virtual void        output_to_motors();

diff --git a/libraries/AP_Motors/AP_MotorsTailsitter.h b/libraries/AP_Motors/AP_MotorsTailsitter.h
@@ -21,7 +21,7 @@ class AP_MotorsTailsitter : public AP_MotorsMulticopter {
     void set_frame_class_and_type(motor_frame_class frame_class, motor_frame_type frame_type) {}
     void set_update_rate( uint16_t speed_hz ) {}
 
-    void output_test(uint8_t motor_seq, int16_t pwm) {}
+    virtual void output_test(uint8_t motor_seq, int16_t pwm) override {}
 
     // output_to_motors - sends output to named servos
     void output_to_motors();

diff --git a/libraries/AP_Motors/AP_MotorsTri.h b/libraries/AP_Motors/AP_MotorsTri.h
@@ -35,7 +35,7 @@ class AP_MotorsTri : public AP_MotorsMulticopter {
     // output_test - spin a motor at the pwm value specified
     //  motor_seq is the motor's sequence number from 1 to the number of motors on the frame
     //  pwm value is an actual pwm value that will be output, normally in the range of 1000 ~ 2000
-    virtual void        output_test(uint8_t motor_seq, int16_t pwm);
+    virtual void        output_test(uint8_t motor_seq, int16_t pwm) override;
 
     // output_to_motors - sends minimum values out to the motors
     virtual void        output_to_motors();