mirror of
https://github.com/dalathegreat/Battery-Emulator.git
synced 2025-10-05 02:39:57 +02:00
Fix main merge error
This commit is contained in:
parent
9ccba38718
commit
ac2bbb850b
1 changed files with 2 additions and 2 deletions
|
@ -170,8 +170,8 @@ void update_values_battery() { //This function maps all the values fetched via
|
||||||
static_cast<uint16_t>((static_cast<double>(nominal_full_pack_energy) / bat_beginning_of_life) * 10000.0);
|
static_cast<uint16_t>((static_cast<double>(nominal_full_pack_energy) / bat_beginning_of_life) * 10000.0);
|
||||||
}
|
}
|
||||||
//If the calculation went wrong, set SOH to 100%
|
//If the calculation went wrong, set SOH to 100%
|
||||||
if (StateOfHealth > 10000) {
|
if (system_SOH_pptt > 10000) {
|
||||||
StateOfHealth = 10000;
|
system_SOH_pptt = 10000;
|
||||||
}
|
}
|
||||||
//If the value is unavailable, set SOH to 99%
|
//If the value is unavailable, set SOH to 99%
|
||||||
if (nominal_full_pack_energy < REASONABLE_ENERGYAMOUNT) {
|
if (nominal_full_pack_energy < REASONABLE_ENERGYAMOUNT) {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue