From 259d13b3f1b341c2c99e2f6a4e16abbe8e55c952 Mon Sep 17 00:00:00 2001 From: Carsten Schmiemann Date: Wed, 29 Jun 2022 02:07:12 +0200 Subject: [PATCH] Remove CLUSTER trip counter completely --- .../vehicle_renaultzoe_ph2_obd/src/rz2_web.cpp | 13 +------------ .../src/vehicle_renaultzoe_ph2_obd.cpp | 11 +++-------- .../src/vehicle_renaultzoe_ph2_obd.h | 1 - 3 files changed, 4 insertions(+), 21 deletions(-) diff --git a/OVMS.V3/components/vehicle_renaultzoe_ph2_obd/src/rz2_web.cpp b/OVMS.V3/components/vehicle_renaultzoe_ph2_obd/src/rz2_web.cpp index 6db4497..253f80b 100644 --- a/OVMS.V3/components/vehicle_renaultzoe_ph2_obd/src/rz2_web.cpp +++ b/OVMS.V3/components/vehicle_renaultzoe_ph2_obd/src/rz2_web.cpp @@ -51,7 +51,6 @@ void OvmsVehicleRenaultZoePh2OBD::WebCfgCommon(PageEntry_t& p, PageContext_t& c) if (c.method == "POST") { rangeideal = c.getvar("rangeideal"); battcapacity = c.getvar("battcapacity"); - //UseCarTrip = (c.getvar("UseCarTrip") == "no"); UseBMScalculation = (c.getvar("UseBMScalculation") == "no"); if (!rangeideal.empty()) { @@ -63,7 +62,6 @@ void OvmsVehicleRenaultZoePh2OBD::WebCfgCommon(PageEntry_t& p, PageContext_t& c) // store: MyConfig.SetParamValue("xrz2o", "rangeideal", rangeideal); MyConfig.SetParamValue("xrz2o", "battcapacity", battcapacity); - //MyConfig.SetParamValueBool("xrz2o", "UseCarTrip", UseCarTrip); MyConfig.SetParamValueBool("xrz2o", "UseBMScalculation", UseBMScalculation); c.head(200); @@ -81,7 +79,6 @@ void OvmsVehicleRenaultZoePh2OBD::WebCfgCommon(PageEntry_t& p, PageContext_t& c) // read configuration: rangeideal = MyConfig.GetParamValue("xrz2o", "rangeideal", "350"); battcapacity = MyConfig.GetParamValue("xrz2o", "battcapacity", "52000"); - //UseCarTrip = MyConfig.GetParamValueBool("xrz2o", "UseCarTrip", false); UseBMScalculation = MyConfig.GetParamValueBool("xrz2o", "UseBMScalculation", false); c.head(200); } @@ -99,15 +96,7 @@ void OvmsVehicleRenaultZoePh2OBD::WebCfgCommon(PageEntry_t& p, PageContext_t& c) c.input_slider("Range Ideal", "rangeideal", 3, "km", -1, atoi(rangeideal.c_str()), 350, 80, 500, 1, "

Default 350km. Ideal Range...

"); -/* - c.fieldset_start("Trip counter settings"); - c.input_radio_start("Which tripcounter to use?", "UseCarTrip"); - c.input_radio_option("UseCarTrip", "Internal (New trip everytime car starts)", "yes", UseCarTrip == false); - c.input_radio_option("UseCarTrip", "Car trip counter from Cluster", "no", UseCarTrip == true); - c.input_radio_end(""); - - c.fieldset_end(); -*/ + c.fieldset_start("Battery energy calculation"); c.input_radio_start("Which energy calculation?", "UseBMScalculation"); diff --git a/OVMS.V3/components/vehicle_renaultzoe_ph2_obd/src/vehicle_renaultzoe_ph2_obd.cpp b/OVMS.V3/components/vehicle_renaultzoe_ph2_obd/src/vehicle_renaultzoe_ph2_obd.cpp index 7fb5232..1810a35 100644 --- a/OVMS.V3/components/vehicle_renaultzoe_ph2_obd/src/vehicle_renaultzoe_ph2_obd.cpp +++ b/OVMS.V3/components/vehicle_renaultzoe_ph2_obd/src/vehicle_renaultzoe_ph2_obd.cpp @@ -69,7 +69,6 @@ OvmsVehicleRenaultZoePh2OBD::OvmsVehicleRenaultZoePh2OBD() { // Renault ZOE specific metrics mt_bus_awake = MyMetrics.InitBool("zph2.v.bus.awake", SM_STALE_NONE, false); mt_pos_odometer_start = MyMetrics.InitFloat("zph2.v.pos.odometer.start", SM_STALE_MID, 0, Kilometers, true); - mt_pos_car_trip = MyMetrics.InitFloat("zph2.v.pos.car.trip", SM_STALE_NONE, 0, Kilometers, true); mt_bat_used_start = MyMetrics.InitFloat("zph2.b.used.start", SM_STALE_MID, 0, kWh, true); mt_bat_recd_start = MyMetrics.InitFloat("zph2.b.recd.start", SM_STALE_MID, 0, kWh, true); mt_bat_chg_start = MyMetrics.InitFloat("zph2.b.chg.start", SM_STALE_MID, 0, kWh, true); @@ -115,7 +114,6 @@ void OvmsVehicleRenaultZoePh2OBD::ConfigChanged(OvmsConfigParam* param) { // get values from config store m_range_ideal = MyConfig.GetParamValueInt("xrz2o", "rangeideal", 350); m_battery_capacity = MyConfig.GetParamValueInt("xrz2o", "battcapacity", 52000); - m_UseCarTrip = MyConfig.GetParamValueBool("xrz2o", "UseCarTrip", false); m_UseBMScalculation = MyConfig.GetParamValueBool("xrz2o", "UseBMScalculation", false); StandardMetrics.ms_v_bat_range_ideal->SetValue(m_range_ideal, Kilometers); if (m_battery_capacity == 52000) { @@ -127,7 +125,7 @@ void OvmsVehicleRenaultZoePh2OBD::ConfigChanged(OvmsConfigParam* param) { if (m_battery_capacity == 22000) { Bat_cell_capacity = 36.0 * 2 * (StandardMetrics.ms_v_bat_soh->AsFloat() / 100.0); } - ESP_LOGI(TAG, "Renault Zoe Ph2 (OBD) reload configuration: Range ideal: %d, Battery capacity: %d, Use Car trip counter: %s, Use BMS as energy counter: %s", m_range_ideal, m_battery_capacity, m_UseCarTrip ? "Yes" : "No", m_UseBMScalculation ? "yes" : "no"); + ESP_LOGI(TAG, "Renault Zoe Ph2 (OBD) reload configuration: Range ideal: %d, Battery capacity: %d, Use BMS as energy counter: %s", m_range_ideal, m_battery_capacity, m_UseBMScalculation ? "yes" : "no"); } void OvmsVehicleRenaultZoePh2OBD::ZoeWakeUp() { @@ -317,7 +315,7 @@ void OvmsVehicleRenaultZoePh2OBD::Ticker10(uint32_t ticker) { } void OvmsVehicleRenaultZoePh2OBD::Ticker1(uint32_t ticker) { - if (StandardMetrics.ms_v_env_on->AsBool() && !CarIsDriving && !m_UseCarTrip) { + if (StandardMetrics.ms_v_env_on->AsBool() && !CarIsDriving) { CarIsDriving = true; //Start trip after power on StandardMetrics.ms_v_pos_trip->SetValue(0); @@ -361,12 +359,9 @@ void OvmsVehicleRenaultZoePh2OBD::Ticker1(uint32_t ticker) { POLLSTATE_OFF; } - if (StandardMetrics.ms_v_env_on->AsBool() && !m_UseCarTrip) { + if (StandardMetrics.ms_v_env_on->AsBool()) { StandardMetrics.ms_v_pos_trip->SetValue(StandardMetrics.ms_v_pos_odometer->AsFloat(0) - mt_pos_odometer_start->AsFloat(0)); } - if (m_UseCarTrip) { - StandardMetrics.ms_v_pos_trip->SetValue(mt_pos_car_trip->AsFloat()); - } StandardMetrics.ms_v_bat_range_est->SetValue((m_range_ideal * (StandardMetrics.ms_v_bat_soc->AsFloat(1) * 0.01)), Kilometers); } diff --git a/OVMS.V3/components/vehicle_renaultzoe_ph2_obd/src/vehicle_renaultzoe_ph2_obd.h b/OVMS.V3/components/vehicle_renaultzoe_ph2_obd/src/vehicle_renaultzoe_ph2_obd.h index 7bdf357..6444ce6 100644 --- a/OVMS.V3/components/vehicle_renaultzoe_ph2_obd/src/vehicle_renaultzoe_ph2_obd.h +++ b/OVMS.V3/components/vehicle_renaultzoe_ph2_obd/src/vehicle_renaultzoe_ph2_obd.h @@ -102,7 +102,6 @@ class OvmsVehicleRenaultZoePh2OBD : public OvmsVehicle { // Renault ZOE specific metrics OvmsMetricBool *mt_bus_awake; //CAN bus awake status OvmsMetricFloat *mt_pos_odometer_start; //ODOmeter at trip start - OvmsMetricFloat *mt_pos_car_trip; //Cluster tripcounter OvmsMetricFloat *mt_bat_used_start; //Used battery kWh at trip start OvmsMetricFloat *mt_bat_recd_start; //Recd battery kWh at trip start OvmsMetricFloat *mt_bat_chg_start; //Charge battery kWh at charge start