From be043d24a0beebdb0b7bd0b807bfe3c73731513d Mon Sep 17 00:00:00 2001 From: daniele Date: Tue, 31 Mar 2020 17:40:05 +0200 Subject: [PATCH] commander: rephrase or change message importance for some errors/warnings that happen often --- src/modules/commander/Commander.cpp | 8 ++++---- src/modules/commander/state_machine_helper.cpp | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/modules/commander/Commander.cpp b/src/modules/commander/Commander.cpp index 2b90df7131..c20b2eac8f 100644 --- a/src/modules/commander/Commander.cpp +++ b/src/modules/commander/Commander.cpp @@ -2035,14 +2035,14 @@ Commander::run() if (_manual_control_setpoint.kill_switch == manual_control_setpoint_s::SWITCH_POS_ON) { /* set lockdown flag */ if (!armed.manual_lockdown) { - mavlink_log_emergency(&mavlink_log_pub, "Manual kill-switch engaged"); + mavlink_and_console_log_info(&mavlink_log_pub, "Manual kill-switch engaged"); _status_changed = true; armed.manual_lockdown = true; } } else if (_manual_control_setpoint.kill_switch == manual_control_setpoint_s::SWITCH_POS_OFF) { if (armed.manual_lockdown) { - mavlink_log_emergency(&mavlink_log_pub, "Manual kill-switch disengaged"); + mavlink_and_console_log_info(&mavlink_log_pub, "Manual kill-switch disengaged"); _status_changed = true; armed.manual_lockdown = false; } @@ -3774,7 +3774,7 @@ void Commander::data_link_check() status.data_link_lost = true; status.data_link_lost_counter++; - mavlink_log_critical(&mavlink_log_pub, "Data link lost"); + mavlink_log_critical(&mavlink_log_pub, "Connection to ground station lost"); _status_changed = true; } @@ -3785,7 +3785,7 @@ void Commander::data_link_check() && (hrt_elapsed_time(&_datalink_last_heartbeat_onboard_controller) > 5_s) && !_onboard_controller_lost) { - mavlink_log_critical(&mavlink_log_pub, "Onboard controller lost"); + mavlink_log_critical(&mavlink_log_pub, "Connection to mission computer lost"); _onboard_controller_lost = true; _status_changed = true; } diff --git a/src/modules/commander/state_machine_helper.cpp b/src/modules/commander/state_machine_helper.cpp index b03b952b73..5749d75428 100644 --- a/src/modules/commander/state_machine_helper.cpp +++ b/src/modules/commander/state_machine_helper.cpp @@ -49,7 +49,7 @@ #include "state_machine_helper.h" #include "commander_helper.h" -static constexpr const char reason_no_rc[] = "no RC"; +static constexpr const char reason_no_rc[] = "No manual control stick input"; static constexpr const char reason_no_offboard[] = "no offboard"; static constexpr const char reason_no_rc_and_no_offboard[] = "no RC and no offboard"; static constexpr const char reason_no_local_position[] = "no local position";