Crash_Override
/
OVMS3
2
0
Fork 0
Code Issues 5 Pull Requests Projects Releases 4 Wiki Activity

Fix metric namings

This commit is contained in:
Carsten Schmiemann 2022-04-20 21:36:52 +02:00
parent d8bd410f86
commit 5b510f7c50
4 changed files with 26 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
OVMS.V3/components/vehicle_renaultzoe_ph2/src/EVC_pids.cpp
View File

@ -70,13 +70,13 @@ void OvmsVehicleRenaultZoePh2::IncomingEVC(uint16_t type, uint16_t pid, const ch
break;
}
case 0x2A09: { // Power consumption by consumer
//mt_aux_power_consumer->SetValue((float) CAN_UINT(0) * 10, Watts);
//ESP_LOGD(TAG, "2A09 EVC mt_aux_power_consumer: %d", CAN_UINT(0) * 10);
//mt_bat_aux_power_consumer->SetValue((float) CAN_UINT(0) * 10, Watts);
//ESP_LOGD(TAG, "2A09 EVC mt_bat_aux_power_consumer: %d", CAN_UINT(0) * 10);
break;
}
case 0x2191: { // Power consumption by ptc
//mt_aux_power_ptc->SetValue((float) CAN_UINT(0) * 10, Watts);
//ESP_LOGD(TAG, "2191 EVC mt_aux_power_ptc: %d", CAN_UINT(0) * 10);
//mt_bat_aux_power_ptc->SetValue((float) CAN_UINT(0) * 10, Watts);
//ESP_LOGD(TAG, "2191 EVC mt_bat_aux_power_ptc: %d", CAN_UINT(0) * 10);
break;
}
case 0x2B85: { // Charge plug preset

4
OVMS.V3/components/vehicle_renaultzoe_ph2/src/LBC_pids.cpp
View File

@ -95,8 +95,8 @@ void OvmsVehicleRenaultZoePh2::IncomingLBC(uint16_t type, uint16_t pid, const ch
break;
}
case 0x91C8: { //Available charge in kWh
mt_available_energy->SetValue(float(CAN_UINT24(0) * 0.001), kWh);
//ESP_LOGD(TAG, "91C8 LBC mt_available_energy: %f", CAN_UINT24(0) * 0.001);
mt_bat_available_energy->SetValue(float(CAN_UINT24(0) * 0.001), kWh);
//ESP_LOGD(TAG, "91C8 LBC mt_bat_available_energy: %f", CAN_UINT24(0) * 0.001);
break;
}
case 0x9131: {

16
OVMS.V3/components/vehicle_renaultzoe_ph2/src/vehicle_renaultzoe_ph2.cpp
View File

@ -67,25 +67,25 @@ OvmsVehicleRenaultZoePh2::OvmsVehicleRenaultZoePh2() {
PollSetResponseSeparationTime(20);
// Init custom Zoe Ph2 metrics:
mt_pos_odometer_start = MyMetrics.InitFloat("zph2.v.pos.odometer.start", SM_STALE_MID, 0, Kilometers);
mt_bus_awake = MyMetrics.InitBool("zph2.v.bus.awake", SM_STALE_NONE, false);
mt_available_energy = MyMetrics.InitFloat("zph2.v.avail.energy", SM_STALE_NONE, 0, kWh);
mt_pos_odometer_start = MyMetrics.InitFloat("zph2.v.pos.odometer.start", SM_STALE_MID, 0, Kilometers);
mt_pos_car_trip = MyMetrics.InitFloat("zph2.v.pos.car.trip", SM_STALE_NONE, 0, Kilometers);
mt_bat_available_energy = MyMetrics.InitFloat("zph2.b.avail.energy", SM_STALE_NONE, 0, kWh);
mt_bat_aux_power_consumer = MyMetrics.InitFloat("zph2.b.aux.power.consumer", SM_STALE_MID, 0, Watts);
mt_bat_aux_power_ptc = MyMetrics.InitFloat("zph2.b.aux.power.ptc", SM_STALE_MID, 0, Watts);
mt_bat_max_charge_power = MyMetrics.InitFloat("zph2.b.max.charge.power", SM_STALE_MID, 0, kW);
mt_main_power_available = MyMetrics.InitFloat("zph2.c.main.power.available", SM_STALE_MIN, 0, kW);
mt_main_phases = MyMetrics.InitString("zph2.c.main.phases", SM_STALE_MIN, 0);
mt_main_phases_num = MyMetrics.InitFloat("zph2.c.main.phases.num", SM_STALE_MIN, 0);
mt_inv_status = MyMetrics.InitString("zph2.m.inverter.status", SM_STALE_NONE, 0);
mt_inv_hv_voltage = MyMetrics.InitFloat("zph2.i.voltage", SM_STALE_MID, 0, Volts);
mt_inv_hv_current = MyMetrics.InitFloat("zph2.i.current", SM_STALE_MID, 0, Amps);
mt_mot_temp_stator1 = MyMetrics.InitFloat("zph2.m.temp.stator1", SM_STALE_MID, 0, Celcius);
mt_mot_temp_stator2 = MyMetrics.InitFloat("zph2.m.temp.stator2", SM_STALE_MID, 0, Celcius);
mt_aux_power_consumer = MyMetrics.InitFloat("zph2.c.aux.power.consumer", SM_STALE_MID, 0, Watts);
mt_aux_power_ptc = MyMetrics.InitFloat("zph2.c.aux.power.ptc", SM_STALE_MID, 0, Watts);
mt_inv_hv_voltage = MyMetrics.InitFloat("zph2.m.inverter.voltage", SM_STALE_MID, 0, Volts);
mt_inv_hv_current = MyMetrics.InitFloat("zph2.m.inverter.current", SM_STALE_MID, 0, Amps);
mt_bat_max_charge_power = MyMetrics.InitFloat("zph2.b.max.charge.power", SM_STALE_MID, 0, kW);
mt_hvac_compressor_speed = MyMetrics.InitFloat("zph2.h.compressor.speed", SM_STALE_MID, 0);
mt_hvac_compressor_pressure = MyMetrics.InitFloat("zph2.h.compressor.pressure", SM_STALE_MID, 0);
mt_hvac_compressor_power = MyMetrics.InitFloat("zph2.h.compressor.power", SM_STALE_MID, 0, Watts);
mt_hvac_compressor_mode = MyMetrics.InitString("zph2.h.compressor.mode", SM_STALE_MID, 0);
mt_pos_car_trip = MyMetrics.InitFloat("zph2.v.pos.car.trip", SM_STALE_NONE, 0, Kilometers);
// BMS configuration:
BmsSetCellArrangementVoltage(96, 1);

23
OVMS.V3/components/vehicle_renaultzoe_ph2/src/vehicle_renaultzoe_ph2.h
View File

@ -94,25 +94,26 @@ class OvmsVehicleRenaultZoePh2 : public OvmsVehicle {
// Renault ZOE specific metrics
OvmsMetricFloat *mt_pos_odometer_start; //ODOmeter at Start
OvmsMetricBool *mt_bus_awake; //can-bus awake status
OvmsMetricFloat *mt_available_energy; //Available Energy
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_available_energy; //Available energy in battery
OvmsMetricFloat *mt_bat_aux_power_consumer; //Power usage by consumer
OvmsMetricFloat *mt_bat_aux_power_ptc; //Power usage by PTCs
OvmsMetricFloat *mt_bat_max_charge_power; //Battery max allowed charge, recd power
OvmsMetricFloat *mt_main_power_available; //Mains power available
OvmsMetricString *mt_main_phases; //Mains phases used
OvmsMetricFloat *mt_main_phases_num; //Mains phases used
OvmsMetricString *mt_inv_status; //Inverter status string
OvmsMetricFloat *mt_inv_hv_voltage; //Inverter battery voltage sense, used for motor power calc
OvmsMetricFloat *mt_inv_hv_current; //Inverter battery current sense, used for motor power calc
OvmsMetricFloat *mt_mot_temp_stator1; //Temp of motor stator 1
OvmsMetricFloat *mt_mot_temp_stator2; //Temp of motor stator 2
OvmsMetricFloat *mt_aux_power_consumer; //Power usage by consumer
OvmsMetricFloat *mt_aux_power_ptc; //Power usage by PTCs
OvmsMetricFloat *mt_inv_hv_voltage; //Battery voltage sense
OvmsMetricFloat *mt_inv_hv_current; //Battery current sense
OvmsMetricFloat *mt_bat_max_charge_power; //Battery max charge power
OvmsMetricFloat *mt_hvac_compressor_speed; //Compressor speed
OvmsMetricFloat *mt_hvac_compressor_pressure;//Compressor pressure in BAR
OvmsMetricFloat *mt_hvac_compressor_power; //Compressor power
OvmsMetricFloat *mt_hvac_compressor_pressure;//Compressor high-side pressure in BAR
OvmsMetricFloat *mt_hvac_compressor_power; //Compressor power usage
OvmsMetricString *mt_hvac_compressor_mode; //Compressor mode
OvmsMetricFloat *mt_pos_car_trip; //Cluster tripcounter
protected:
string zoe_obd_rxbuf;