dark0707
/
px4-firmware
forked from Archive/PX4-Autopilot
1
0
Fork 0
Code Pull Requests Activity

batt_smbus fixes 

fixed wrong calculation of max_cell_voltage
adding missed max_cell_voltage_delta
some code beautify
This commit is contained in:
bazooka joe 2020-03-17 11:13:18 -07:00 committed by Beat Küng
parent 53bc5fddad
commit 7b37f329f0
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/drivers/batt_smbus/batt_smbus.cpp
View File

@ -143,11 +143,8 @@ void BATT_SMBUS::RunImpl()
// Check if max lifetime voltage delta is greater than allowed. // Check if max lifetime voltage delta is greater than allowed.
if (_lifetime_max_delta_cell_voltage > BATT_CELL_VOLTAGE_THRESHOLD_FAILED) { if (_lifetime_max_delta_cell_voltage > BATT_CELL_VOLTAGE_THRESHOLD_FAILED) {
new_report.warning = battery_status_s::BATTERY_WARNING_CRITICAL; new_report.warning = battery_status_s::BATTERY_WARNING_CRITICAL;
}
// Propagate warning state. } else if (new_report.remaining > _low_thr) {
else {
if (new_report.remaining > _low_thr) {
new_report.warning = battery_status_s::BATTERY_WARNING_NONE; new_report.warning = battery_status_s::BATTERY_WARNING_NONE;
} else if (new_report.remaining > _crit_thr) { } else if (new_report.remaining > _crit_thr) {
@ -159,7 +156,6 @@ void BATT_SMBUS::RunImpl()
} else { } else {
new_report.warning = battery_status_s::BATTERY_WARNING_EMERGENCY; new_report.warning = battery_status_s::BATTERY_WARNING_EMERGENCY;
} }
}
// Read battery temperature and covert to Celsius. // Read battery temperature and covert to Celsius.
ret |= _interface->read_word(BATT_SMBUS_TEMP, result); ret |= _interface->read_word(BATT_SMBUS_TEMP, result);
@ -168,6 +164,7 @@ void BATT_SMBUS::RunImpl()
new_report.capacity = _batt_capacity; new_report.capacity = _batt_capacity;
new_report.cycle_count = _cycle_count; new_report.cycle_count = _cycle_count;
new_report.serial_number = _serial_number; new_report.serial_number = _serial_number;
new_report.max_cell_voltage_delta = _max_cell_voltage_delta;
new_report.cell_count = _cell_count; new_report.cell_count = _cell_count;
new_report.voltage_cell_v[0] = _cell_voltages[0]; new_report.voltage_cell_v[0] = _cell_voltages[0];
new_report.voltage_cell_v[1] = _cell_voltages[1]; new_report.voltage_cell_v[1] = _cell_voltages[1];
@ -219,7 +216,7 @@ int BATT_SMBUS::get_cell_voltages()
for (uint8_t i = 1; i < (sizeof(_cell_voltages) / sizeof(_cell_voltages[0])); i++) { for (uint8_t i = 1; i < (sizeof(_cell_voltages) / sizeof(_cell_voltages[0])); i++) {
_min_cell_voltage = math::min(_min_cell_voltage, _cell_voltages[i]); _min_cell_voltage = math::min(_min_cell_voltage, _cell_voltages[i]);
max_cell_voltage = math::max(_min_cell_voltage, _cell_voltages[i]); max_cell_voltage = math::max(max_cell_voltage, _cell_voltages[i]);
} }
// Calculate the max difference between the min and max cells with complementary filter. // Calculate the max difference between the min and max cells with complementary filter.