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

AP_Motors: add override keyword to get_motor_mask

This commit is contained in:
Randy Mackay 2018-08-24 14:38:28 +09:00
parent be19f6520c
commit 22d3ab344c
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/AP_Motors/AP_MotorsCoax.h
View File

@ -47,7 +47,7 @@ public:
// get_motor_mask - returns a bitmask of which outputs are being used for motors or servos (1 means being used)
// this can be used to ensure other pwm outputs (i.e. for servos) do not conflict
virtual uint16_t get_motor_mask();
uint16_t get_motor_mask() override;
protected:
// output - sends commands to the motors

2
libraries/AP_Motors/AP_MotorsMatrix.h
View File

@ -39,7 +39,7 @@ public:
// get_motor_mask - returns a bitmask of which outputs are being used for motors (1 means being used)
// this can be used to ensure other pwm outputs (i.e. for servos) do not conflict
uint16_t get_motor_mask();
uint16_t get_motor_mask() override;
protected:
// output - sends commands to the motors

2
libraries/AP_Motors/AP_MotorsSingle.h
View File

@ -47,7 +47,7 @@ public:
// get_motor_mask - returns a bitmask of which outputs are being used for motors or servos (1 means being used)
// this can be used to ensure other pwm outputs (i.e. for servos) do not conflict
virtual uint16_t get_motor_mask();
uint16_t get_motor_mask() override;
protected:
// output - sends commands to the motors

2
libraries/AP_Motors/AP_MotorsTailsitter.h
View File

@ -27,7 +27,7 @@ public:
void output_to_motors();
// return 0 motor mask
uint16_t get_motor_mask() { return 0; }
uint16_t get_motor_mask() override { return 0; }
protected:
// calculate motor outputs

2
libraries/AP_Motors/AP_MotorsTri.h
View File

@ -42,7 +42,7 @@ public:
// get_motor_mask - returns a bitmask of which outputs are being used for motors or servos (1 means being used)
// this can be used to ensure other pwm outputs (i.e. for servos) do not conflict
virtual uint16_t get_motor_mask();
uint16_t get_motor_mask() override;
// output a thrust to all motors that match a given motor
// mask. This is used to control tiltrotor motors in forward