battery: pass connected flag in by setter

This commit is contained in:
Matthias Grob
2021-12-01 17:04:12 +01:00
parent 38d23f5345
commit 39641494da
10 changed files with 40 additions and 37 deletions
@@ -80,8 +80,8 @@ AnalogBattery::updateBatteryStatusADC(hrt_abstime timestamp, float voltage_raw,
bool connected = voltage_v > BOARD_ADC_OPEN_CIRCUIT_V &&
(BOARD_ADC_OPEN_CIRCUIT_V <= BOARD_VALID_UV || is_valid());
Battery::updateBatteryStatus(timestamp, voltage_v, current_a, connected);
Battery::setConnected(connected);
Battery::updateBatteryStatus(timestamp, voltage_v, current_a);
}
bool AnalogBattery::is_valid()
+2 -4
View File
@@ -99,13 +99,11 @@ EscBattery::Run()
average_voltage_v /= esc_status.esc_count;
const bool connected = true;
_battery.setConnected(true);
_battery.updateBatteryStatus(
esc_status.timestamp,
average_voltage_v,
total_current_a,
connected);
total_current_a);
}
}
@@ -99,7 +99,8 @@ void BatterySimulator::Run()
float vbatt = math::gradual(_battery_percentage, 0.f, 1.f, _battery.empty_cell_voltage(), _battery.full_cell_voltage());
vbatt *= _battery.cell_count();
_battery.updateBatteryStatus(now_us, vbatt, ibatt, true);
_battery.setConnected(true);
_battery.updateBatteryStatus(now_us, vbatt, ibatt);
perf_end(_loop_perf);
}