Include zoe modules default build

OVMS.V3/components/can/src/canlog.cpp

@@ -596,7 +596,11 @@ void canlog::LogInfo(canbus* bus, CAN_log_type_t type, const char* text)
     msg.origin = bus;
     msg.text = strdup(text);
     m_msgcount++;
-    if (xQueueSend(m_queue, &msg, 0) != pdTRUE) m_dropcount++;
+    if (xQueueSend(m_queue, &msg, 0) != pdTRUE)
+      {
+      m_dropcount++;
+      free(msg.text);
+      }
     }
   else
     {

OVMS.V3/components/ovms_webserver/src/web_cfg_init.cpp

@@ -749,7 +749,7 @@ std::string OvmsWebServer::CfgInit3(PageEntry_t& p, PageContext_t& c, std::strin
   if (server.empty())
     server = MyConfig.GetParamValue("ota", "server");
   if (server.empty())
-        server = "https://ovms-ota.bit-cloud.de";
+    server = "https://ovms-ota.bit-cloud.de";
 
   MyOTA.GetStatus(info, true);
 

OVMS.V3/components/vehicle/vehicle.cpp

@@ -1502,6 +1502,12 @@ void OvmsVehicle::MetricModified(OvmsMetric* metric)
         NotifyChargeState();
       }
     }
+  else if (metric == StandardMetrics.ms_v_charge_type)
+    {
+    std::string m = metric->AsString();
+    MyEvents.SignalEvent("vehicle.charge.type", (void*)m.c_str(), m.size()+1);
+    NotifiedVehicleChargeType(m);
+    }
   else if (metric == StandardMetrics.ms_v_gen_state)
     {
     std::string state = metric->AsString();
@@ -1509,6 +1515,12 @@ void OvmsVehicle::MetricModified(OvmsMetric* metric)
     if (m_autonotifications)
       NotifyGenState();
     }
+  else if (metric == StandardMetrics.ms_v_gen_type)
+    {
+    std::string m = metric->AsString();
+    MyEvents.SignalEvent("vehicle.gen.type", (void*)m.c_str(), m.size()+1);
+    NotifiedVehicleGenType(m);
+    }
   else if (metric == StandardMetrics.ms_v_pos_speed)
     {
     // Collect data for trip speed average:

OVMS.V3/components/vehicle/vehicle.h

@@ -447,7 +447,9 @@ class OvmsVehicle : public InternalRamAllocated
     virtual void NotifiedVehicleDrivemode(int drivemode) {}
     virtual void NotifiedVehicleChargeMode(const char* m) {}
     virtual void NotifiedVehicleChargeState(const char* s) {}
+    virtual void NotifiedVehicleChargeType(const std::string& state) {}
     virtual void NotifiedVehicleGenState(const std::string& state) {}
+    virtual void NotifiedVehicleGenType(const std::string& state) {}
 
   protected:
     virtual void ConfigChanged(OvmsConfigParam* param);

OVMS.V3/main/Kconfig

@@ -353,19 +353,19 @@ config OVMS_VEHICLE_CAN_RX_QUEUE_SIZE
     help
         The size of the CAN bus RX queue (at the vehicle component).
 
-        config OVMS_VEHICLE_RENAULTZOE_PH2_OBD
-            bool "Include support for Renault Zoe PH2 vehicles via OBD port (read-only)"
-            default y
-            depends on OVMS
-            help
-                Enable to include support for Renault Zoe Ph2 vehicles via OBD port (read-only).
+config OVMS_VEHICLE_RENAULTZOE_PH2_OBD
+    bool "Include support for Renault Zoe PH2 vehicles via OBD port (read-only)"
+    default y
+    depends on OVMS
+    help
+        Enable to include support for Renault Zoe Ph2 vehicles via OBD port (read-only).
         
-        config OVMS_VEHICLE_RENAULTZOE_PH2_CAN
-            bool "Include support for Renault Zoe PH2 vehicles via direct CAN access after Core Can Gateway"
-            default y
-            depends on OVMS
-            help
-                Enable to include support for Renault Zoe Ph2 vehicles via direct CAN access after Core Can Gateway.
+config OVMS_VEHICLE_RENAULTZOE_PH2_CAN
+    bool "Include support for Renault Zoe PH2 vehicles via direct CAN access after Core Can Gateway"
+    default y
+    depends on OVMS
+    help
+        Enable to include support for Renault Zoe Ph2 vehicles via direct CAN access after Core Can Gateway.
         
 endmenu # Vehicle Support