fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-06-28 09:30:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Commader: save 53 unnecessary characters of output string

Browse Source
This commit is contained in:
Matthias Grob
2020-07-13 14:32:00 +02:00
committed by Daniel Agar
parent f01195c13f
commit 40883a06cf
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/commander/Commander.cpp
+7 -5
View File
@@ -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;
}