Merge branch 'master' of https://github.com/openvehicles/Open-Vehicle…

…-Monitoring-System-3
openvehicles · Aug 10, 2019 · 38d364d · 38d364d
2 parents 611b656 + 5bae402
commit 38d364d
Show file tree

Hide file tree

Showing 9 changed files with 591 additions and 6 deletions.
diff --git a/vehicle/OVMS.V3/changes.txt b/vehicle/OVMS.V3/changes.txt
@@ -1,6 +1,15 @@
 Open Vehicle Monitor System v3 - Change log
 
 ????-??-?? ???  ???????  OTA release
+- Twizy: OBD2 VIN reading & cluster DTC monitoring
+  New commands:
+    xrt dtc [show]                      Show DTC report
+    xrt dtc reset                       Reset statistics
+    xrt dtc clear                       Clear DTC stored in OVMS & car
+  New configs:
+    xrt [dtc_autoreset] = no            Reset statistics on each drive/charge
+  New history records:
+    RT-OBD-ClusterDTC (rec_nr = DTC slot nr)
 - New vehicle: Smart ED/EQ 4.Generation (453) (adaption by Thomas Heuer <egon@heuer-humfeld.de>)
 
 2019-05-12 MWJ  3.2.002  OTA release

diff --git a/vehicle/OVMS.V3/components/vehicle/vehicle.cpp b/vehicle/OVMS.V3/components/vehicle/vehicle.cpp
@@ -2043,6 +2043,7 @@ void OvmsVehicle::PollerReceive(CAN_frame_t* frame)
       if ((frame->data.u8[1] == 0x40+m_poll_type)&&
           (frame->data.u8[2] == m_poll_pid))
         {
+        m_poll_ml_frame = 0;
         IncomingPollReply(m_poll_bus, m_poll_type, m_poll_pid, &frame->data.u8[3], 5, 0);
         return;
         }

diff --git a/vehicle/OVMS.V3/components/vehicle_renaulttwizy/src/rt_can.cpp b/vehicle/OVMS.V3/components/vehicle_renaulttwizy/src/rt_can.cpp
@@ -619,6 +619,7 @@ void OvmsVehicleRenaultTwizy::IncomingFrameCan1(CAN_frame_t* p_frame)
       break;
 
 
+#if 0
     case 0x69F:
       // --------------------------------------------------------------------------
       // *** VIN ***
@@ -637,6 +638,7 @@ void OvmsVehicleRenaultTwizy::IncomingFrameCan1(CAN_frame_t* p_frame)
         *StdMetrics.ms_v_vin = (string) twizy_vin;
       }
       break;
+#endif
 
 
     case 0x700: