From 40883a06cf2a764129bd65a1d5ff15c0300dc289 Mon Sep 17 00:00:00 2001
From: Matthias Grob <maetugr@gmail.com>
Date: Mon, 13 Jul 2020 14:32:00 +0200
Subject: [PATCH] Commader: save 53 unnecessary characters of output string
---
src/modules/commander/Commander.cpp | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/modules/commander/Commander.cpp b/src/modules/commander/Commander.cpp
index 4e308c6db1..d5e07c830c 100644
--- a/src/modules/commander/Commander.cpp
+++ b/src/modules/commander/Commander.cpp
@@ -1631,10 +1631,10 @@ Commander::run()
if (_auto_disarm_killed.get_state()) {
if (armed.manual_lockdown) {
- arm_disarm(false, true, &mavlink_log_pub, "Kill-switch still engaged, disarming");
+ arm_disarm(false, true, &mavlink_log_pub, "Kill-switch still engaged");
} else {
- arm_disarm(false, true, &mavlink_log_pub, "System in lockdown, disarming");
+ arm_disarm(false, true, &mavlink_log_pub, "System in lockdown");
}
}
@@ -2035,11 +2035,13 @@ Commander::run()
if (_manual_control_setpoint.kill_switch == manual_control_setpoint_s::SWITCH_POS_ON) {
/* set lockdown flag */
if (!armed.manual_lockdown) {
+ const char kill_switch_string[] = "Kill-switch engaged";
+
if (_land_detector.landed) {
- mavlink_and_console_log_info(&mavlink_log_pub, "Manual kill-switch engaged");
+ mavlink_log_info(&mavlink_log_pub, kill_switch_string);
} else {
- mavlink_log_critical(&mavlink_log_pub, "Manual kill-switch engaged");
+ mavlink_log_critical(&mavlink_log_pub, kill_switch_string);
}
_status_changed = true;
@@ -2048,7 +2050,7 @@ Commander::run()
} else if (_manual_control_setpoint.kill_switch == manual_control_setpoint_s::SWITCH_POS_OFF) {
if (armed.manual_lockdown) {
- mavlink_and_console_log_info(&mavlink_log_pub, "Manual kill-switch disengaged");
+ mavlink_log_info(&mavlink_log_pub, "Kill-switch disengaged");
_status_changed = true;
armed.manual_lockdown = false;
}