fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-30 22:41:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Commander enums: shorten failsafe event messages

Browse Source 
Such that the focus is on the important keywords.

Signed-off-by: Silvan Fuhrer <silvan@auterion.com>
This commit is contained in:
Silvan Fuhrer
2024-03-15 10:25:18 +01:00
parent f6430a27d6
commit da39d075ac
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/events/enums.json
+5 -5
View File
@@ -364,7 +364,7 @@
}, },
"1": { "1": {
"name": "manual_control_loss", "name": "manual_control_loss",
"description": "manual control loss" "description": "Manual control loss"
}, },
"2": { "2": {
"name": "gcs_connection_loss", "name": "gcs_connection_loss",
@@ -384,7 +384,7 @@
}, },
"6": { "6": {
"name": "low_remaining_flight_time", "name": "low_remaining_flight_time",
"description": "low remaining flight time" "description": "Remaining flight time low"
} }
} }
}, },
@@ -402,15 +402,15 @@
}, },
"2": { "2": {
"name": "fallback_posctrl", "name": "fallback_posctrl",
"description": "fallback to Position mode" "description": "Position mode"
}, },
"3": { "3": {
"name": "fallback_altctrl", "name": "fallback_altctrl",
"description": "fallback to Altitude mode" "description": "Altitude mode"
}, },
"4": { "4": {
"name": "fallback_stabilized", "name": "fallback_stabilized",
"description": "fallback to Stabilized mode" "description": "Stabilized mode"
}, },
"5": { "5": {
"name": "hold", "name": "hold",
src/modules/commander/failsafe/framework.cpp
+4 -4
View File
@@ -195,7 +195,7 @@ void FailsafeBase::notifyUser(uint8_t user_intended_mode, Action action, Action
events::send<uint32_t, events::px4::enums::failsafe_action_t, uint16_t>( events::send<uint32_t, events::px4::enums::failsafe_action_t, uint16_t>(
events::ID("commander_failsafe_enter_generic_hold"), events::ID("commander_failsafe_enter_generic_hold"),
{events::Log::Critical, events::LogInternal::Warning}, {events::Log::Critical, events::LogInternal::Warning},
"Failsafe activated, triggering {2} in {3} seconds", mavlink_mode, failsafe_action, "Failsafe, triggering {2} in {3} seconds", mavlink_mode, failsafe_action,
(uint16_t) delay_s); (uint16_t) delay_s);
} else { } else {
@@ -204,7 +204,7 @@ void FailsafeBase::notifyUser(uint8_t user_intended_mode, Action action, Action
events::send<uint32_t, events::px4::enums::failsafe_action_t, uint16_t, events::px4::enums::failsafe_cause_t>( events::send<uint32_t, events::px4::enums::failsafe_action_t, uint16_t, events::px4::enums::failsafe_cause_t>(
events::ID("commander_failsafe_enter_hold"), events::ID("commander_failsafe_enter_hold"),
{events::Log::Critical, events::LogInternal::Warning}, {events::Log::Critical, events::LogInternal::Warning},
"Failsafe activated due to {4}, triggering {2} in {3} seconds", mavlink_mode, failsafe_action, "{4}, triggering {2} in {3} seconds", mavlink_mode, failsafe_action,
(uint16_t) delay_s, failsafe_cause); (uint16_t) delay_s, failsafe_cause);
} }
@@ -231,7 +231,7 @@ void FailsafeBase::notifyUser(uint8_t user_intended_mode, Action action, Action
events::send<uint32_t, events::px4::enums::failsafe_action_t>( events::send<uint32_t, events::px4::enums::failsafe_action_t>(
events::ID("commander_failsafe_enter_generic"), events::ID("commander_failsafe_enter_generic"),
{events::Log::Critical, events::LogInternal::Warning}, {events::Log::Critical, events::LogInternal::Warning},
"Failsafe activated, triggering {2}", mavlink_mode, failsafe_action); "Failsafe, triggering {2}", mavlink_mode, failsafe_action);
} }
} else { } else {
@@ -272,7 +272,7 @@ void FailsafeBase::notifyUser(uint8_t user_intended_mode, Action action, Action
events::send<uint32_t, events::px4::enums::failsafe_action_t, events::px4::enums::failsafe_cause_t>( events::send<uint32_t, events::px4::enums::failsafe_action_t, events::px4::enums::failsafe_cause_t>(
events::ID("commander_failsafe_enter"), events::ID("commander_failsafe_enter"),
{events::Log::Critical, events::LogInternal::Warning}, {events::Log::Critical, events::LogInternal::Warning},
"Failsafe activated due to {3}, triggering {2}", mavlink_mode, failsafe_action, failsafe_cause); "{3}, triggering {2}", mavlink_mode, failsafe_action, failsafe_cause);
} }
} }