Ajout version webserveur, Ajout partition pour ESP32

Author: Devdevdavid

lightkit/software/data/firmware.html

@@ -16,17 +16,12 @@ <h1 id="title">Lightkit</h1>
       <h2>Firmware</h2>
       <p>
         Version actuelle:<br>
-        <span id="firmware_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='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>
@@ -37,13 +32,10 @@ <h2>Web Serveur</h2>
       <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>
       </form>
-      <a href="index.html" class="theme">< Retour</a>
     </div>
+    <br>
+    <a href="index.html" class="theme">< Retour</a>
   </div>
   <div id="footer">
     Hardware - Pascal RONDANE<br>
@@ -74,16 +66,6 @@ <h2>Web Serveur</h2>
 
       set_message("ok", "Envoi en cours...");
 
-      // track upload progress
-      xhr.upload.onprogress = function(evt) {
-        if (evt.lengthComputable) {
-          var per = evt.loaded / evt.total * 100;
-          console.log("Uploading: " + per + "%");
-          //$('#progress_bar_label').html('Uploading: ' + Math.round(per*100) + '%');
-          //$('#progress_bar').css('width',Math.round(per*100) + '%');
-        }
-      };
-
       // track completion: both successful or not
       xhr.onloadend = function() {
         if ((xhr.status == 200) && (xhr.responseText == "0")) {
@@ -133,8 +115,9 @@ <h2>Web Serveur</h2>
       add_file_listener('#webserver_file', 'filesystem');
 
       cgi_request('/get_version', '', function(textReply) {
-        document.getElementById('firmware_Version').innerHTML = textReply;
+        document.getElementById('firmware_version').innerHTML = textReply;
       });
+      document.getElementById('webserver_version').innerHTML = "v" + get_version();
     }
   </script>
 </body>

lightkit/software/data/lib.js

@@ -1,3 +1,8 @@
+function get_version()
+{
+  return "1.0.1";
+}
+
 /**
  * @brief Set error message in box id=status_msg
  */

lightkit/software/doc/partitions.md

@@ -0,0 +1,11 @@
+# Partitions ESP
+
+Il est possible de configurer les partitions utilisées par l'ESP en éditant un fichier `*.csv`.
+Le fichier par défaut utilisé est localisé ici `~/.platformio/packages/framework-arduinoespressif32/tools/partitions`
+
+Pour utiliser le nouveau fichier dans platformio, on édite le fichier `*.ini` :
+
+```
+[base_esp32]
+board_build.partitions = src/partition/esp32_SK_1.9M_FS_320k.csv
+```

lightkit/software/platformio.ini

@@ -32,6 +32,7 @@ lib_deps =
 [base_esp32]
 platform = espressif32
 board_build.filesystem = spiffs
+board_build.partitions = src/partition/esp32_SK_1.9M_FS_320k.csv
 lib_deps =
   ${env.lib_deps}
   ESP32WebServer

lightkit/software/src/partition/esp32_SK_1.9M_FS_320k.csv

@@ -0,0 +1,8 @@
+# app: 1.9MBB
+# spiffs: 320kB
+# Name,   Type, SubType, Offset,  Size, Flags
+nvs,      data, nvs,     0x9000,  0x5000,
+otadata,  data, ota,     0xe000,  0x2000,
+app0,     app,  ota_0,   0x10000, 0x1D0000,
+app1,     app,  ota_1,   0x1E0000,0x1D0000,
+spiffs,   data, spiffs,  0x3B0000,0x50000,

lightkit/software/src/web/web_server.cpp

@@ -30,7 +30,8 @@
 G_WebServer server(WEB_SERVER_HTTP_PORT);
 
 // Internals
-static String updaterError;
+static String   updaterError;
+static uint32_t updateBufferMaxSpace = 0;
 
 static String getContentType(String filename)
 {
@@ -102,9 +103,17 @@ static void handle_update_done(void)
 	}
 }
 
+/**
+ * @brief Show usage information on buffer usage
+ * @details We don't have the actual file size
+ * information so we display usage instead
+ *
+ * @param progress 	Size received
+ * @param size 		Max size of the buffer
+ */
 static void handle_update_data_progress(uint32_t progress, uint32_t size)
 {
-	log_info("Uploading : %d%% (%d kB)", (progress * 100) / size, progress / 1000);
+	log_info("Buffer usage: %d%% (%d kB)", (progress * 100) / size, progress / 1000);
 }
 
 static void handle_update_error()
@@ -118,26 +127,28 @@ static void handle_update_data(void)
 {
 	// 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();
+	HTTPUpload & upload = server.upload();
 
 	if (upload.status == UPLOAD_FILE_START) {
 		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
+			updateBufferMaxSpace = file_sys_get_max_size();
+
+			if (!Update.begin(updateBufferMaxSpace, U_CMD_FS)) {
 				handle_update_error();
 			}
 		} else {
-			if (!Update.begin(maxSketchSpace, U_FLASH)) { //start with max available size
+			updateBufferMaxSpace = (ESP.getFreeSketchSpace() - 0x1000) & 0xFFFFF000;
+
+			if (!Update.begin(updateBufferMaxSpace, U_FLASH)) {
 				handle_update_error();
 			}
 		}
 	} else if (upload.status == UPLOAD_FILE_WRITE && !updaterError.length()) {
-		handle_update_data_progress(upload.totalSize, maxSketchSpace);
+		handle_update_data_progress(upload.totalSize, updateBufferMaxSpace);
 
 		if (Update.write(upload.buf, upload.currentSize) != upload.currentSize) {
 			handle_update_error();