Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-02-26 09:43:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

AP_BoardConfig: unify singleton naming to _singleton and get_singleton()

Browse Source
This commit is contained in:
Tom Pittenger 2019-02-10 10:32:23 -08:00 committed by Tom Pittenger
parent 7fc4003c69
commit ab95c8e5ee
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/AP_BoardConfig/AP_BoardConfig.cpp
View File

@ -105,7 +105,7 @@
#endif #endif
extern const AP_HAL::HAL& hal; extern const AP_HAL::HAL& hal;
AP_BoardConfig *AP_BoardConfig::instance; AP_BoardConfig *AP_BoardConfig::_singleton;
// table of user settable parameters // table of user settable parameters
const AP_Param::GroupInfo AP_BoardConfig::var_info[] = { const AP_Param::GroupInfo AP_BoardConfig::var_info[] = {

18
libraries/AP_BoardConfig/AP_BoardConfig.h
View File

@ -32,7 +32,7 @@ extern "C" typedef int (*main_fn_t)(int argc, char **);
class AP_BoardConfig { class AP_BoardConfig {
public: public:
AP_BoardConfig() { AP_BoardConfig() {
instance = this; _singleton = this;
AP_Param::setup_object_defaults(this, var_info); AP_Param::setup_object_defaults(this, var_info);
}; };
@ -41,8 +41,8 @@ public:
AP_BoardConfig &operator=(const AP_BoardConfig&) = delete; AP_BoardConfig &operator=(const AP_BoardConfig&) = delete;
// singleton support // singleton support
static AP_BoardConfig *get_instance(void) { static AP_BoardConfig *get_singleton(void) {
return instance; return _singleton;
} }
void init(void); void init(void);
@ -106,7 +106,7 @@ public:
// crc check of IO firmware on startup // crc check of IO firmware on startup
static uint8_t io_enabled(void) { static uint8_t io_enabled(void) {
#if AP_FEATURE_BOARD_DETECT #if AP_FEATURE_BOARD_DETECT
return instance?uint8_t(instance->state.io_enable.get()):0; return _singleton?uint8_t(_singleton->state.io_enable.get()):0;
#else #else
return 0; return 0;
#endif #endif
@ -114,7 +114,7 @@ public:
// get number of PWM outputs enabled on FMU // get number of PWM outputs enabled on FMU
static uint8_t get_pwm_count(void) { static uint8_t get_pwm_count(void) {
return instance?instance->pwm_count.get():8; return _singleton?_singleton->pwm_count.get():8;
} }
#if HAL_HAVE_SAFETY_SWITCH #if HAL_HAVE_SAFETY_SWITCH
@ -143,25 +143,25 @@ public:
#if HAL_HAVE_BOARD_VOLTAGE #if HAL_HAVE_BOARD_VOLTAGE
// get minimum board voltage // get minimum board voltage
static float get_minimum_board_voltage(void) { static float get_minimum_board_voltage(void) {
return instance?instance->_vbus_min.get():0; return _singleton?_singleton->_vbus_min.get():0;
} }
#endif #endif
#if HAL_HAVE_SERVO_VOLTAGE #if HAL_HAVE_SERVO_VOLTAGE
// get minimum servo voltage // get minimum servo voltage
static float get_minimum_servo_voltage(void) { static float get_minimum_servo_voltage(void) {
return instance?instance->_vservo_min.get():0; return _singleton?_singleton->_vservo_min.get():0;
} }
#endif #endif
#if CONFIG_HAL_BOARD == HAL_BOARD_CHIBIOS #if CONFIG_HAL_BOARD == HAL_BOARD_CHIBIOS
static uint8_t get_sdcard_slowdown(void) { static uint8_t get_sdcard_slowdown(void) {
return instance?instance->_sdcard_slowdown.get():0; return _singleton?_singleton->_sdcard_slowdown.get():0;
} }
#endif #endif
private: private:
static AP_BoardConfig *instance; static AP_BoardConfig *_singleton;
AP_Int16 vehicleSerialNumber; AP_Int16 vehicleSerialNumber;
AP_Int8 pwm_count; AP_Int8 pwm_count;