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

Fix readouts

This commit is contained in:
Carsten Schmiemann 2022-04-18 22:42:43 +02:00
parent 5eb8a6fbf0
commit 9a01e75f02
5 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -121,42 +121,42 @@ void OvmsVehicleRenaultZoePh2::IncomingBCM(uint16_t type, uint16_t pid, const ch
}
case 0x608E: { //Vehicle running aka ignition
//reliability test needed
ESP_LOGD(TAG, "608E BCM Vehicle running: %d", CAN_NIBL(0));
ESP_LOGD(TAG, "608E BCM Vehicle running: %d", CAN_UINT(0));
break;
}
case 0x8004: { //Car secure aka vehicle locked
StandardMetrics.ms_v_env_locked->SetValue((bool)CAN_UINT(0));
ESP_LOGD(TAG, "8004 Car Secure S: %d", CAN_UINT(0));
//ESP_LOGD(TAG, "8004 BCM Car Secure S: %d", CAN_UINT(0));
break;
}
case 0x6026: { //Front left door
StandardMetrics.ms_v_door_fl->SetValue((bool)CAN_UINT(0));
ESP_LOGD(TAG, "6026 Front left door: %d", CAN_UINT(4));
//ESP_LOGD(TAG, "6026 BCM Front left door: %d", CAN_UINT(0));
break;
}
case 0x6027: { //Front right door
StandardMetrics.ms_v_door_fr->SetValue((bool)CAN_UINT(0));
ESP_LOGD(TAG, "6027 Front right door: %d", CAN_BYTE(4));
//ESP_LOGD(TAG, "6027 BCM Front right door: %d", CAN_UINT(0));
break;
}
case 0x61B2: { //Rear left door
StandardMetrics.ms_v_door_rl->SetValue((bool)CAN_UINT(0));
ESP_LOGD(TAG, "61B2 Rear left door: %d", CAN_NIB(4));
//ESP_LOGD(TAG, "61B2 BCM Rear left door: %d", CAN_UINT(0));
break;
}
case 0x61B3: { //Rear right door
StandardMetrics.ms_v_door_rr->SetValue((bool)CAN_UINT(0));
ESP_LOGD(TAG, "61B3 Rear right door: %d", CAN_NIB(0));
//ESP_LOGD(TAG, "61B3 Rear right door: %d", CAN_UINT(0));
break;
}
case 0x609B: { //Tailgate
StandardMetrics.ms_v_door_trunk->SetValue((bool)CAN_UINT(0));
ESP_LOGD(TAG, "609B Tailgate: %d", CAN_NIBL(0));
//ESP_LOGD(TAG, "609B Tailgate: %d", CAN_UINT(0));
break;
}
case 0x0495: { //Hood
StandardMetrics.ms_v_door_hood->SetValue((bool)CAN_NIBL(0));
ESP_LOGD(TAG, "0495 Hood: %d", CAN_NIBL(0));
//ESP_LOGD(TAG, "0495 Hood: %d", CAN_NIBL(0));
break;
}

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

@ -36,7 +36,7 @@ void OvmsVehicleRenaultZoePh2::IncomingLBC(uint16_t type, uint16_t pid, const ch
case 0x925D: { //Battery current
StandardMetrics.ms_v_bat_current->SetValue((float) ((CAN_UINT(0) * 0.03125 - 1020) * -1.0f), Amps);
//ESP_LOGD(TAG, "925D LBC ms_v_bat_current: %f", (CAN_UINT(0) * 0.03125 - 1020));
StandardMetrics.ms_v_bat_power->SetValue(((CAN_UINT(0) * 0.03125 - 1020) * StandardMetrics.ms_v_bat_voltage->AsFloat()) * 0.001);
StandardMetrics.ms_v_bat_power->SetValue((((CAN_UINT(0) * 0.03125 - 1020) * -1.0f) * StandardMetrics.ms_v_bat_voltage->AsFloat()) * 0.001);
break;
}
case 0x9012: { //Battery average temperature

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

@ -28,8 +28,8 @@
void OvmsVehicleRenaultZoePh2::IncomingCLUSTER(uint16_t type, uint16_t pid, const char* data, uint16_t len) {
switch (pid) {
case 0x2101: { // Cluster - trip counter
mt_pos_car_trip->SetValue(CAN_UINT(0), Kilometers);
ESP_LOGD(TAG, "2102 CLUSTER mt_pos_car_trip: %f", float(CAN_UINT(0)));
mt_pos_car_trip->SetValue(CAN_UINT32(0) / 100, Kilometers);
ESP_LOGD(TAG, "2101 CLUSTER mt_pos_car_trip: %f", float(CAN_UINT32(0) / 100));
break;
}

16
OVMS.V3/components/vehicle_renaultzoe_ph2/src/ph2_poller.h
View File

@ -36,9 +36,9 @@ static const OvmsVehicle::poll_pid_t renault_zoe_polls[] = {
//Motor Inverter
//{ 0x18dadff1, 0x18daf1df, VEHICLE_POLL_TYPE_OBDIISESSION, SESSION_EXTDIAG, { 0, 60, 60, 60 }, 0, ISOTP_EXTFRAME }, // OBD Extended Diagnostic Session
{ 0x18dadff1, 0x18daf1df, VEHICLE_POLL_TYPE_OBDIIEXTENDED, 0x700C, { 0, 10, 3, 10 }, 0, ISOTP_EXTFRAME }, // Inverter temperature
{ 0x18dadff1, 0x18daf1df, VEHICLE_POLL_TYPE_OBDIIEXTENDED, 0x700F, { 0, 10, 3, 10 }, 0, ISOTP_EXTFRAME }, // Stator Temperature 1
{ 0x18dadff1, 0x18daf1df, VEHICLE_POLL_TYPE_OBDIIEXTENDED, 0x7010, { 0, 10, 3, 10 }, 0, ISOTP_EXTFRAME }, // Stator Temperature 2
{ 0x18dadff1, 0x18daf1df, VEHICLE_POLL_TYPE_OBDIIEXTENDED, 0x700C, { 0, 10, 10, 10 }, 0, ISOTP_EXTFRAME }, // Inverter temperature
{ 0x18dadff1, 0x18daf1df, VEHICLE_POLL_TYPE_OBDIIEXTENDED, 0x700F, { 0, 10, 10, 10 }, 0, ISOTP_EXTFRAME }, // Stator Temperature 1
{ 0x18dadff1, 0x18daf1df, VEHICLE_POLL_TYPE_OBDIIEXTENDED, 0x7010, { 0, 10, 10, 10 }, 0, ISOTP_EXTFRAME }, // Stator Temperature 2
//{ 0x18dadff1, 0x18daf1df, VEHICLE_POLL_TYPE_OBDIIEXTENDED, 0x2001, { 0, 10, 3, 10 }, 0, ISOTP_EXTFRAME }, // Motor rpm
{ 0x18dadff1, 0x18daf1df, VEHICLE_POLL_TYPE_OBDIIEXTENDED, 0x2004, { 0, 60, 3, 60 }, 0, ISOTP_EXTFRAME }, // Battery voltage sense
{ 0x18dadff1, 0x18daf1df, VEHICLE_POLL_TYPE_OBDIIEXTENDED, 0x7049, { 0, 60, 3, 60 }, 0, ISOTP_EXTFRAME }, // Current voltage sense
@ -46,7 +46,7 @@ static const OvmsVehicle::poll_pid_t renault_zoe_polls[] = {
//EVC-HCM-VCM
//{ 0x18dadaf1, 0x18daf1da, VEHICLE_POLL_TYPE_OBDIISESSION, SESSION_EXTDIAG, { 0, 60, 60, 60 }, 0, ISOTP_EXTFRAME }, // OBD Extended Diagnostic Session
{ 0x18dadaf1, 0x18daf1da, VEHICLE_POLL_TYPE_OBDIIEXTENDED, 0x2006, { 0, 10, 10, 300 }, 0, ISOTP_EXTFRAME }, // Odometer
{ 0x18dadaf1, 0x18daf1da, VEHICLE_POLL_TYPE_OBDIIEXTENDED, 0x2003, { 0, 60, 1, 300 }, 0, ISOTP_EXTFRAME }, // Vehicle Speed
{ 0x18dadaf1, 0x18daf1da, VEHICLE_POLL_TYPE_OBDIIEXTENDED, 0x2003, { 0, 60, 2, 300 }, 0, ISOTP_EXTFRAME }, // Vehicle Speed
{ 0x18dadaf1, 0x18daf1da, VEHICLE_POLL_TYPE_OBDIIEXTENDED, 0x2005, { 0, 10, 5, 3 }, 0, ISOTP_EXTFRAME }, // 12Battery Voltage
{ 0x18dadaf1, 0x18daf1da, VEHICLE_POLL_TYPE_OBDIIEXTENDED, 0x21D0, { 0, 10, 10, 3 }, 0, ISOTP_EXTFRAME }, // DCDC Temperature
{ 0x18dadaf1, 0x18daf1da, VEHICLE_POLL_TYPE_OBDIIEXTENDED, 0x21CF, { 0, 10, 10, 300 }, 0, ISOTP_EXTFRAME }, // Inverter Status
@ -88,12 +88,12 @@ static const OvmsVehicle::poll_pid_t renault_zoe_polls[] = {
//LBC
//{ 0x18dadbf1, 0x18daf1db, VEHICLE_POLL_TYPE_OBDIISESSION, SESSION_DEFAULT, { 0, 60, 60, 60 }, 0, ISOTP_EXTFRAME }, // OBD Extended Diagnostic Session
{ 0x18dadbf1, 0x18daf1db, VEHICLE_POLL_TYPE_OBDIIEXTENDED, 0x9002, { 0, 10, 3, 10 }, 0, ISOTP_EXTFRAME }, // SOC
{ 0x18dadbf1, 0x18daf1db, VEHICLE_POLL_TYPE_OBDIIEXTENDED, 0x9002, { 0, 10, 10, 10 }, 0, ISOTP_EXTFRAME }, // SOC
{ 0x18dadbf1, 0x18daf1db, VEHICLE_POLL_TYPE_OBDIIEXTENDED, 0x9003, { 0, 10, 10, 10 }, 0, ISOTP_EXTFRAME }, // SOH
{ 0x18dadbf1, 0x18daf1db, VEHICLE_POLL_TYPE_OBDIIEXTENDED, 0x9005, { 0, 10, 3, 5 }, 0, ISOTP_EXTFRAME }, // Battery Voltage
{ 0x18dadbf1, 0x18daf1db, VEHICLE_POLL_TYPE_OBDIIEXTENDED, 0x925D, { 0, 10, 3, 5 }, 0, ISOTP_EXTFRAME }, // Battery Current
{ 0x18dadbf1, 0x18daf1db, VEHICLE_POLL_TYPE_OBDIIEXTENDED, 0x9012, { 0, 10, 3, 5 }, 0, ISOTP_EXTFRAME }, // Battery Average Temperature
{ 0x18dadbf1, 0x18daf1db, VEHICLE_POLL_TYPE_OBDIIEXTENDED, 0x91C8, { 0, 10, 3, 5 }, 0, ISOTP_EXTFRAME }, // Battery Available Energy kWh
{ 0x18dadbf1, 0x18daf1db, VEHICLE_POLL_TYPE_OBDIIEXTENDED, 0x9012, { 0, 10, 10, 5 }, 0, ISOTP_EXTFRAME }, // Battery Average Temperature
{ 0x18dadbf1, 0x18daf1db, VEHICLE_POLL_TYPE_OBDIIEXTENDED, 0x91C8, { 0, 10, 10, 5 }, 0, ISOTP_EXTFRAME }, // Battery Available Energy kWh
{ 0x18dadbf1, 0x18daf1db, VEHICLE_POLL_TYPE_OBDIIEXTENDED, 0x9243, { 0, 10, 10, 10 }, 0, ISOTP_EXTFRAME }, // Energy charged kWh
{ 0x18dadbf1, 0x18daf1db, VEHICLE_POLL_TYPE_OBDIIEXTENDED, 0x9245, { 0, 10, 10, 10 }, 0, ISOTP_EXTFRAME }, // Energy discharged kWh
{ 0x18dadbf1, 0x18daf1db, VEHICLE_POLL_TYPE_OBDIIEXTENDED, 0x9247, { 0, 10, 10, 10 }, 0, ISOTP_EXTFRAME }, // Energy regenerated kWh
@ -225,7 +225,7 @@ static const OvmsVehicle::poll_pid_t renault_zoe_polls[] = {
//UCM
//{ 0x74D, 0x76D, VEHICLE_POLL_TYPE_OBDIISESSION, SESSION_AfterSales, { 0, 60, 60, 60 }, 0, ISOTP_STD }, // OBD Extended Diagnostic Session
{ 0x74D, 0x76D, VEHICLE_POLL_TYPE_OBDIIEXTENDED, 0x6079, { 0, 10, 5, 3 }, 0, ISOTP_STD }, // 12V Battery current
{ 0x74D, 0x76D, VEHICLE_POLL_TYPE_OBDIIEXTENDED, 0x6079, { 0, 10, 10, 10 }, 0, ISOTP_STD }, // 12V Battery current
//TDB
//{ 0x743, 0x763, VEHICLE_POLL_TYPE_OBDIISESSION, SESSION_AfterSales, { 0, 60, 60, 60 }, 0, ISOTP_STD }, // OBD Extended Diagnostic Session

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

@ -210,12 +210,12 @@ void OvmsVehicleRenaultZoePh2::ChargeStatistics() {
}
CarLastCharging = CarIsCharging;
if (!StandardMetrics.ms_v_charge_pilot->AsBool() || !StandardMetrics.ms_v_charge_inprogress->AsBool() || (charge_current <= 0.0) ) {
if (!StandardMetrics.ms_v_charge_pilot->AsBool() || !StandardMetrics.ms_v_charge_inprogress->AsBool() || (charge_current >= 0.0) ) {
return;
}
if (charge_voltage > 0 && charge_current > 0) {
float power = charge_voltage * charge_current / 1000.0;
if (charge_voltage > 0 && charge_current < 0) {
float power = fabs(charge_voltage * charge_current / 1000.0f);
float energy = power / 3600.0 * 10.0;
StandardMetrics.ms_v_charge_kwh->SetValue( StandardMetrics.ms_v_charge_kwh->AsFloat() + energy);