Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-02-02 14:08:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

AP_Arming: unify singleton naming to _singleton and get_singleton()

Browse Source
This commit is contained in:
Tom Pittenger 2019-02-10 10:33:16 -08:00 committed by Tom Pittenger
parent 52887e1c45
commit 13f0ad8a1c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libraries/AP_Arming/AP_Arming.cpp
View File

@ -731,7 +731,7 @@ bool AP_Arming::arm_checks(ArmingMethod method)
// the arming check flag is set - disabling the arming check // the arming check flag is set - disabling the arming check
// should not stop logging from working. // should not stop logging from working.
AP_Logger *df = AP_Logger::instance(); AP_Logger *df = AP_Logger::get_singleton();
if (df->logging_present()) { if (df->logging_present()) {
// If we're configured to log, prep it // If we're configured to log, prep it
df->PrepForArming(); df->PrepForArming();
@ -794,7 +794,7 @@ bool AP_Arming::disarm()
gcs().send_text(MAV_SEVERITY_INFO, "Throttle disarmed"); gcs().send_text(MAV_SEVERITY_INFO, "Throttle disarmed");
#if HAL_HAVE_SAFETY_SWITCH #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) && if ((board_cfg != nullptr) &&
(board_cfg->get_safety_button_options() & AP_BoardConfig::BOARD_SAFETY_OPTION_SAFETY_ON_DISARM)) { (board_cfg->get_safety_button_options() & AP_BoardConfig::BOARD_SAFETY_OPTION_SAFETY_ON_DISARM)) {
hal.rcout->force_safety_on(); hal.rcout->force_safety_on();