Fix remain time calc, correct webif
This commit is contained in:
parent
7384396cfe
commit
8dbb93fdbb
|
@ -113,13 +113,13 @@ void OvmsVehicleRenaultZoePh2::WebCfgCommon(PageEntry_t& p, PageContext_t& c)
|
|||
|
||||
c.fieldset_start("Battery energy calculation");
|
||||
|
||||
c.input_radio_start("Which trip energy calculation?", "UseBMScalculation");
|
||||
c.input_radio_start("Which energy calculation?", "UseBMScalculation");
|
||||
c.input_radio_option("UseBMScalculation", "OVMS energy calculation", "yes", UseBMScalculation == false);
|
||||
c.input_radio_option("UseBMScalculation", "BMS-based calculation", "no", UseBMScalculation == true);
|
||||
c.input_radio_end("");
|
||||
|
||||
c.input_radio_start("State of Charge - Display", "UseBMSsoc");
|
||||
c.input_radio_option("UseBMSsoc", "Use SOC from Cluster", "yes", UseBMSsoc == false);
|
||||
c.input_radio_option("UseBMSsoc", "User SOC from EVC", "yes", UseBMSsoc == false);
|
||||
c.input_radio_option("UseBMSsoc", "Real SOC from BMS", "no", UseBMSsoc == true);
|
||||
c.input_radio_end("");
|
||||
|
||||
|
|
|
@ -218,7 +218,7 @@ int OvmsVehicleRenaultZoePh2::calcMinutesRemaining(float charge_voltage, float c
|
|||
float remaining_wh = m_battery_capacity * bat_soc / 100.0;
|
||||
float remaining_hours = remaining_wh / (charge_current * charge_voltage);
|
||||
float remaining_mins = remaining_hours * 60.0;
|
||||
ESP_LOGD(TAG, "SOC: %f, BattCap:%d, Current: %f, Voltage: %f, RemainWH: %f, RemainHour: %f, RemainMin: %f", bat_soc, m_battery_capacity, charge_current, charge_voltage, remaining_wh, remaining_hours, remaining_mins);
|
||||
//ESP_LOGD(TAG, "SOC: %f, BattCap:%d, Current: %f, Voltage: %f, RemainWH: %f, RemainHour: %f, RemainMin: %f", bat_soc, m_battery_capacity, charge_current, charge_voltage, remaining_wh, remaining_hours, remaining_mins);
|
||||
return MIN( 1440, (int)remaining_mins );
|
||||
}
|
||||
|
||||
|
@ -259,14 +259,14 @@ void OvmsVehicleRenaultZoePh2::ChargeStatistics() {
|
|||
}
|
||||
|
||||
int minsremaining = calcMinutesRemaining(charge_voltage, charge_current);
|
||||
StandardMetrics.ms_v_charge_duration_full->SetValue(minsremaining / 10, Minutes);
|
||||
StandardMetrics.ms_v_charge_duration_full->SetValue(minsremaining, Minutes);
|
||||
|
||||
if (StandardMetrics.ms_v_charge_type->AsString() == "type2") {
|
||||
StandardMetrics.ms_v_charge_efficiency->SetValue((battery_power / charger_power) * 100.0);
|
||||
ESP_LOGI(TAG, "Charge time remaining: %d mins, AC Charge at %f kW with %f amps, %s at %f efficiency, %f powerfactor", minsremaining / 10, charger_power, ac_current, ac_phases.c_str(), StandardMetrics.ms_v_charge_efficiency->AsFloat(100), ACInputPowerFactor);
|
||||
ESP_LOGI(TAG, "Charge time remaining: %d mins, AC Charge at %f kW with %f amps, %s at %f efficiency, %f powerfactor", minsremaining, charger_power, ac_current, ac_phases.c_str(), StandardMetrics.ms_v_charge_efficiency->AsFloat(100), ACInputPowerFactor);
|
||||
} else if (StandardMetrics.ms_v_charge_type->AsString() == "ccs" || StandardMetrics.ms_v_charge_type->AsString() == "chademo") {
|
||||
StandardMetrics.ms_v_charge_power->SetValue(battery_power);
|
||||
ESP_LOGI(TAG, "Charge time remaining: %d mins, DC Charge at %f kW", minsremaining / 10, battery_power);
|
||||
ESP_LOGI(TAG, "Charge time remaining: %d mins, DC Charge at %f kW", minsremaining, battery_power);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue