Upload de firmware + webserveur ok pour ESP32 et ESP8266

Author: Devdevdavid

lightkit/software/data/firmware.html

@@ -16,12 +16,28 @@ <h1 id="title">Lightkit</h1>
       <h2>Firmware</h2>
       <p>
         Version actuelle:<br>
-        <span id="current_version">-<!-- Filled by JS --></span>
+        <span id="firmware_Version">-<!-- Filled by JS --></span>
       </p>
       <form method='POST' id="firmware_file_form">
         <input type='file' name='firmware_file' id='firmware_file'>
         <button type='submit' class="theme">Mettre à jour</button>
-        <div id='progress_bar_container'>
+        <div id='firmware_progress_bar'>
+          <span id="progress_bar_label"></span>
+          <div id='progress_bar'></div>
+        </div>
+      </form>
+      <a href="index.html" class="theme">< Retour</a>
+    </div>
+    <div id="part_select_file">
+      <h2>Web Serveur</h2>
+      <p>
+        Version actuelle:<br>
+        <span id="webserver_version">-<!-- Filled by JS --></span>
+      </p>
+      <form method='POST' id="webserver_file_form">
+        <input type='file' name='webserver_file' id='webserver_file'>
+        <button type='submit' class="theme">Mettre à jour</button>
+        <div id='webserver_progress_bar'>
           <span id="progress_bar_label"></span>
           <div id='progress_bar'></div>
         </div>
@@ -50,11 +66,11 @@ <h2>Firmware</h2>
       xhttp.send();
     }
 
-    function upload_file(file) {
+    function upload_file(location, file) {
       let xhr = new XMLHttpRequest();
       var formData = new FormData();
 
-      formData.append("update", file);
+      formData.append(location, file);
 
       set_message("ok", "Envoi en cours...");
 
@@ -81,37 +97,43 @@ <h2>Firmware</h2>
           set_message("error", "Erreur lors de l'envoi: code=" + xhr.responseText);
         }
       };
-      xhr.open("POST", "/firmware_upload");
+      xhr.open("POST", "/update");
       xhr.send(formData);
     }
 
-    /**
-     * Start function to load the page
-     */
-    function page_start()
-    {
-      const form = document.querySelector('#firmware_file_form');
-
-      // Hide the box
-      set_message("hide");
+    function add_file_listener(selector, location) {
+      const form = document.querySelector(selector + '_form');
 
-      // Handle form validation
       form.addEventListener('submit', (e) => {
         e.preventDefault();
 
-        const files = document.querySelector('[type=file]').files;
+        const files = document.querySelector(selector).files;
 
         if (files.length != 1) {
           set_message("error", "Veillez selectionner un fichier");
           return;
         }
 
         // Do the actual upload
-        upload_file(files[0]);
+        upload_file(location, files[0]);
       });
+    }
+
+    /**
+     * Start function to load the page
+     */
+    function page_start()
+    {
+      const form = document.querySelector('#firmware_file_form');
+
+      // Hide the box
+      set_message("hide");
+
+      add_file_listener('#firmware_file', 'firmware');
+      add_file_listener('#webserver_file', 'filesystem');
 
       cgi_request('/get_version', '', function(textReply) {
-        document.getElementById('current_version').innerHTML = textReply;
+        document.getElementById('firmware_Version').innerHTML = textReply;
       });
     }
   </script>

lightkit/software/src/file_sys/file_sys.cpp

@@ -6,13 +6,6 @@
   */
 
 #include "file_sys.hpp"
-#include "global.hpp"
-
-#ifdef ESP32
-#include "SPIFFS.h"
-#else
-#include "LittleFS.h"
-#endif
 
 int file_sys_init(void)
 {
@@ -37,6 +30,25 @@ int file_sys_init(void)
 	return -1;
 }
 
+uint32_t file_sys_get_max_size(void)
+{
+#if defined(FS_IS_LITTLEFS)
+
+	FSInfo info;
+	G_FileSystem.info(info);
+	return info.totalBytes;
+
+#elif defined(FS_IS_SPIFFS)
+
+	return G_FileSystem.totalBytes();
+
+#else
+
+	return 0;
+
+#endif
+}
+
 bool file_sys_exist(String & path)
 {
 	return G_FileSystem.exists(path);

lightkit/software/src/file_sys/file_sys.hpp

@@ -11,10 +11,19 @@
 #include <Arduino.h>
 #include <FS.h>
 
+#include "global.hpp"
+
+#ifdef FS_IS_SPIFFS
+#include "SPIFFS.h"
+#else
+#include "LittleFS.h"
+#endif
+
 // File system
-int  file_sys_init(void);
-bool file_sys_exist(String & path);
-File file_sys_open(String & path, const char * mode);
-void file_sys_end(void);
+int      file_sys_init(void);
+uint32_t file_sys_get_max_size(void);
+bool     file_sys_exist(String & path);
+File     file_sys_open(String & path, const char * mode);
+void     file_sys_end(void);
 
 #endif /* FILE_SYS_FILE_SYS_H */

lightkit/software/src/global.hpp

@@ -21,6 +21,7 @@
 #define BUILD_DATE            __DATE__ " " __TIME__
 #define LIGHTKIT_VERSION      APP_VERSION " build " BUILD_DATE
 
+
 /* ===========================
  * COMMON TO ALL BOARDS
  * ===========================

lightkit/software/src/web/web_server.cpp

@@ -12,6 +12,7 @@
 #include <ESP8266WebServer.h>
 #endif
 #include <ArduinoJson.h>
+#include <StreamString.h>
 #include <string>
 
 #include "cmd/cmd.hpp"
@@ -28,6 +29,9 @@
 // Main handle for webserver
 G_WebServer server(WEB_SERVER_HTTP_PORT);
 
+// Internals
+static String updaterError;
+
 static String getContentType(String filename)
 {
 	if (server.hasArg("download"))
@@ -80,43 +84,75 @@ static void handle_bad_parameter(void)
 	server.send(200, "text/plain", "Bad parameter");
 }
 
-static void handle_firmware_upload(void)
+static void handle_update_done(void)
 {
+	// if (!_authenticated)
+	//     return server.requestAuthentication();
+	server.client().setNoDelay(true);
 	String msg = String(Update.getError());
 	server.sendHeader("Connection", "close");
 	server.send(200, "text/plain", msg);
+
+	if (!Update.hasError()) {
+		delay(100);
+		server.client().stop();
+
+		// Reset to apply in 1s to let time to send HTTP response
+		script_delayed_reset(1000);
+	}
+}
+
+static void handle_update_data_progress(uint32_t progress, uint32_t size)
+{
+	log_info("Uploading : %d%% (%d kB)", (progress * 100) / size, progress / 1000);
+}
+
+static void handle_update_error()
+{
+	StreamString str;
+	Update.printError(str);
+	updaterError = str.c_str();
 }
 
-static void handle_firmware_data(void)
+static void handle_update_data(void)
 {
-	HTTPUpload & upload = server.upload();
+	// handler for the file upload, get's the sketch bytes, and writes
+	// them through the Update object
+	HTTPUpload & upload         = server.upload();
+	uint32_t     maxSketchSpace = (ESP.getFreeSketchSpace() - 0x1000) & 0xFFFFF000;
+	uint32_t     maxFSSpace     = file_sys_get_max_size();
 
 	if (upload.status == UPLOAD_FILE_START) {
-		log_info("upload.totalSize = %d", upload.totalSize);
-
-		// Warning : contentLength is not the file length :
-		// size of entire post request, file size + headers and other request data.
-		// But it gives a good estimation of the amount of data needed.
-		// Using max size will overwrite filesystem and therefore break the webserver
-		// log_info("Starting update with: %s (%d kB)", upload.filename.c_str(), upload.contentLength / 1000);
-		// if (!Update.begin(upload.contentLength)) {
-		// 	Update.printError(Serial);
-		// }
-	} else if (upload.status == UPLOAD_FILE_WRITE) {
-		// Write the buffer (2048 bytes max)
-		// if (Update.write(upload.buf, upload.currentSize) != upload.currentSize) {
-		// 	Update.printError(Serial);
-		// }
-	} else if (upload.status == UPLOAD_FILE_END) {
-		if (Update.end(true)) { // true: to set the size to the current progress
-			log_info("Firmware update DONE");
-
-			// Reset to apply in 1s to let time to send HTTP response
-			script_delayed_reset(1000);
+		updaterError.clear();
+
+		log_info("Update: %s (%s)\n", upload.filename.c_str(), upload.name.c_str());
+
+		if (upload.name == "filesystem") {
+			if (!Update.begin(maxFSSpace, U_CMD_FS)) { //start with max available size
+				handle_update_error();
+			}
+		} else {
+			if (!Update.begin(maxSketchSpace, U_FLASH)) { //start with max available size
+				handle_update_error();
+			}
+		}
+	} else if (upload.status == UPLOAD_FILE_WRITE && !updaterError.length()) {
+		handle_update_data_progress(upload.totalSize, maxSketchSpace);
+
+		if (Update.write(upload.buf, upload.currentSize) != upload.currentSize) {
+			handle_update_error();
+		}
+	} else if (upload.status == UPLOAD_FILE_END && !updaterError.length()) {
+		if (Update.end(true)) { //true to set the size to the current progress
+			log_info("Update Success: %ukB\n", upload.totalSize / 1000);
 		} else {
-			Update.printError(Serial);
+			handle_update_error();
 		}
+	} else if (upload.status == UPLOAD_FILE_ABORTED) {
+		Update.end();
+		log_warn("Update was aborted");
 	}
+	delay(0);
 }
 
 /**
@@ -455,7 +491,7 @@ int web_server_init(void)
 
 	// --- Firmware Upload ---
 	server.on(
-	"/firmware_upload", HTTP_POST, []() { handle_firmware_upload(); }, []() { handle_firmware_data(); });
+	"/update", HTTP_POST, []() { handle_update_done(); }, []() { handle_update_data(); });
 
 	// --- Get/Set interface ---
 	server.on("/get_version", HTTP_GET, []() {

lightkit/software/src/web/web_server.hpp

@@ -12,6 +12,13 @@
 
 #define WEB_SERVER_HTTP_PORT 80 /**< Server port for web interface */
 
+// Chooses between implementation of Updater.h
+#ifdef FS_IS_SPIFFS
+#define U_CMD_FS U_SPIFFS
+#else
+#define U_CMD_FS U_FS
+#endif
+
 // Web Server
 int  web_server_init(void);
 void web_server_main(void);