Skip to content

Commit ac153ec

Browse files
committed
Simplify capacity calculation and initial values
1 parent fc109cd commit ac153ec

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

Software/src/battery/RIVIAN-BATTERY.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ void RivianBattery::update_values() {
2222
datalayer.battery.status.voltage_dV = battery_voltage;
2323
datalayer.battery.status.current_dA = ((int16_t)battery_current / 10.0 - 3200) * 10;
2424

25-
datalayer.battery.info.total_capacity_Wh = kWh_available_total * 5;
26-
datalayer.battery.status.remaining_capacity_Wh = kWh_available_max * 5;
25+
datalayer.battery.status.remaining_capacity_Wh = static_cast<uint32_t>(
26+
(static_cast<double>(datalayer.battery.status.real_soc) / 10000) * datalayer.battery.info.total_capacity_Wh);
2727

2828
//static lower limits for testing
2929
// datalayer.battery.info.total_capacity_Wh = 10000;

Software/src/battery/RIVIAN-BATTERY.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class RivianBattery : public CanBattery {
2020
uint8_t BMS_state = 0;
2121
uint16_t battery_voltage = 3700;
2222
uint16_t battery_SOC = 5000;
23-
int32_t battery_current = 0;
23+
int32_t battery_current = 32000;
2424
uint16_t kWh_available_total = 135;
2525
uint16_t kWh_available_max = 135;
2626
int16_t battery_min_temperature = 0;

0 commit comments

Comments
 (0)