Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-03-12 01:23:56 -03:00
Code Issues Packages Projects Releases Wiki Activity

AP_BattMonitor: fix constexpr-and-MIN don't get along bug

Browse Source 
lib/libArduCopter_libs.a(AP_BattMonitor_SMBus_NeoDesign.cpp.0.o): In function `AP_BattMonitor_SMBus_NeoDesign::timer()':
/home/pbarker/rc/ardupilot/build/sitl/../../libraries/AP_BattMonitor/AP_BattMonitor_SMBus_NeoDesign.cpp:27: undefined reference to `AP_BattMonitor_SMBus_NeoDesign::max_cell_count'
collect2: error: ld returned 1 exit status
This commit is contained in:
Peter Barker 2021-02-03 23:01:23 +11:00 committed by Peter Barker
parent ba293084e3
commit 84953c2e39
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libraries/AP_BattMonitor/AP_BattMonitor_SMBus_NeoDesign.cpp
View File

@ -19,15 +19,17 @@ AP_BattMonitor_SMBus_NeoDesign::AP_BattMonitor_SMBus_NeoDesign(AP_BattMonitor &m
void AP_BattMonitor_SMBus_NeoDesign::timer() void AP_BattMonitor_SMBus_NeoDesign::timer()
{ {
uint16_t data; uint16_t data;
uint32_t tnow = AP_HAL::micros();
// Get the cell count once, it's not likely to change in flight // Get the cell count once, it's not likely to change in flight
if (_cell_count == 0) { if (_cell_count == 0) {
if (read_word(BATTMONITOR_ND_CELL_COUNT, data)) { if (!read_word(BATTMONITOR_ND_CELL_COUNT, data)) {
_cell_count = MIN(data, max_cell_count); // never read in more cells then we can store
} else {
return; // something wrong, don't try anything else return; // something wrong, don't try anything else
} }
// constrain maximum cellcount in case of i2c corruption
if (data > max_cell_count) {
_cell_count = max_cell_count;
} else {
_cell_count = data;
}
} }
bool read_all_cells = true; bool read_all_cells = true;
@ -40,6 +42,8 @@ void AP_BattMonitor_SMBus_NeoDesign::timer()
} }
} }
const uint32_t tnow = AP_HAL::micros();
if (read_all_cells && (_cell_count > 0)) { if (read_all_cells && (_cell_count > 0)) {
uint32_t summed = 0; uint32_t summed = 0;
for (int i = 0; i < _cell_count; i++) { for (int i = 0; i < _cell_count; i++) {