Merge branch 'master' into AWS_IoT_Core_support

Author: shadowguardian507-irl

plugins/abrp/README.rst

@@ -7,6 +7,12 @@ Open Vehicle Monitor System v3 - Change log
     - Fixed MQTT CONNECT to omit empty username/password for certificate-only auth.
     - New option "retain.depth.limit": disables RETAIN on deep topics (>8 segments)
       for brokers like AWS IoT Core that reject them.
+- Autostart: added init option "minimal" to boot with just basic networking as configured; this is
+    now the first fallback in case of repeated early crashes, aiming at keeping the module reachable
+    in case of a bug in a higher level module / configuration. Auto init will be disabled only if
+    early crashes continue in minimal mode.
+  Config extension:
+    [auto] init                           -- "no" / "yes" / "minimal" (default "yes")
 - Server V3: the MQTT client ID to use can now be configured. While not normally necessary, changing the
     client ID may be necessary to discard an existing MQTT server session when changing the username.
   New configs:

vehicle/OVMS.V3/changes.txt

@@ -320,7 +320,7 @@ void dbc_autoload(int verbosity, OvmsWriter* writer, OvmsCommand* cmd, int argc,
 
 void dbc_sdmounted(std::string event, void* data)
   {
-  if (MyConfig.GetParamValueBool("auto", "dbc", false))
+  if (MyDBC.m_autoload)
     MyDBC.LoadAutoExtras(true);
   }
 
@@ -955,5 +955,12 @@ dbcfile* dbc::SelectedFile()
 void dbc::AutoInit()
   {
   if (MyConfig.GetParamValueBool("auto", "dbc", false))
+    {
     LoadDirectory("/store/dbc", true);
+    m_autoload = true;
+    }
+  else
+    {
+    m_autoload = false;
+    }
   }

vehicle/OVMS.V3/components/dbc/src/dbc_app.cpp

@@ -77,6 +77,7 @@ class dbc
     OvmsMutex m_mutex;
     dbcLoadedFiles_t m_dbclist;
     dbcfile* m_selected;
+    bool m_autoload = false;
   };
 
 extern dbc MyDBC;

vehicle/OVMS.V3/components/dbc/src/dbc_app.h

@@ -191,6 +191,14 @@ void ota_flash_vfs(int verbosity, OvmsWriter* writer, OvmsCommand* cmd, int argc
     }
   writer->printf("Source image is %ld bytes in size\n",ds.st_size);
 
+  if (ds.st_size > target->size)
+    {
+    writer->printf("Error: target partition too small (%u bytes capacity) - aborting\n", target->size);
+    if (target->size < 0x700000)
+      writer->puts("Consider upgrading your partitioning scheme to v3-35.");
+    return;
+    }
+
   FILE* f = fopen(argv[0], "r");
   if (f == NULL)
     {
@@ -325,14 +333,22 @@ void ota_flash_http(int verbosity, OvmsWriter* writer, OvmsCommand* cmd, int arg
     }
 
   size_t expected = http.BodySize();
-  if (expected < 32)
+  if (expected < 1024) // empty / HTML error page?
     {
     writer->printf("Error: Expected download file size (%d) is invalid\n",expected);
     return;
     }
 
   writer->printf("Expected file size is %d\n",expected);
 
+  if (expected > target->size)
+    {
+    writer->printf("Error: target partition too small (%u bytes capacity) - aborting\n", target->size);
+    if (target->size < 0x700000)
+      writer->puts("Consider upgrading your partitioning scheme to v3-35.");
+    return;
+    }
+
   MyOTA.SetFlashStatus("OTA Flash HTTP: Preparing flash partition...");
   writer->puts(MyOTA.GetFlashStatus());
   esp_ota_handle_t otah;
@@ -1018,6 +1034,16 @@ bool OvmsOTA::AutoFlashSD()
     }
   ESP_LOGW(TAG, "AutoFlashSD Source image is %d bytes in size",(int)ds.st_size);
 
+  if (ds.st_size > target->size)
+    {
+    ESP_LOGE(TAG, "Error: target partition too small (%u bytes capacity) - aborting\n", target->size);
+    if (target->size < 0x700000)
+      {
+      ESP_LOGE(TAG, "Consider upgrading your partitioning scheme to v3-35.");
+      }
+    return false;
+    }
+
   SetFlashStatus("OTA Auto Flash SD: Preparing flash partition...",0,true);
   esp_ota_handle_t otah;
   esp_err_t err = esp_ota_begin(target, ds.st_size, &otah);
@@ -1422,13 +1448,23 @@ bool OvmsOTA::AutoFlash(bool force)
     }
 
   size_t expected = http.BodySize();
-  if (expected < 32)
+  if (expected < 1024) // empty / HTML error page?
     {
     ESP_LOGE(TAG, "AutoFlash: Expected download file size (%d) is invalid", expected);
     m_lastcheckday = -1; // Allow to try again within the same day
     return false;
     }
 
+  if (expected > target->size)
+    {
+    ESP_LOGE(TAG, "Error: target partition too small (%u bytes capacity) - aborting\n", target->size);
+    if (target->size < 0x700000)
+      {
+      ESP_LOGE(TAG, "Consider upgrading your partitioning scheme to v3-35.");
+      }
+    return false;
+    }
+
   SetFlashStatus("OTA Auto Flash: Preparing flash partition...",0,true);
   esp_ota_handle_t otah;
   esp_err_t err = esp_ota_begin(target, expected, &otah);

vehicle/OVMS.V3/components/ovms_ota/src/ovms_ota.cpp

@@ -33,7 +33,8 @@ void OvmsWebServer::HandleCfgAutoInit(PageEntry_t& p, PageContext_t& c)
 {
   auto lock = MyConfig.Lock();
   std::string error, warn;
-  bool init, ext12v, modem, server_v2, server_v3;
+  std::string init;
+  bool ext12v, modem, server_v2, server_v3;
   #ifdef CONFIG_OVMS_SC_JAVASCRIPT_DUKTAPE
     bool scripting;
   #endif
@@ -46,7 +47,7 @@ void OvmsWebServer::HandleCfgAutoInit(PageEntry_t& p, PageContext_t& c)
 
   if (c.method == "POST") {
     // process form submission:
-    init = (c.getvar("init") == "yes");
+    init = c.getvar("init");
     dbc = (c.getvar("dbc") == "yes");
     ext12v = (c.getvar("ext12v") == "yes");
     #ifdef CONFIG_OVMS_COMP_MAX7317
@@ -96,7 +97,7 @@ void OvmsWebServer::HandleCfgAutoInit(PageEntry_t& p, PageContext_t& c)
 
     if (error == "") {
       // success:
-      MyConfig.SetParamValueBool("auto", "init", init);
+      MyConfig.SetParamValue("auto", "init", init);
       MyConfig.SetParamValueBool("auto", "dbc", dbc);
       MyConfig.SetParamValueBool("auto", "ext12v", ext12v);
       #ifdef CONFIG_OVMS_COMP_MAX7317
@@ -136,7 +137,7 @@ void OvmsWebServer::HandleCfgAutoInit(PageEntry_t& p, PageContext_t& c)
   }
   else {
     // read configuration:
-    init = MyConfig.GetParamValueBool("auto", "init", true);
+    init = MyConfig.GetParamValue("auto", "init", "yes");
     dbc = MyConfig.GetParamValueBool("auto", "dbc", false);
     ext12v = MyConfig.GetParamValueBool("auto", "ext12v", false);
     #ifdef CONFIG_OVMS_COMP_MAX7317
@@ -164,27 +165,16 @@ void OvmsWebServer::HandleCfgAutoInit(PageEntry_t& p, PageContext_t& c)
   c.panel_start("primary", "Auto start configuration");
   c.form_start(p.uri);
 
-  c.input_checkbox("Enable auto start", "init", init,
-    "<p>Note: if a crash occurs within 10 seconds after powering the module, autostart will be temporarily"
-    " disabled. You may need to use the USB shell to access the module and fix the config.</p>");
-
-  #ifdef CONFIG_OVMS_SC_JAVASCRIPT_DUKTAPE
-    c.input_checkbox("Enable Javascript engine (Duktape)", "scripting", scripting,
-      "<p>Enable execution of Javascript on the module (plugins, commands, event handlers).</p>");
-  #endif
-
-  c.input_checkbox("Autoload DBC files", "dbc", dbc,
-    "<p>Enable to autoload DBC files (for reverse engineering).</p>");
-
-  #ifdef CONFIG_OVMS_COMP_MAX7317
-    c.input_checkbox("Start EGPIO monitor", "egpio", egpio,
-      "<p>Enable to monitor EGPIO input ports and generate metrics and events from changes.</p>");
-    c.input_text("EGPIO ports", "egpio_ports", egpio_ports.c_str(), "Ports to monitor",
-      "<p>Enter list of port numbers (0…9) to monitor, separated by spaces.</p>");
-  #endif //CONFIG_OVMS_COMP_MAX7317
+  c.input_select_start("Auto init level", "init");
+  c.input_select_option("Full (as configured below)", "yes", (init == "yes"));
+  c.input_select_option("Minimal (just basic networking as configured)", "minimal", (init == "minimal"));
+  c.input_select_option("Disabled (only USB access)", "no", (init == "no"));
+  c.input_select_end(
+    "<p>Note: on successive early crashes after powering on, the level will be reduced to 'minimal',"
+    " then 'disabled'. You may need to use the USB shell to access the module and fix the config.</p>");
 
-  c.input_checkbox("Power on external 12V", "ext12v", ext12v,
-    "<p>Enable to provide 12V to external devices connected to the module (i.e. ECU displays).</p>");
+  // Networking:
+  c.fieldset_start("Networking");
 
   c.input_select_start("Wifi mode", "wifi_mode");
   c.input_select_option("Access point", "ap", (wifi_mode == "ap"));
@@ -208,8 +198,14 @@ void OvmsWebServer::HandleCfgAutoInit(PageEntry_t& p, PageContext_t& c)
     c.input_select_option(kv.first.c_str(), kv.first.c_str(), (kv.first == wifi_ssid_client));
   c.input_select_end();
 
+  c.print("<hr>");
   c.input_checkbox("Start modem", "modem", modem);
 
+  c.fieldset_end();
+
+  // Vehicle:
+  c.fieldset_start("Vehicle");
+
   c.input_select_start("Vehicle type", "vehicle_type");
   c.input_select_option("&mdash;", "", vehicle_type.empty());
   // sort vehicle options by name:
@@ -220,6 +216,38 @@ void OvmsWebServer::HandleCfgAutoInit(PageEntry_t& p, PageContext_t& c)
     c.input_select_option(entry.first, entry.second, (vehicle_type == entry.second));
   c.input_select_end();
 
+  c.input_checkbox("Autoload DBC files", "dbc", dbc,
+    "<p>Enable to autoload DBC files (for reverse engineering).</p>");
+
+  c.fieldset_end();
+
+  #ifdef CONFIG_OVMS_SC_JAVASCRIPT_DUKTAPE
+  // Scripting:
+  c.fieldset_start("Scripting");
+    c.input_checkbox("Enable Javascript engine (Duktape)", "scripting", scripting,
+      "<p>Enable execution of Javascript on the module (plugins, commands, event handlers).</p>");
+  c.fieldset_end();
+  #endif
+
+  // Connections:
+  c.fieldset_start("Connections");
+  c.input_checkbox("Start server V2", "server_v2", server_v2);
+  c.input_checkbox("Start server V3", "server_v3", server_v3);
+  c.fieldset_end();
+
+  // Peripherals:
+  c.fieldset_start("Peripherals");
+
+  #ifdef CONFIG_OVMS_COMP_MAX7317
+    c.input_checkbox("Start EGPIO monitor", "egpio", egpio,
+      "<p>Enable to monitor EGPIO input ports and generate metrics and events from changes.</p>");
+    c.input_text("EGPIO ports", "egpio_ports", egpio_ports.c_str(), "Ports to monitor",
+      "<p>Enter list of port numbers (0…9) to monitor, separated by spaces.</p>");
+  #endif //CONFIG_OVMS_COMP_MAX7317
+
+  c.input_checkbox("Power on external 12V", "ext12v", ext12v,
+    "<p>Enable to provide 12V to external devices connected to the module (i.e. ECU displays).</p>");
+
   c.input_select_start("Start OBD2ECU", "obd2ecu");
   c.input_select_option("&mdash;", "", obd2ecu.empty());
   c.input_select_option("can1", "can1", obd2ecu == "can1");
@@ -229,10 +257,10 @@ void OvmsWebServer::HandleCfgAutoInit(PageEntry_t& p, PageContext_t& c)
   c.input_select_end(
     "<p>OBD2ECU translates OVMS to OBD2 metrics, i.e. to drive standard ECU displays</p>");
 
-  c.input_checkbox("Start server V2", "server_v2", server_v2);
-  c.input_checkbox("Start server V3", "server_v3", server_v3);
+  c.fieldset_end();
 
   c.print(
+    "<hr>"
     "<div class=\"form-group\">"
       "<div class=\"col-sm-offset-3 col-sm-9\">"
         "<button type=\"submit\" class=\"btn btn-default\" name=\"action\" value=\"save\">Save</button> "

vehicle/OVMS.V3/components/ovms_webserver/src/web_cfg_autostart.cpp

@@ -27,6 +27,7 @@
 */
 
 #include "ovms_webserver.h"
+#include "ovms_housekeeping.h"
 #include "buffered_shell.h"
 
 /**
@@ -492,6 +493,7 @@ std::string OvmsWebServer::CreateMenu(PageContext_t& c)
 
   if (vehicle != "") {
     std::string vehiclename = MyVehicleFactory.ActiveVehicleShortName();
+    if (vehiclename.empty()) vehiclename = "Vehicle";
     menu +=
       "<li class=\"dropdown\" id=\"menu-vehicle\">"
         "<a href=\"#\" class=\"dropdown-toggle\" data-toggle=\"dropdown\" role=\"button\" aria-haspopup=\"true\" aria-expanded=\"false\">"
@@ -572,12 +574,13 @@ void OvmsWebServer::OutputHome(PageEntry_t& p, PageContext_t& c)
     , tools.c_str());
 
   if (vehicle != "") {
-    const char* vehiclename = MyVehicleFactory.ActiveVehicleName();
+    std::string vehiclename = MyVehicleFactory.ActiveVehicleName();
+    if (vehiclename.empty()) vehiclename = "Vehicle";
     mg_printf_http_chunk(c.nc,
       "<fieldset class=\"menu\" id=\"fieldset-menu-vehicle\"><legend>%s</legend>"
       "<ul class=\"list-inline\">%s</ul>"
       "</fieldset>"
-      , vehiclename, vehicle.c_str());
+      , vehiclename.c_str(), vehicle.c_str());
   }
 
   c.printf(
@@ -589,8 +592,8 @@ void OvmsWebServer::OutputHome(PageEntry_t& p, PageContext_t& c)
   c.panel_end();
 
   // check auto init, show warning if disabled:
-  if (!MyConfig.GetParamValueBool("auto", "init", true)) {
-    c.alert("warning", "<p><strong>Warning:</strong> auto start disabled. Check auto start configuration.</p>");
+  if (MyHousekeeping->GetInitLevel() != INIT_Full) {
+    c.alert("warning", "<p><strong>Warning:</strong> auto start reduced or disabled. Check auto start configuration.</p>");
   }
 }
 

vehicle/OVMS.V3/components/ovms_webserver/src/web_framework.cpp

@@ -1065,6 +1065,42 @@ void OvmsVehicleNissanLeaf::IncomingFrameCan1(CAN_frame_t* p_frame)
           }
         }
 
+      // --------- Patch ZE1 : detect CHAdeMO charging via battery voltage/current ---------
+      if (cfg_ze1)
+        {
+        bool car_on = StandardMetrics.ms_v_env_on->AsBool();
+
+        // DC fast charge active if: car off + battery voltage plausible + strong inbound current
+        if (!car_on && battery_voltage > 200.0f && battery_current < -25.0f)
+          {
+          // CHAdeMO detected
+          if (StandardMetrics.ms_v_charge_state->AsString() != "charging"
+              || StandardMetrics.ms_v_charge_type->AsString() != "chademo")
+            {
+            vehicle_nissanleaf_charger_status(CHARGER_STATUS_QUICK_CHARGING);
+            }
+          // Pilot ON (cable connected, station OK)
+          StandardMetrics.ms_v_charge_pilot->SetValue(true);
+          // Keep charge metrics up-to-date
+          StandardMetrics.ms_v_charge_voltage->SetValue(battery_voltage);
+          StandardMetrics.ms_v_charge_current->SetValue(-battery_current);
+          StandardMetrics.ms_v_charge_power  ->SetValue(-battery_power);
+          if (battery_voltage > 0)
+            StandardMetrics.ms_v_charge_climit->SetValue(
+              m_battery_chargerate_max->AsFloat() * 1000.0f / battery_voltage);
+          }
+        else if (!car_on
+                 && StandardMetrics.ms_v_charge_inprogress->AsBool()
+                 && StandardMetrics.ms_v_charge_type->AsString() == "chademo"
+                 && battery_current > -5.0f)
+          {
+          // End of CHAdeMO charging
+          StandardMetrics.ms_v_charge_pilot->SetValue(false);
+          vehicle_nissanleaf_charger_status(CHARGER_STATUS_FINISHED);
+          }
+        }
+      // --------- End patch ZE1 ---------
+
     }
       break;
     case 0x1dc: