From ac153ec901ab9cb644bad02a3764c4141e87d6c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20=C3=96ster?= Date: Tue, 9 Sep 2025 21:15:35 +0300 Subject: [PATCH] Simplify capacity calculation and initial values --- Software/src/battery/RIVIAN-BATTERY.cpp | 4 ++-- Software/src/battery/RIVIAN-BATTERY.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Software/src/battery/RIVIAN-BATTERY.cpp b/Software/src/battery/RIVIAN-BATTERY.cpp index 4492710b..d0f5ce75 100644 --- a/Software/src/battery/RIVIAN-BATTERY.cpp +++ b/Software/src/battery/RIVIAN-BATTERY.cpp @@ -22,8 +22,8 @@ void RivianBattery::update_values() { datalayer.battery.status.voltage_dV = battery_voltage; datalayer.battery.status.current_dA = ((int16_t)battery_current / 10.0 - 3200) * 10; - datalayer.battery.info.total_capacity_Wh = kWh_available_total * 5; - datalayer.battery.status.remaining_capacity_Wh = kWh_available_max * 5; + datalayer.battery.status.remaining_capacity_Wh = static_cast( + (static_cast(datalayer.battery.status.real_soc) / 10000) * datalayer.battery.info.total_capacity_Wh); //static lower limits for testing // datalayer.battery.info.total_capacity_Wh = 10000; diff --git a/Software/src/battery/RIVIAN-BATTERY.h b/Software/src/battery/RIVIAN-BATTERY.h index d74acb65..156ad84a 100644 --- a/Software/src/battery/RIVIAN-BATTERY.h +++ b/Software/src/battery/RIVIAN-BATTERY.h @@ -20,7 +20,7 @@ class RivianBattery : public CanBattery { uint8_t BMS_state = 0; uint16_t battery_voltage = 3700; uint16_t battery_SOC = 5000; - int32_t battery_current = 0; + int32_t battery_current = 32000; uint16_t kWh_available_total = 135; uint16_t kWh_available_max = 135; int16_t battery_min_temperature = 0;