From 705a4d1d3a8fe627bd330d332e98e1e9eaba1b65 Mon Sep 17 00:00:00 2001 From: Carsten Schmiemann Date: Sun, 20 Nov 2022 18:52:27 +0100 Subject: [PATCH] Revert SOC modification multiplier --- .../vehicle_renaultzoe_ph2_can/src/LBC_pids.cpp | 12 +----------- .../vehicle_renaultzoe_ph2_obd/src/LBC_pids.cpp | 12 +----------- 2 files changed, 2 insertions(+), 22 deletions(-) diff --git a/OVMS.V3/components/vehicle_renaultzoe_ph2_can/src/LBC_pids.cpp b/OVMS.V3/components/vehicle_renaultzoe_ph2_can/src/LBC_pids.cpp index 30ef813..b961b72 100644 --- a/OVMS.V3/components/vehicle_renaultzoe_ph2_can/src/LBC_pids.cpp +++ b/OVMS.V3/components/vehicle_renaultzoe_ph2_can/src/LBC_pids.cpp @@ -44,19 +44,9 @@ void OvmsVehicleRenaultZoePh2CAN::IncomingLBC(uint16_t type, uint16_t pid, const break; } case 0x9002: { //Battery SOC - //StandardMetrics.ms_v_bat_soc->SetValue((float) (CAN_UINT(0)) * 0.01, Percentage); - float bat_soc = CAN_UINT(0) * 0.01; - - if ( bat_soc < 100.0f ) { - StandardMetrics.ms_v_bat_soc->SetValue(bat_soc + (bat_soc * 0.03), Percentage); - } else { - StandardMetrics.ms_v_bat_soc->SetValue(100.0f, Percentage); - } - + StandardMetrics.ms_v_bat_soc->SetValue((float) (CAN_UINT(0)) * 0.01, Percentage); StandardMetrics.ms_v_bat_cac->SetValue(Bat_cell_capacity * CAN_UINT(0) * 0.0001); - //ESP_LOGD(TAG, "9002 LBC mt_bat_lbc_soc: %f", bat_soc); - //ESP_LOGD(TAG, "9002 LBC mt_bat_lbc_soc calculated: %f", bat_soc + (bat_soc * 0.03)); break; } case 0x9003: { //Battery SOH diff --git a/OVMS.V3/components/vehicle_renaultzoe_ph2_obd/src/LBC_pids.cpp b/OVMS.V3/components/vehicle_renaultzoe_ph2_obd/src/LBC_pids.cpp index b3b328b..f667d9d 100644 --- a/OVMS.V3/components/vehicle_renaultzoe_ph2_obd/src/LBC_pids.cpp +++ b/OVMS.V3/components/vehicle_renaultzoe_ph2_obd/src/LBC_pids.cpp @@ -45,19 +45,9 @@ void OvmsVehicleRenaultZoePh2OBD::IncomingLBC(uint16_t type, uint16_t pid, const break; } case 0x9002: { //Battery SOC - //StandardMetrics.ms_v_bat_soc->SetValue((float) (CAN_UINT(0)) * 0.01, Percentage); - float bat_soc = CAN_UINT(0) * 0.01; - - if ( bat_soc < 100.0f ) { - StandardMetrics.ms_v_bat_soc->SetValue(bat_soc + (bat_soc * 0.03), Percentage); - } else { - StandardMetrics.ms_v_bat_soc->SetValue(100.0f, Percentage); - } - + StandardMetrics.ms_v_bat_soc->SetValue((float) (CAN_UINT(0)) * 0.01, Percentage); StandardMetrics.ms_v_bat_cac->SetValue(Bat_cell_capacity * CAN_UINT(0) * 0.0001); - //ESP_LOGD(TAG, "9002 LBC mt_bat_lbc_soc: %f", bat_soc); - //ESP_LOGD(TAG, "9002 LBC mt_bat_lbc_soc calculated: %f", bat_soc + (bat_soc * 0.03)); break; } case 0x9003: { //Battery SOH