From 13f0ad8a1c0ea01926b81e622cf25f06187552a5 Mon Sep 17 00:00:00 2001 From: Tom Pittenger Date: Sun, 10 Feb 2019 10:33:16 -0800 Subject: [PATCH] AP_Arming: unify singleton naming to _singleton and get_singleton() --- libraries/AP_Arming/AP_Arming.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/AP_Arming/AP_Arming.cpp b/libraries/AP_Arming/AP_Arming.cpp index 5c2b6dd32b..85be140159 100644 --- a/libraries/AP_Arming/AP_Arming.cpp +++ b/libraries/AP_Arming/AP_Arming.cpp @@ -731,7 +731,7 @@ bool AP_Arming::arm_checks(ArmingMethod method) // the arming check flag is set - disabling the arming check // should not stop logging from working. - AP_Logger *df = AP_Logger::instance(); + AP_Logger *df = AP_Logger::get_singleton(); if (df->logging_present()) { // If we're configured to log, prep it df->PrepForArming(); @@ -794,7 +794,7 @@ bool AP_Arming::disarm() gcs().send_text(MAV_SEVERITY_INFO, "Throttle disarmed"); #if HAL_HAVE_SAFETY_SWITCH - AP_BoardConfig *board_cfg = AP_BoardConfig::get_instance(); + AP_BoardConfig *board_cfg = AP_BoardConfig::get_singleton(); if ((board_cfg != nullptr) && (board_cfg->get_safety_button_options() & AP_BoardConfig::BOARD_SAFETY_OPTION_SAFETY_ON_DISARM)) { hal.rcout->force_safety_on();