Browse Source

AP_IOMCU: unify singleton naming to _singleton and get_singleton()

master
Tom Pittenger 6 years ago committed by Tom Pittenger
parent
commit
28323147ab
  1. 6
      libraries/AP_IOMCU/AP_IOMCU.cpp
  2. 2
      libraries/AP_IOMCU/iofirmware/rc.cpp

6
libraries/AP_IOMCU/AP_IOMCU.cpp

@ -59,7 +59,7 @@ void AP_IOMCU::init(void) @@ -59,7 +59,7 @@ void AP_IOMCU::init(void)
// check IO firmware CRC
hal.scheduler->delay(2000);
AP_BoardConfig *boardconfig = AP_BoardConfig::get_instance();
AP_BoardConfig *boardconfig = AP_BoardConfig::get_singleton();
if (!boardconfig || boardconfig->io_enabled() == 1) {
check_crc();
} else {
@ -304,7 +304,7 @@ void AP_IOMCU::read_status() @@ -304,7 +304,7 @@ void AP_IOMCU::read_status()
last_safety_options = 0xFFFF;
// also check if the safety should be definately off.
AP_BoardConfig *boardconfig = AP_BoardConfig::get_instance();
AP_BoardConfig *boardconfig = AP_BoardConfig::get_singleton();
if (!boardconfig) {
return;
}
@ -656,7 +656,7 @@ void AP_IOMCU::set_brushed_mode(void) @@ -656,7 +656,7 @@ void AP_IOMCU::set_brushed_mode(void)
// handling of BRD_SAFETYOPTION parameter
void AP_IOMCU::update_safety_options(void)
{
AP_BoardConfig *boardconfig = AP_BoardConfig::get_instance();
AP_BoardConfig *boardconfig = AP_BoardConfig::get_singleton();
if (!boardconfig) {
return;
}

2
libraries/AP_IOMCU/iofirmware/rc.cpp

@ -66,7 +66,7 @@ void AP_IOMCU_FW::rcin_serial_init(void) @@ -66,7 +66,7 @@ void AP_IOMCU_FW::rcin_serial_init(void)
&sd3_listener,
EVENT_MASK(1),
SD_PARITY_ERROR);
rcprotocol = AP_RCProtocol::get_instance();
rcprotocol = AP_RCProtocol::get_singleton();
// disable input for SBUS with pulses, we will use the UART for
// SBUS.

Loading…
Cancel
Save