From 35bf37d617258a6931159007e8c732c5416997ff Mon Sep 17 00:00:00 2001 From: Daniel Agar Date: Thu, 29 Mar 2018 20:14:20 -0400 Subject: [PATCH] commander state machine helper shorten names --- src/modules/commander/state_machine_helper.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/modules/commander/state_machine_helper.cpp b/src/modules/commander/state_machine_helper.cpp index 5d1094eca4..86992994e3 100644 --- a/src/modules/commander/state_machine_helper.cpp +++ b/src/modules/commander/state_machine_helper.cpp @@ -75,13 +75,13 @@ static constexpr const bool arming_transitions[vehicle_status_s::ARMING_STATE_MA }; // You can index into the array with an arming_state_t in order to get its textual representation -const char *const arming_state_names[vehicle_status_s::ARMING_STATE_MAX] = { - "ARMING_STATE_INIT", - "ARMING_STATE_STANDBY", - "ARMING_STATE_ARMED", - "ARMING_STATE_STANDBY_ERROR", - "ARMING_STATE_REBOOT", - "ARMING_STATE_IN_AIR_RESTORE", +const char * const arming_state_names[vehicle_status_s::ARMING_STATE_MAX] = { + "INIT", + "STANDBY", + "ARMED", + "STANDBY_ERROR", + "REBOOT", + "IN_AIR_RESTORE", }; static hrt_abstime last_preflight_check = 0; ///< initialize so it gets checked immediately @@ -339,7 +339,7 @@ transition_result_t arming_state_transition(vehicle_status_s *status, const batt if (ret == TRANSITION_DENIED) { /* print to MAVLink and console if we didn't provide any feedback yet */ if (!feedback_provided) { - mavlink_log_critical(mavlink_log_pub, "TRANSITION_DENIED: %s - %s", + mavlink_log_critical(mavlink_log_pub, "TRANSITION_DENIED: %s to %s", arming_state_names[status->arming_state], arming_state_names[new_arming_state]); } }