Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-23 17:18:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

AP_BattMonitor: Increase the max. nr. of supported battery cells from 12 to 14

Browse Source 
Uses a second message, because the original message does not support any more fields
This commit is contained in:
Dr.-Ing. Amilcar do Carmo Lucas 2020-09-23 10:15:37 +02:00 committed by Andrew Tridgell
parent 06e64b5585
commit 222ef40321
3 changed files with 41 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libraries/AP_BattMonitor/AP_BattMonitor.h
View File

@ -19,7 +19,11 @@
#define AP_BATT_MONITOR_RES_EST_TC_1 0.5f #define AP_BATT_MONITOR_RES_EST_TC_1 0.5f
#define AP_BATT_MONITOR_RES_EST_TC_2 0.1f #define AP_BATT_MONITOR_RES_EST_TC_2 0.1f
#if !HAL_MINIMIZE_FEATURES && BOARD_FLASH_SIZE > 1024
#define AP_BATT_MONITOR_CELLS_MAX 14
#else
#define AP_BATT_MONITOR_CELLS_MAX 12 #define AP_BATT_MONITOR_CELLS_MAX 12
#endif
#ifndef HAL_BATTMON_SMBUS_ENABLE #ifndef HAL_BATTMON_SMBUS_ENABLE
#define HAL_BATTMON_SMBUS_ENABLE 1 #define HAL_BATTMON_SMBUS_ENABLE 1

23
libraries/AP_BattMonitor/AP_BattMonitor_Logging.cpp
View File

@ -36,12 +36,25 @@ void AP_BattMonitor_Backend::Log_Write_BCL(const uint8_t instance, const uint64_
instance : instance, instance : instance,
voltage : _state.voltage voltage : _state.voltage
}; };
for (uint8_t i = 0; i < ARRAY_SIZE(_state.cell_voltages.cells); i++) { for (uint8_t i = 0; i < ARRAY_SIZE(cell_pkt.cell_voltages); i++) {
cell_pkt.cell_voltages[i] = _state.cell_voltages.cells[i] + 1; cell_pkt.cell_voltages[i] = _state.cell_voltages.cells[i] + 1; // add 1mv
} }
AP::logger().WriteBlock(&cell_pkt, sizeof(cell_pkt)); AP::logger().WriteBlock(&cell_pkt, sizeof(cell_pkt));
// check battery structure can hold all cells if (_state.cell_voltages.cells[12] != UINT16_MAX || _state.cell_voltages.cells[13] != UINT16_MAX)
static_assert(ARRAY_SIZE(_state.cell_voltages.cells) == ARRAY_SIZE(cell_pkt.cell_voltages), {
"Battery cell number doesn't match in library and log structure"); struct log_BCL2 cell_pkt2{
LOG_PACKET_HEADER_INIT(LOG_BCL2_MSG),
time_us : time_us,
instance : instance
};
for (uint8_t i = 0; i < ARRAY_SIZE(cell_pkt2.cell_voltages); i++) {
cell_pkt2.cell_voltages[i] = _state.cell_voltages.cells[ARRAY_SIZE(cell_pkt.cell_voltages)+i] + 1; // add 1mv
}
AP::logger().WriteBlock(&cell_pkt2, sizeof(cell_pkt2));
// check battery structure can hold all cells
static_assert(ARRAY_SIZE(_state.cell_voltages.cells) == ARRAY_SIZE(cell_pkt.cell_voltages) + ARRAY_SIZE(cell_pkt2.cell_voltages),
"Battery cell number doesn't match in library and log structures");
}
} }

22
libraries/AP_BattMonitor/LogStructure.h
View File

@ -4,7 +4,8 @@
#define LOG_IDS_FROM_BATTMONITOR \ #define LOG_IDS_FROM_BATTMONITOR \
LOG_BAT_MSG, \ LOG_BAT_MSG, \
LOG_BCL_MSG LOG_BCL_MSG, \
LOG_BCL2_MSG
// @LoggerMessage: BAT // @LoggerMessage: BAT
// @Description: Gathered battery data // @Description: Gathered battery data
@ -52,11 +53,26 @@ struct PACKED log_BCL {
uint64_t time_us; uint64_t time_us;
uint8_t instance; uint8_t instance;
float voltage; float voltage;
uint16_t cell_voltages[12]; uint16_t cell_voltages[12]; // the format does not support more than 12 cells, the remaining cells are reported in the log_BCL2 structure
};
// @LoggerMessage: BCL2
// @Description: Battery cell voltage information
// @Field: TimeUS: Time since system startup
// @Field: Instance: battery instance number
// @Field: V13: thirteenth cell voltage
// @Field: V14: fourteenth cell voltage
struct PACKED log_BCL2 {
LOG_PACKET_HEADER;
uint64_t time_us;
uint8_t instance;
uint16_t cell_voltages[2];
}; };
#define LOG_STRUCTURE_FROM_BATTMONITOR \ #define LOG_STRUCTURE_FROM_BATTMONITOR \
{ LOG_BAT_MSG, sizeof(log_BAT), \ { LOG_BAT_MSG, sizeof(log_BAT), \
"BAT", "QBfffffcf", "TimeUS,Instance,Volt,VoltR,Curr,CurrTot,EnrgTot,Temp,Res", "s#vvAiJOw", "F-000!/?0" }, \ "BAT", "QBfffffcf", "TimeUS,Instance,Volt,VoltR,Curr,CurrTot,EnrgTot,Temp,Res", "s#vvAiJOw", "F-000!/?0" }, \
{ 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" }, "BCL", "QBfHHHHHHHHHHHH", "TimeUS,Instance,Volt,V1,V2,V3,V4,V5,V6,V7,V8,V9,V10,V11,V12", "s#vvvvvvvvvvvvv", "F-0CCCCCCCCCCCC" }, \
{ LOG_BCL2_MSG, sizeof(log_BCL2), \
"BCL2", "QBHH", "TimeUS,Instance,V13,V14", "s#vv", "F-CC" },