aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AP_Logger: log accumulated power status flags; all flags ever set

Browse Source
This commit is contained in:
Peter Barker 2020-07-20 10:34:43 +10:00 committed by Andrew Tridgell
parent bd8c4017bc
commit 721d94a23b
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libraries/AP_Logger/LogFile.cpp
View File

@ -480,6 +480,7 @@ void AP_Logger::Write_Power(void)
Vcc : hal.analogin->board_voltage(), Vcc : hal.analogin->board_voltage(),
Vservo : hal.analogin->servorail_voltage(), Vservo : hal.analogin->servorail_voltage(),
flags : hal.analogin->power_status_flags(), flags : hal.analogin->power_status_flags(),
accumulated_flags : hal.analogin->accumulated_power_status_flags(),
safety_and_arm : safety_and_armed safety_and_arm : safety_and_armed
}; };
WriteBlock(&pkt, sizeof(pkt)); WriteBlock(&pkt, sizeof(pkt));

4
libraries/AP_Logger/LogStructure.h
View File

@ -392,6 +392,7 @@ struct PACKED log_POWR {
float Vcc; float Vcc;
float Vservo; float Vservo;
uint16_t flags; uint16_t flags;
uint16_t accumulated_flags;
uint8_t safety_and_arm; uint8_t safety_and_arm;
}; };
@ -1930,6 +1931,7 @@ struct PACKED log_Arm_Disarm {
// @Field: Vcc: Flight board voltage // @Field: Vcc: Flight board voltage
// @Field: VServo: Servo rail voltage // @Field: VServo: Servo rail voltage
// @Field: Flags: System power flags // @Field: Flags: System power flags
// @Field: AccFlags: Accumulated System power flags; all flags which have ever been set
// @Field: Safety: Hardware Safety Switch status // @Field: Safety: Hardware Safety Switch status
// @LoggerMessage: PRX // @LoggerMessage: PRX
@ -2356,7 +2358,7 @@ struct PACKED log_Arm_Disarm {
{ LOG_BARO_MSG, sizeof(log_BARO), \ { LOG_BARO_MSG, sizeof(log_BARO), \
"BARO", BARO_FMT, BARO_LABELS, BARO_UNITS, BARO_MULTS }, \ "BARO", BARO_FMT, BARO_LABELS, BARO_UNITS, BARO_MULTS }, \
{ LOG_POWR_MSG, sizeof(log_POWR), \ { LOG_POWR_MSG, sizeof(log_POWR), \
"POWR","QffHB","TimeUS,Vcc,VServo,Flags,Safety", "svv--", "F00--" }, \ "POWR","QffHHB","TimeUS,Vcc,VServo,Flags,AccFlags,Safety", "svv---", "F00---" }, \
{ LOG_CMD_MSG, sizeof(log_Cmd), \ { LOG_CMD_MSG, sizeof(log_Cmd), \
"CMD", "QHHHffffLLfB","TimeUS,CTot,CNum,CId,Prm1,Prm2,Prm3,Prm4,Lat,Lng,Alt,Frame", "s-------DUm-", "F-------GG0-" }, \ "CMD", "QHHHffffLLfB","TimeUS,CTot,CNum,CId,Prm1,Prm2,Prm3,Prm4,Lat,Lng,Alt,Frame", "s-------DUm-", "F-------GG0-" }, \
{ LOG_MAVLINK_COMMAND_MSG, sizeof(log_MAVLink_Command), \ { LOG_MAVLINK_COMMAND_MSG, sizeof(log_MAVLink_Command), \