Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-07 16:38:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

AP_BattMonitor: add health logging

Browse Source
This commit is contained in:
Iampete1 2023-08-01 22:14:06 +01:00 committed by Andrew Tridgell
parent 935fad54ad
commit 5c09a16a80
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libraries/AP_BattMonitor/AP_BattMonitor_Logging.cpp
View File

@ -22,6 +22,7 @@ void AP_BattMonitor_Backend::Log_Write_BAT(const uint8_t instance, const uint64_
temperature : (int16_t) ( has_temperature() ? _state.temperature * 100 : 0), temperature : (int16_t) ( has_temperature() ? _state.temperature * 100 : 0),
resistance : _state.resistance, resistance : _state.resistance,
rem_percent : percent, rem_percent : percent,
health : _state.healthy
}; };
AP::logger().WriteBlock(&pkt, sizeof(pkt)); AP::logger().WriteBlock(&pkt, sizeof(pkt));
} }

6
libraries/AP_BattMonitor/LogStructure.h
View File

@ -9,7 +9,7 @@
// @LoggerMessage: BAT // @LoggerMessage: BAT
// @Description: Gathered battery data // @Description: Gathered battery data
// @Field: TimeUS: Time since system startup // @Field: TimeUS: Time since system startup
// @Field: Instance: battery instance number // @Field: Inst: battery instance number
// @Field: Volt: measured voltage // @Field: Volt: measured voltage
// @Field: VoltR: estimated resting voltage // @Field: VoltR: estimated resting voltage
// @Field: Curr: measured current // @Field: Curr: measured current
@ -18,6 +18,7 @@
// @Field: Temp: measured temperature // @Field: Temp: measured temperature
// @Field: Res: estimated battery resistance // @Field: Res: estimated battery resistance
// @Field: RemPct: remaining percentage // @Field: RemPct: remaining percentage
// @Field: H: health
struct PACKED log_BAT { struct PACKED log_BAT {
LOG_PACKET_HEADER; LOG_PACKET_HEADER;
uint64_t time_us; uint64_t time_us;
@ -30,6 +31,7 @@ struct PACKED log_BAT {
int16_t temperature; // degrees C * 100 int16_t temperature; // degrees C * 100
float resistance; float resistance;
uint8_t rem_percent; uint8_t rem_percent;
uint8_t health;
}; };
// @LoggerMessage: BCL // @LoggerMessage: BCL
@ -59,6 +61,6 @@ struct PACKED log_BCL {
#define LOG_STRUCTURE_FROM_BATTMONITOR \ #define LOG_STRUCTURE_FROM_BATTMONITOR \
{ LOG_BAT_MSG, sizeof(log_BAT), \ { LOG_BAT_MSG, sizeof(log_BAT), \
"BAT", "QBfffffcfB", "TimeUS,Instance,Volt,VoltR,Curr,CurrTot,EnrgTot,Temp,Res,RemPct", "s#vvAaXOw%", "F-000C0?00" , true }, \ "BAT", "QBfffffcfBB", "TimeUS,Inst,Volt,VoltR,Curr,CurrTot,EnrgTot,Temp,Res,RemPct,H", "s#vvAaXOw%-", "F-000C0?000" , true }, \
{ LOG_BCL_MSG, sizeof(log_BCL), \ { LOG_BCL_MSG, sizeof(log_BCL), \
"BCL", "QBfHHHHHHHHHHHH", "TimeUS,Instance,Volt,V1,V2,V3,V4,V5,V6,V7,V8,V9,V10,V11,V12", "s#vvvvvvvvvvvvv", "F-0CCCCCCCCCCCC" , true }, "BCL", "QBfHHHHHHHHHHHH", "TimeUS,Instance,Volt,V1,V2,V3,V4,V5,V6,V7,V8,V9,V10,V11,V12", "s#vvvvvvvvvvvvv", "F-0CCCCCCCCCCCC" , true },