|
|
|
@ -902,7 +902,7 @@ int commander_thread_main(int argc, char *argv[])
@@ -902,7 +902,7 @@ int commander_thread_main(int argc, char *argv[])
|
|
|
|
|
orb_copy(ORB_ID(safety), safety_sub, &safety); |
|
|
|
|
|
|
|
|
|
/* disarm if safety is now on and still armed */ |
|
|
|
|
if (safety.safety_switch_available && !safety.safety_off && armed.armed) { |
|
|
|
|
if (status.hil_state == HIL_STATE_OFF && safety.safety_switch_available && !safety.safety_off && armed.armed) { |
|
|
|
|
arming_state_t new_arming_state = (status.arming_state == ARMING_STATE_ARMED ? ARMING_STATE_STANDBY : ARMING_STATE_STANDBY_ERROR); |
|
|
|
|
if (TRANSITION_CHANGED == arming_state_transition(&status, &safety, new_arming_state, &armed)) { |
|
|
|
|
mavlink_log_info(mavlink_fd, "[cmd] DISARMED by safety switch"); |
|
|
|
|