Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-02-24 08:44:08 -04:00
Code Issues Packages Projects Releases Wiki Activity

AP_BattMonitor: Generic driver timeout definition in seconds

Browse Source 
also remove unnecessary init of local data variable
also change assert to be more forgiving
This commit is contained in:
Randy Mackay 2020-06-23 13:53:15 +09:00
parent 3e519b25a4
commit 77d6b19d86
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libraries/AP_BattMonitor/AP_BattMonitor_SMBus_Generic.cpp
View File

@ -19,7 +19,7 @@ uint8_t smbus_cell_ids[] = { 0x3f, // cell 1
0x34}; // cell 12 0x34}; // cell 12
#define SMBUS_READ_BLOCK_MAXIMUM_TRANSFER 0x20 // A Block Read or Write is allowed to transfer a maximum of 32 data bytes. #define SMBUS_READ_BLOCK_MAXIMUM_TRANSFER 0x20 // A Block Read or Write is allowed to transfer a maximum of 32 data bytes.
#define SMBUS_CELL_COUNT_CHECK_TIMEOUT 15000000 // check cell count for up to 15 seconds #define SMBUS_CELL_COUNT_CHECK_TIMEOUT 15 // check cell count for up to 15 seconds
/* /*
* Other potentially useful registers, listed here for future use * Other potentially useful registers, listed here for future use
@ -51,7 +51,7 @@ void AP_BattMonitor_SMBus_Generic::timer()
return; return;
} }
uint16_t data = UINT16_MAX; uint16_t data;
uint32_t tnow = AP_HAL::micros(); uint32_t tnow = AP_HAL::micros();
// read voltage (V) // read voltage (V)
@ -61,8 +61,8 @@ void AP_BattMonitor_SMBus_Generic::timer()
_state.healthy = true; _state.healthy = true;
} }
// assert that BATTMONITOR_SMBUS_NUM_CELLS_MAX matches smbus_cell_ids // assert that BATTMONITOR_SMBUS_NUM_CELLS_MAX must be no more than smbus_cell_ids
static_assert(BATTMONITOR_SMBUS_NUM_CELLS_MAX == ARRAY_SIZE(smbus_cell_ids), "BATTMONITOR_SMBUS_NUM_CELLS_MAX must match smbus_cell_ids"); static_assert(BATTMONITOR_SMBUS_NUM_CELLS_MAX <= ARRAY_SIZE(smbus_cell_ids), "BATTMONITOR_SMBUS_NUM_CELLS_MAX must be no more than smbus_cell_ids");
// check cell count // check cell count
if (!_cell_count_fixed) { if (!_cell_count_fixed) {
@ -71,7 +71,7 @@ void AP_BattMonitor_SMBus_Generic::timer()
if (_cell_count_check_start_us == 0) { if (_cell_count_check_start_us == 0) {
_cell_count_check_start_us = tnow; _cell_count_check_start_us = tnow;
} }
if (tnow - _cell_count_check_start_us > SMBUS_CELL_COUNT_CHECK_TIMEOUT) { if (tnow - _cell_count_check_start_us > (SMBUS_CELL_COUNT_CHECK_TIMEOUT * 1e6)) {
// give up checking cell count after 15sec of continuous healthy battery reads // give up checking cell count after 15sec of continuous healthy battery reads
_cell_count_fixed = true; _cell_count_fixed = true;
} }