multiple changes

Software/src/webui.cpp

@@ -8,21 +8,30 @@ String processor(const String &var);
 void WebserverPOST_Callback(AsyncWebServerRequest *request);
 void WebserverNotFound_Callback(AsyncWebServerRequest *request);
 void Webserver_Callback(AsyncWebServerRequest *request);
+void WebserverFirmwareUpdate_Callback(AsyncWebServerRequest *request, const String &filename, size_t index, uint8_t *data, size_t len, bool final);
+uint32_t GetFlashVersion();
 
 void initWebUI()
 {
   if (!LittleFS.begin())
   {
     Serial.println("An Error has occurred while mounting LittleFS");
+    MaintainDTC(DTC_FLASHFS_ERROR, true);
     return;
   }
 
+  MDNS.begin(globals.DeviceName);
+  MDNS.addService("telnet", "tcp", 23);
+  MDNS.addService("http", "tcp", 80);
+
   webServer.serveStatic("/static/", LittleFS, "/static/").setCacheControl("max-age=360000");
   webServer.on("/", HTTP_GET, [](AsyncWebServerRequest *request)
                { request->redirect("/index.htm"); });
   webServer.onNotFound(WebserverNotFound_Callback);
   webServer.on("/index.htm", HTTP_GET, Webserver_Callback);
   webServer.on("/post.htm", HTTP_POST, WebserverPOST_Callback);
+  webServer.on(
+      "/doUpdate", HTTP_POST, [](AsyncWebServerRequest *request) {}, WebserverFirmwareUpdate_Callback);
 
   webServer.begin();
 }
@@ -176,6 +185,8 @@ String processor(const String &var)
     sprintf(buffer, "%d.%02d", SW_VERSION_MAJOR, SW_VERSION_MINOR);
     return String(buffer);
   }
+  if (var == "FS_VERSION")
+    return String(GetFlashVersion());
 
   if (var == "PLACEHOLDER")
     return "placeholder";
@@ -275,4 +286,65 @@ void WebserverPOST_Callback(AsyncWebServerRequest *request)
 void WebserverNotFound_Callback(AsyncWebServerRequest *request)
 {
   request->send(404, "text/html", "Not found");
-}
+}
+
+uint32_t GetFlashVersion()
+{
+
+  char buffer[20];
+  File this_file = LittleFS.open("version", "r");
+  if (!this_file)
+  { // failed to open the file, retrn empty result
+    return 0;
+  }
+  while (this_file.available())
+  {
+    this_file.readBytesUntil('\r', buffer, sizeof(buffer));
+  }
+  this_file.close();
+  return atoi(buffer);
+}
+
+void WebserverFirmwareUpdate_Callback(AsyncWebServerRequest *request, const String &filename, size_t index, uint8_t *data, size_t len, bool final)
+{
+
+  if (!index)
+  {
+    Serial.println("Update");
+    size_t content_len = request->contentLength();
+    // if filename includes spiffs, update the spiffs partition
+    int cmd = (filename.indexOf(".fs") > -1) ? U_FS : U_FLASH;
+    Update.runAsync(true);
+    if (!Update.begin(content_len, cmd))
+    {
+      Update.printError(Serial);
+    }
+  }
+
+  if (Update.write(data, len) != len)
+  {
+    Update.printError(Serial);
+  }
+  else
+  {
+    Serial.printf("Progress: %d%%\n", (Update.progress() * 100) / Update.size());
+  }
+
+  if (final)
+  {
+    AsyncWebServerResponse *response = request->beginResponse(302, "text/plain", "Please wait while the device reboots");
+    response->addHeader("Refresh", "20");
+    response->addHeader("Location", "/");
+    request->send(response);
+    if (!Update.end(true))
+    {
+      Update.printError(Serial);
+    }
+    else
+    {
+      Serial.println("Update complete");
+      Serial.flush();
+      ESP.restart();
+    }
+  }
+}