From ab95c8e5eeff8358e4c251826975d764d67f68db Mon Sep 17 00:00:00 2001
From: Tom Pittenger <magicrub@gmail.com>
Date: Sun, 10 Feb 2019 10:32:23 -0800
Subject: [PATCH] AP_BoardConfig: unify singleton naming to _singleton and
 get_singleton()

---
 libraries/AP_BoardConfig/AP_BoardConfig.cpp |  2 +-
 libraries/AP_BoardConfig/AP_BoardConfig.h   | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/libraries/AP_BoardConfig/AP_BoardConfig.cpp b/libraries/AP_BoardConfig/AP_BoardConfig.cpp
index 362c176b2e..05d027c1de 100644
--- a/libraries/AP_BoardConfig/AP_BoardConfig.cpp
+++ b/libraries/AP_BoardConfig/AP_BoardConfig.cpp
@@ -105,7 +105,7 @@
 #endif
 
 extern const AP_HAL::HAL& hal;
-AP_BoardConfig *AP_BoardConfig::instance;
+AP_BoardConfig *AP_BoardConfig::_singleton;
 
 // table of user settable parameters
 const AP_Param::GroupInfo AP_BoardConfig::var_info[] = {
diff --git a/libraries/AP_BoardConfig/AP_BoardConfig.h b/libraries/AP_BoardConfig/AP_BoardConfig.h
index 74bd037e1a..2ce809e9ce 100644
--- a/libraries/AP_BoardConfig/AP_BoardConfig.h
+++ b/libraries/AP_BoardConfig/AP_BoardConfig.h
@@ -32,7 +32,7 @@ extern "C" typedef int (*main_fn_t)(int argc, char **);
 class AP_BoardConfig {
 public:
     AP_BoardConfig() {
-        instance = this;
+        _singleton = this;
         AP_Param::setup_object_defaults(this, var_info);
     };
 
@@ -41,8 +41,8 @@ public:
     AP_BoardConfig &operator=(const AP_BoardConfig&) = delete;
 
     // singleton support
-    static AP_BoardConfig *get_instance(void) {
-        return instance;
+    static AP_BoardConfig *get_singleton(void) {
+        return _singleton;
     }
     
     void init(void);
@@ -106,7 +106,7 @@ public:
     // crc check of IO firmware on startup
     static uint8_t io_enabled(void) {
 #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
         return 0;
 #endif
@@ -114,7 +114,7 @@ public:
 
     // get number of PWM outputs enabled on FMU
     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
@@ -143,25 +143,25 @@ public:
 #if HAL_HAVE_BOARD_VOLTAGE
     // get minimum board voltage
     static float get_minimum_board_voltage(void) {
-        return instance?instance->_vbus_min.get():0;
+        return _singleton?_singleton->_vbus_min.get():0;
     }
 #endif
 
 #if HAL_HAVE_SERVO_VOLTAGE
     // get minimum servo voltage
     static float get_minimum_servo_voltage(void) {
-        return instance?instance->_vservo_min.get():0;
+        return _singleton?_singleton->_vservo_min.get():0;
     }
 #endif
 
 #if CONFIG_HAL_BOARD == HAL_BOARD_CHIBIOS
     static uint8_t get_sdcard_slowdown(void) {
-        return instance?instance->_sdcard_slowdown.get():0;
+        return _singleton?_singleton->_sdcard_slowdown.get():0;
     }
 #endif
     
 private:
-    static AP_BoardConfig *instance;
+    static AP_BoardConfig *_singleton;
     
     AP_Int16 vehicleSerialNumber;
     AP_Int8 pwm_count;