Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

AP_Arming: log whether disarm was forced

This commit is contained in:
Peter Barker 2021-10-19 13:36:26 +11:00 committed by Peter Barker
parent 8ffbddd6ec
commit 2bffaef9ca
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libraries/AP_Arming/AP_Arming.cpp
View File

@ -1360,7 +1360,7 @@ bool AP_Arming::disarm(const AP_Arming::Method method, bool do_disarm_checks)
armed = false;
_last_disarm_method = method;
Log_Write_Disarm(method); // should be able to pass through force here?
Log_Write_Disarm(!do_disarm_checks, method); // Log_Write_Disarm takes "force"
check_forced_logging(method);
@ -1489,14 +1489,14 @@ void AP_Arming::Log_Write_Arm(const bool forced, const AP_Arming::Method method)
AP::logger().Write_Event(LogEvent::ARMED);
}
void AP_Arming::Log_Write_Disarm(const AP_Arming::Method method)
void AP_Arming::Log_Write_Disarm(const bool forced, const AP_Arming::Method method)
{
const struct log_Arm_Disarm pkt {
LOG_PACKET_HEADER_INIT(LOG_ARM_DISARM_MSG),
time_us : AP_HAL::micros64(),
arm_state : is_armed(),
arm_checks : 0,
forced : 0,
forced : forced,
method : (uint8_t)method
};
AP::logger().WriteCriticalBlock(&pkt, sizeof(pkt));

2
libraries/AP_Arming/AP_Arming.h
View File

@ -206,7 +206,7 @@ protected:
void check_failed(bool report, const char *fmt, ...) const FMT_PRINTF(3, 4);
void Log_Write_Arm(bool forced, AP_Arming::Method method);
void Log_Write_Disarm(AP_Arming::Method method);
void Log_Write_Disarm(bool forced, AP_Arming::Method method);
private: