From 4ab8ddec53696e1135cc590ea1a7dffe1715734a Mon Sep 17 00:00:00 2001 From: Daniel Agar Date: Tue, 14 Jun 2016 15:09:07 -0400 Subject: [PATCH] rename cb_usb -> circuit_breaker_engaged_usb_check --- src/modules/commander/commander.cpp | 2 +- src/modules/commander/state_machine_helper.cpp | 2 +- src/modules/commander/state_machine_helper.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/modules/commander/commander.cpp b/src/modules/commander/commander.cpp index d04ec441df..5b9079a0df 100644 --- a/src/modules/commander/commander.cpp +++ b/src/modules/commander/commander.cpp @@ -2806,7 +2806,7 @@ void get_circuit_breaker_params() { status_flags.circuit_breaker_engaged_power_check = circuit_breaker_enabled("CBRK_SUPPLY_CHK", CBRK_SUPPLY_CHK_KEY); - status_flags.cb_usb = circuit_breaker_enabled("CBRK_USB_CHK", CBRK_USB_CHK_KEY); + status_flags.circuit_breaker_engaged_usb_check = circuit_breaker_enabled("CBRK_USB_CHK", CBRK_USB_CHK_KEY); status_flags.circuit_breaker_engaged_airspd_check = circuit_breaker_enabled("CBRK_AIRSPD_CHK", CBRK_AIRSPD_CHK_KEY); status_flags.circuit_breaker_engaged_enginefailure_check = circuit_breaker_enabled("CBRK_ENGINEFAIL", CBRK_ENGINEFAIL_KEY); status_flags.circuit_breaker_engaged_gpsfailure_check = circuit_breaker_enabled("CBRK_GPSFAIL", CBRK_GPSFAIL_KEY); diff --git a/src/modules/commander/state_machine_helper.cpp b/src/modules/commander/state_machine_helper.cpp index 72b8551834..88f3e5d6ec 100644 --- a/src/modules/commander/state_machine_helper.cpp +++ b/src/modules/commander/state_machine_helper.cpp @@ -886,7 +886,7 @@ int preflight_check(struct vehicle_status_s *status, orb_advert_t *mavlink_log_p checkAirspeed, (status->rc_input_mode == vehicle_status_s::RC_IN_MODE_DEFAULT), !status_flags->circuit_breaker_engaged_gpsfailure_check, true, reportFailures); - if (!status_flags->cb_usb && status_flags->usb_connected && prearm) { + if (!status_flags->circuit_breaker_engaged_usb_check && status_flags->usb_connected && prearm) { preflight_ok = false; if (reportFailures) { mavlink_and_console_log_critical(mavlink_log_pub, "ARMING DENIED: Flying with USB is not safe"); diff --git a/src/modules/commander/state_machine_helper.h b/src/modules/commander/state_machine_helper.h index 8a951a0375..f3302eba08 100644 --- a/src/modules/commander/state_machine_helper.h +++ b/src/modules/commander/state_machine_helper.h @@ -76,7 +76,7 @@ struct status_flags_s { bool circuit_breaker_engaged_airspd_check; bool circuit_breaker_engaged_enginefailure_check; bool circuit_breaker_engaged_gpsfailure_check; - bool cb_usb; + bool circuit_breaker_engaged_usb_check; bool offboard_control_signal_found_once; bool offboard_control_signal_lost; bool offboard_control_signal_weak;