Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-03 06:28:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

AP_HAL_SITL: add missing override keywords

Browse Source
This commit is contained in:
Peter Barker 2019-02-22 10:06:59 +11:00 committed by Francisco Ferreira
parent 7184d5e860
commit 03e9becfcf
3 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
libraries/AP_HAL_SITL/AnalogIn.h
View File

@ -12,16 +12,16 @@ public:
ADCSource(SITL_State *sitlState, int16_t pin);
/* implement AnalogSource virtual api: */
float read_average();
float read_latest();
void set_pin(uint8_t p);
float voltage_average();
float voltage_latest();
float voltage_average_ratiometric() {
float read_average() override;
float read_latest() override;
void set_pin(uint8_t p) override;
float voltage_average() override;
float voltage_latest() override;
float voltage_average_ratiometric() override {
return voltage_average();
}
void set_stop_pin(uint8_t pin) {}
void set_settle_time(uint16_t settle_time_ms) {}
void set_stop_pin(uint8_t pin) override {}
void set_settle_time(uint16_t settle_time_ms) override {}
private:
SITL_State *_sitlState;
@ -33,9 +33,9 @@ private:
class HALSITL::AnalogIn : public AP_HAL::AnalogIn {
public:
explicit AnalogIn(SITL_State *sitlState): _sitlState(sitlState) {}
void init();
AP_HAL::AnalogSource* channel(int16_t n);
float board_voltage(void) {
void init() override;
AP_HAL::AnalogSource* channel(int16_t n) override;
float board_voltage(void) override {
return 5.0f;
}
private:

22
libraries/AP_HAL_SITL/GPIO.h
View File

@ -5,17 +5,17 @@
class HALSITL::GPIO : public AP_HAL::GPIO {
public:
explicit GPIO(SITL_State *sitlState): _sitlState(sitlState) {}
void init();
void pinMode(uint8_t pin, uint8_t output);
uint8_t read(uint8_t pin);
void write(uint8_t pin, uint8_t value);
void toggle(uint8_t pin);
void init() override;
void pinMode(uint8_t pin, uint8_t output) override;
uint8_t read(uint8_t pin) override;
void write(uint8_t pin, uint8_t value) override;
void toggle(uint8_t pin) override;
/* Alternative interface: */
AP_HAL::DigitalSource* channel(uint16_t n);
AP_HAL::DigitalSource* channel(uint16_t n) override;
/* return true if USB cable is connected */
bool usb_connected(void);
bool usb_connected(void) override;
private:
SITL_State *_sitlState;
@ -24,10 +24,10 @@ private:
class HALSITL::DigitalSource : public AP_HAL::DigitalSource {
public:
explicit DigitalSource(uint8_t pin);
void mode(uint8_t output);
uint8_t read();
void write(uint8_t value);
void toggle();
void mode(uint8_t output) override;
uint8_t read() override;
void write(uint8_t value) override;
void toggle() override;
private:
uint8_t _pin;

6
libraries/AP_HAL_SITL/Semaphores.h
View File

@ -10,9 +10,9 @@
class HALSITL::Semaphore : public AP_HAL::Semaphore {
public:
Semaphore();
bool give();
bool take(uint32_t timeout_ms);
bool take_nonblocking();
bool give() override;
bool take(uint32_t timeout_ms) override;
bool take_nonblocking() override;
protected:
pthread_mutex_t _lock;
};