|
|
|
@ -2279,7 +2279,7 @@ Commander::run()
@@ -2279,7 +2279,7 @@ Commander::run()
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// evaluate the main state machine according to mode switches
|
|
|
|
|
if (set_main_state(&_status_changed) == TRANSITION_CHANGED) { |
|
|
|
|
if (set_main_state(_status_changed) == TRANSITION_CHANGED) { |
|
|
|
|
// play tune on mode change only if armed, blink LED always
|
|
|
|
|
tune_positive(_armed.armed); |
|
|
|
|
_status_changed = true; |
|
|
|
@ -2855,7 +2855,7 @@ Commander::control_status_leds(bool changed, const uint8_t battery_warning)
@@ -2855,7 +2855,7 @@ Commander::control_status_leds(bool changed, const uint8_t battery_warning)
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
transition_result_t |
|
|
|
|
Commander::set_main_state(bool *changed) |
|
|
|
|
Commander::set_main_state(bool &changed) |
|
|
|
|
{ |
|
|
|
|
if (_safety.override_available && _safety.override_enabled) { |
|
|
|
|
return set_main_state_override_on(changed); |
|
|
|
@ -2866,11 +2866,11 @@ Commander::set_main_state(bool *changed)
@@ -2866,11 +2866,11 @@ Commander::set_main_state(bool *changed)
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
transition_result_t |
|
|
|
|
Commander::set_main_state_override_on(bool *changed) |
|
|
|
|
Commander::set_main_state_override_on(bool &changed) |
|
|
|
|
{ |
|
|
|
|
const transition_result_t res = main_state_transition(_status, commander_state_s::MAIN_STATE_MANUAL, _status_flags, |
|
|
|
|
_internal_state); |
|
|
|
|
*changed = (res == TRANSITION_CHANGED); |
|
|
|
|
changed = (res == TRANSITION_CHANGED); |
|
|
|
|
|
|
|
|
|
return res; |
|
|
|
|
} |
|
|
|
|