Add lock and door states

2022-04-18 01:07:32 +02:00 · 2022-04-18 01:07:32 +02:00 · 61e3bfbced
parent aabe4897a2
commit 61e3bfbced
3 changed files with 58 additions and 16 deletions
--- a/OVMS.V3/components/vehicle_renaultzoe_ph2/src/BCM_pids.cpp
+++ b/OVMS.V3/components/vehicle_renaultzoe_ph2/src/BCM_pids.cpp
@ -27,47 +27,47 @@

 void OvmsVehicleRenaultZoePh2::IncomingBCM(uint16_t type, uint16_t pid, const char* data, uint16_t len) {  
  switch (pid) {
-    case 0x4204: { 
+    case 0x4204: {  // TPMS pressure - front left
      StandardMetrics.ms_v_tpms_pressure->SetElemValue(MS_V_TPMS_IDX_FL, (float)CAN_UINT(0) * 7.5);
      ESP_LOGD(TAG, "4204 BCM tpms pressure FL: %f", CAN_UINT(0) * 7.5);
      break;
    }
-    case 0x4205: { 
+    case 0x4205: {  // TPMS pressure - front right
      StandardMetrics.ms_v_tpms_pressure->SetElemValue(MS_V_TPMS_IDX_FR, (float)CAN_UINT(0) * 7.5);
      ESP_LOGD(TAG, "4205 BCM tpms pressure FR: %f", CAN_UINT(0) * 7.5);
      break;
    }
-    case 0x4206: { 
+    case 0x4206: {  // TPMS pressure - rear left
      StandardMetrics.ms_v_tpms_pressure->SetElemValue(MS_V_TPMS_IDX_RL, (float)CAN_UINT(0) * 7.5);
      ESP_LOGD(TAG, "4206 BCM tpms pressure RL: %f", CAN_UINT(0) * 7.5);
      break;
    }
-    case 0x4207: { 
+    case 0x4207: {  // TPMS pressure - rear right
      StandardMetrics.ms_v_tpms_pressure->SetElemValue(MS_V_TPMS_IDX_RR, (float)CAN_UINT(0) * 7.5);
      ESP_LOGD(TAG, "4207 BCM tpms pressure RR: %f", CAN_UINT(0) * 7.5);
      break;
    }
-    case 0x420C: { 
+    case 0x420C: {  // TPMS temp - front left
      StandardMetrics.ms_v_tpms_temp->SetElemValue(MS_V_TPMS_IDX_FL, (float)(CAN_UINT(0) - 30) * 0.001);
      ESP_LOGD(TAG, "420C BCM tpms temp FL: %f", (CAN_UINT(0) - 30) * 0.001);
      break;
    }
-    case 0x420D: { 
+    case 0x420D: {  // TPMS temp - front right
      StandardMetrics.ms_v_tpms_temp->SetElemValue(MS_V_TPMS_IDX_FR, (float)(CAN_UINT(0) - 30) * 0.001);
      ESP_LOGD(TAG, "420D BCM tpms temp FR: %f", (CAN_UINT(0) - 30) * 0.001);
      break;
    }
-    case 0x420E: { 
+    case 0x420E: {  // TPMS temp - rear left
      StandardMetrics.ms_v_tpms_temp->SetElemValue(MS_V_TPMS_IDX_RL, (float)(CAN_UINT(0) - 30) * 0.001);
      ESP_LOGD(TAG, "420E BCM tpms temp RL: %f", (CAN_UINT(0) - 30) * 0.001);
      break;
    }
-    case 0x420F: { 
+    case 0x420F: {  // TPMS temp - rear right
      StandardMetrics.ms_v_tpms_temp->SetElemValue(MS_V_TPMS_IDX_RR, (float)(CAN_UINT(0) - 30) * 0.001);
      ESP_LOGD(TAG, "420F BCM tpms temp RR: %f", (CAN_UINT(0) - 30) * 0.001);
      break;
    }
-    case 0x4109: { 
+    case 0x4109: {  // TPMS alert - front left
      if (CAN_NIBL(0) == 0) {
        StandardMetrics.ms_v_tpms_alert->SetElemValue(MS_V_TPMS_IDX_FL, 0);
      }
@ -80,7 +80,7 @@ void OvmsVehicleRenaultZoePh2::IncomingBCM(uint16_t type, uint16_t pid, const ch
      ESP_LOGD(TAG, "40FF BCM tpms alert FL: %d", CAN_NIBL(0));
      break;
    }
-    case 0x410A: { 
+    case 0x410A: {  // TPMS alert - front right
      if (CAN_NIBL(0) == 0) {
        StandardMetrics.ms_v_tpms_alert->SetElemValue(MS_V_TPMS_IDX_FR, 0);
      }
@ -93,7 +93,7 @@ void OvmsVehicleRenaultZoePh2::IncomingBCM(uint16_t type, uint16_t pid, const ch
      ESP_LOGD(TAG, "40FF BCM tpms alert FR: %d", CAN_NIBL(0));
      break;
    }
-    case 0x410B: { 
+    case 0x410B: {  // TPMS alert - rear left
      if (CAN_NIBL(0) == 0) {
        StandardMetrics.ms_v_tpms_alert->SetElemValue(MS_V_TPMS_IDX_RL, 0);
      }
@ -106,7 +106,7 @@ void OvmsVehicleRenaultZoePh2::IncomingBCM(uint16_t type, uint16_t pid, const ch
      ESP_LOGD(TAG, "40FF BCM tpms alert RL: %d", CAN_NIBL(0));
      break;
    }
-    case 0x410C: { 
+    case 0x410C: {  // TPMS alert - rear right
      if (CAN_NIBL(0) == 0) {
        StandardMetrics.ms_v_tpms_alert->SetElemValue(MS_V_TPMS_IDX_RR, 0);
      }
@ -119,9 +119,44 @@ void OvmsVehicleRenaultZoePh2::IncomingBCM(uint16_t type, uint16_t pid, const ch
      ESP_LOGD(TAG, "40FF BCM tpms alert RR: %d", CAN_NIBL(0));
      break;
    }
-    case 0x608E: { 
+    case 0x608E: {  //Vehicle running aka ignition
      //reliability test needed
-      ESP_LOGD(TAG, "608E BCM Vehicle running: %f", CAN_NIBL(0));
+      ESP_LOGD(TAG, "608E BCM Vehicle running: %d", CAN_NIBL(0));
+      break;
+    }
+    case 0x8004: {  //Car secure aka vehicle locked 
+      StandardMetrics.ms_v_env_locked->SetValue((bool)CAN_NIBL(0));
+      ESP_LOGD(TAG, "%d Car Secure S: %d", pid, CAN_NIBL(0));
+      break;
+    }
+    case 0x6026: {  //Front left door
+      StandardMetrics.ms_v_door_fl->SetValue((bool)CAN_NIBL(0));
+      ESP_LOGD(TAG, "%d Front left door: %d", pid, CAN_NIBL(0));
+      break;
+    }
+    case 0x6027: {  //Front right door
+      StandardMetrics.ms_v_door_fr->SetValue((bool)CAN_NIBL(0));
+      ESP_LOGD(TAG, "%d Front right door: %d", pid, CAN_NIBL(0));
+      break;
+    }
+    case 0x61B2: {  //Rear left door
+      StandardMetrics.ms_v_door_rl->SetValue((bool)CAN_NIBL(0));
+      ESP_LOGD(TAG, "%d Rear left door: %d", pid, CAN_NIBL(0));
+      break;
+    }
+    case 0x61B3: {  //Rear right door
+      StandardMetrics.ms_v_door_rr->SetValue((bool)CAN_NIBL(0));
+      ESP_LOGD(TAG, "%d Rear right door: %d", pid, CAN_NIBL(0));
+      break;
+    }
+    case 0x609B: {  //Tailgate
+      StandardMetrics.ms_v_door_trunk->SetValue((bool)CAN_NIBL(0));
+      ESP_LOGD(TAG, "%d Tailgate: %d", pid, CAN_NIBL(0));
+      break;
+    }
+    case 0x0495: {  //Hood
+      StandardMetrics.ms_v_door_hood->SetValue((bool)CAN_NIBL(0));
+      ESP_LOGD(TAG, "%d Hood: %d", pid, CAN_NIBL(0));
      break;
    }

--- a/OVMS.V3/components/vehicle_renaultzoe_ph2/src/ph2_poller.h
+++ b/OVMS.V3/components/vehicle_renaultzoe_ph2/src/ph2_poller.h
@ -78,6 +78,13 @@ static const OvmsVehicle::poll_pid_t renault_zoe_polls[] = {
 { 0x745, 0x765, VEHICLE_POLL_TYPE_OBDIIEXTENDED, 0x410B, { 0, 300, 300, 300 }, 0, ISOTP_STD },  // TPMS alert - rear left
 { 0x745, 0x765, VEHICLE_POLL_TYPE_OBDIIEXTENDED, 0x410C, { 0, 300, 300, 300 }, 0, ISOTP_STD },  // TPMS alert - rear right
 { 0x745, 0x765, VEHICLE_POLL_TYPE_OBDIIEXTENDED, 0x608E, { 0, 3, 10, 60 }, 0, ISOTP_STD },  // Vehicle running aka ignition, need testing
+{ 0x745, 0x765, VEHICLE_POLL_TYPE_OBDIIEXTENDED, 0x8004, { 0, 3, 3, 3 }, 0, ISOTP_STD },  // Car secure aka vehicle locked
+{ 0x745, 0x765, VEHICLE_POLL_TYPE_OBDIIEXTENDED, 0x6026, { 0, 3, 3, 3 }, 0, ISOTP_STD },  // Front left door
+{ 0x745, 0x765, VEHICLE_POLL_TYPE_OBDIIEXTENDED, 0x6027, { 0, 3, 3, 3 }, 0, ISOTP_STD },  // Front right door
+{ 0x745, 0x765, VEHICLE_POLL_TYPE_OBDIIEXTENDED, 0x61B2, { 0, 3, 3, 3 }, 0, ISOTP_STD },  // Rear left door
+{ 0x745, 0x765, VEHICLE_POLL_TYPE_OBDIIEXTENDED, 0x61B3, { 0, 3, 3, 3 }, 0, ISOTP_STD },  // Rear right door
+{ 0x745, 0x765, VEHICLE_POLL_TYPE_OBDIIEXTENDED, 0x609B, { 0, 3, 3, 3 }, 0, ISOTP_STD },  // Tailgate
+{ 0x745, 0x765, VEHICLE_POLL_TYPE_OBDIIEXTENDED, 0x0495, { 0, 5, 5, 5 }, 0, ISOTP_STD },  // Hood

 //LBC
 //{ 0x18dadbf1, 0x18daf1db, VEHICLE_POLL_TYPE_OBDIISESSION, SESSION_DEFAULT,  { 0, 60, 60, 60 }, 0, ISOTP_EXTFRAME }, // OBD Extended Diagnostic Session
--- a/OVMS.V3/components/vehicle_renaultzoe_ph2/src/vehicle_renaultzoe_ph2.cpp
+++ b/OVMS.V3/components/vehicle_renaultzoe_ph2/src/vehicle_renaultzoe_ph2.cpp
@ -196,8 +196,8 @@ void OvmsVehicleRenaultZoePh2::Ticker10(uint32_t ticker) {
  float charge_voltage  = StandardMetrics.ms_v_bat_voltage->AsFloat(0, Volts);
  float battery_power   = StandardMetrics.ms_v_bat_power->AsFloat(0, kW);
  float charger_power   = StandardMetrics.ms_v_charge_power->AsFloat(0, kW);
-  float ac_current = mt_main_current->AsFloat(0, Amps);
-  string ac_phases = mt_main_phases->AsString();
+  float ac_current      = StandardMetrics.ms_v_charge_current->AsFloat(0, Amps);
+  string ac_phases      = mt_main_phases->AsString();
  
  if (CarIsCharging != CarLastCharging) {
        if (CarIsCharging) {