flasher fix

Author: Distortions81

docs/flash.html

@@ -6,7 +6,7 @@
     <title>M45 Core Firmware Flasher</title>
     <script
       type="module"
-      src="https://unpkg.com/esp-web-tools@10/dist/web/install-button.js?module"
+      src="https://jason2866.github.io/esp-web-tools/dist/web/install-button.js?module"
     ></script>
     <style>
       :root {
@@ -291,14 +291,17 @@ <h2>Settings</h2>
         return document.querySelector("input[name='display']:checked").value;
       }
 
-      function findAsset(release, suffix) {
-        return release.assets.find((asset) => asset.name.endsWith(suffix));
+      function assetName(release, variant, eraseSettings) {
+        if (variant === "oled") {
+          return `m45-core-${release.tag_name}-oled${eraseSettings ? "-merged" : ""}.bin`;
+        }
+        return `m45-core-${release.tag_name}-ideaspark-19-lcd${eraseSettings ? "-merged" : ""}.bin`;
       }
 
-      function findRequiredAsset(release, suffix) {
-        const asset = findAsset(release, suffix);
+      function findRequiredAsset(release, name) {
+        const asset = release.assets.find((item) => item.name === name);
         if (!asset) {
-          throw new Error(`Latest release is missing ${suffix}.`);
+          throw new Error(`Latest release is missing ${name}.`);
         }
         if (!asset.digest || !asset.digest.startsWith("sha256:")) {
           throw new Error(`GitHub did not publish a SHA-256 digest for ${asset.name}.`);
@@ -341,8 +344,9 @@ <h2>Settings</h2>
         const mode = eraseSettingsEl.checked ? "erase" : "keep";
         const choice = assetsByMode[display][mode];
         const label = display === "oled" ? "OLED" : "LCD";
-        const action = mode === "erase" ? "Erase Settings" : "Keep Settings";
-        setManifest(manifestFor(`M45 Core ${label} ${action}`, choice.asset, choice.offset));
+        setManifest(manifestFor("Flash Device", choice.asset, choice.offset));
+        statusEl.innerHTML =
+          `Ready to flash ${label} ${releaseTag}. ${mode === "erase" ? "WiFi/pool settings will be erased." : "WiFi/pool settings will be kept."}`;
       }
 
       function applyBaudRate() {
@@ -359,17 +363,15 @@ <h2>Settings</h2>
         releaseTag = release.tag_name;
         assetsByMode = {
           oled: {
-            keep: { asset: findRequiredAsset(release, "-oled.bin"), offset: 0x10000 },
-            erase: { asset: findRequiredAsset(release, "-oled-merged.bin"), offset: 0 }
+            keep: { asset: findRequiredAsset(release, assetName(release, "oled", false)), offset: 0x10000 },
+            erase: { asset: findRequiredAsset(release, assetName(release, "oled", true)), offset: 0 }
           },
           lcd: {
-            keep: { asset: findRequiredAsset(release, "-ideaspark-19-lcd.bin"), offset: 0x10000 },
-            erase: { asset: findRequiredAsset(release, "-ideaspark-19-lcd-merged.bin"), offset: 0 }
+            keep: { asset: findRequiredAsset(release, assetName(release, "lcd", false)), offset: 0x10000 },
+            erase: { asset: findRequiredAsset(release, assetName(release, "lcd", true)), offset: 0 }
           }
         };
-
         refreshManifest();
-        statusEl.innerHTML = `Ready to flash <a href="${release.html_url}">${releaseTag}</a>. Firmware checks passed.`;
       }
 
       displayInputs.forEach((input) => input.addEventListener("change", refreshManifest));