Made firmware upload procedure more generic

ISB3DPRINTERS · Mar 18, 2022 · 5eeecca · 5eeecca
1 parent 1757418
commit 5eeecca
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 11 deletions.
diff --git a/run-localhost.sh b/run-localhost.sh
@@ -1,2 +1,2 @@
 cd src-app
-python3.9 -m http.server 8000
+python3.8 -m http.server 8000
diff --git a/src-app/js/SettingsPanel.js b/src-app/js/SettingsPanel.js
@@ -1719,19 +1719,20 @@ class UpdateFirmwarePage {
         }
         // An upgrade set includes the various print scripts as well as the firmware files.
         let files = [];
-        const scripts = ProfileManager.getSection("scripts");
-        if(scripts) {
-            files.push(SynDaverWiFi.fileFromStr("scripts/pause.gco",    scripts.pause_print_gcode  || ""));
-            files.push(SynDaverWiFi.fileFromStr("scripts/cancel.gco",   scripts.stop_print_gcode   || ""));
-            files.push(SynDaverWiFi.fileFromStr("scripts/resume.gco",   scripts.resume_print_gcode || ""));
-            files.push(SynDaverWiFi.fileFromStr("scripts/badprobe.gco", scripts.probe_fail_gcode   || ""));
-        }
         if(wireless.uploads) {
+            const scripts = ProfileManager.getSection("scripts");
             for(const pair of wireless.uploads) {
-                files.push(await SynDaverWiFi.fileFromUrl(pair[0], pair[1]));
+                let uploadDst = pair[0];
+                let uploadSrc = pair[1];
+                if(uploadSrc.startsWith("scripts:")) {
+                    uploadSrc = uploadSrc.replace(/^scripts:\s*/);
+                    files.push(SynDaverWiFi.fileFromStr(uploadDst, scripts[uploadSrc] || ""));
+                } else {
+                    files.push(await SynDaverWiFi.fileFromUrl(uploadDst, uploadSrc));
+                }
             }
         }
-        if(wireless.length == 0) {
+        if(files.length == 0) {
             alert("Nothing to upload. The wireless configuration in the profile may be incomplete.");
             return;
         }

diff --git a/src-app/service-worker.js b/src-app/service-worker.js
@@ -27,7 +27,7 @@ importScripts('lib/util/misc/Wikify.js');
 // Based on https://deanhume.com/displaying-a-new-version-available-progressive-web-app/
 
 const info = {
-    cacheVersion: 203
+    cacheVersion: 204
 };
 
 const cacheName = 'v' + info.cacheVersion;