AP_Logger: include method and forced in armed log message

This commit is contained in:
Peter Barker 2020-01-07 16:04:31 +11:00 committed by Andrew Tridgell
parent 3b8a2fb262
commit 6b94710e4e

View File

@ -1236,6 +1236,8 @@ struct PACKED log_Arm_Disarm {
uint64_t time_us; uint64_t time_us;
uint8_t arm_state; uint8_t arm_state;
uint16_t arm_checks; uint16_t arm_checks;
uint8_t forced;
uint8_t method;
}; };
// FMT messages define all message formats other than FMT // FMT messages define all message formats other than FMT
@ -1543,7 +1545,7 @@ struct PACKED log_Arm_Disarm {
{ LOG_EVENT_MSG, sizeof(log_Event), \ { LOG_EVENT_MSG, sizeof(log_Event), \
"EV", "QB", "TimeUS,Id", "s-", "F-" }, \ "EV", "QB", "TimeUS,Id", "s-", "F-" }, \
{ LOG_ARM_DISARM_MSG, sizeof(log_Arm_Disarm), \ { LOG_ARM_DISARM_MSG, sizeof(log_Arm_Disarm), \
"ARM", "QBH", "TimeUS,ArmState,ArmChecks", "s--", "F--" }, \ "ARM", "QBHBB", "TimeUS,ArmState,ArmChecks,Forced,Method", "s----", "F----" }, \
{ LOG_ERROR_MSG, sizeof(log_Error), \ { LOG_ERROR_MSG, sizeof(log_Error), \
"ERR", "QBB", "TimeUS,Subsys,ECode", "s--", "F--" } "ERR", "QBB", "TimeUS,Subsys,ECode", "s--", "F--" }