flash fix #5

Author: OyczE

docs/janos_flash.html

@@ -438,7 +438,7 @@ <h2>Browser support</h2>
       monitorConnected: false,
     };
 
-    const PAGE_VERSION = "1.0.8";
+    const PAGE_VERSION = "1.0.9";
     const FLASH_BAUD = 115200;
     const monitorEncoder = new TextEncoder();
 
@@ -520,8 +520,7 @@ <h2>Browser support</h2>
       monitorLog(`[${time}] ${msg}\n`);
     };
 
-    const bufferToBinaryString = (buffer) => {
-      const bytes = new Uint8Array(buffer);
+    const bytesToBinaryString = (bytes) => {
       const chunk = 0x8000;
       let result = "";
       for (let i = 0; i < bytes.length; i += chunk) {
@@ -530,6 +529,19 @@ <h2>Browser support</h2>
       return result;
     };
 
+    const bufferToBinaryString = (buffer) => bytesToBinaryString(new Uint8Array(buffer));
+
+    const padBytesTo = (data, alignment, padCharacter = 0xff) => {
+      const bytes = data instanceof Uint8Array ? data : new Uint8Array(data);
+      const padMod = bytes.length % alignment;
+      if (padMod === 0) return bytes;
+      const padding = new Uint8Array(alignment - padMod).fill(padCharacter);
+      const padded = new Uint8Array(bytes.length + padding.length);
+      padded.set(bytes, 0);
+      padded.set(padding, bytes.length);
+      return padded;
+    };
+
     const resolveManifestPath = (path) => {
       if (!path) return path;
       try {
@@ -850,11 +862,93 @@ <h2>Browser support</h2>
         log(`Fetching ${url} @ 0x${part.offset.toString(16)}`);
         const { buf, usedUrl } = await resolveAssetUrl(url);
         log(`Fetched ${usedUrl}`);
-        files.push({ data: bufferToBinaryString(buf), address: part.offset });
+        files.push({ data: bufferToBinaryString(buf), bytes: new Uint8Array(buf), address: part.offset });
       }
       return files;
     };
 
+    const writeFlashViaRom = async (loader, files, flashOptions) => {
+      if (!loader) throw new Error("ESP loader is not ready");
+
+      loader.info("Using uncompressed ROM flash path for ESP32-C5 to avoid compressed-flash failures.");
+
+      if (flashOptions.flashSize && flashOptions.flashSize !== "keep") {
+        const flashEnd = loader.flashSizeBytes(flashOptions.flashSize);
+        for (let i = 0; i < files.length; i += 1) {
+          const size = files[i]?.bytes?.length ?? files[i]?.data?.length ?? 0;
+          if (size + files[i].address > flashEnd) {
+            throw new Error(`File ${i + 1} doesn't fit in the available flash`);
+          }
+        }
+      }
+
+      for (let i = 0; i < files.length; i += 1) {
+        let image = files[i].bytes instanceof Uint8Array
+          ? new Uint8Array(files[i].bytes)
+          : loader.bstrToUi8(files[i].data || "");
+
+        if (image.length === 0) continue;
+
+        image = padBytesTo(image, 4);
+        const address = files[i].address;
+        image = await loader._updateImageFlashParams(
+          image,
+          address,
+          flashOptions.flashMode,
+          flashOptions.flashFreq,
+          flashOptions.flashSize,
+        );
+
+        const calcmd5 = flashOptions.calculateMD5Hash
+          ? String(flashOptions.calculateMD5Hash(bytesToBinaryString(image)))
+          : null;
+
+        const totalBytes = image.length;
+        const blocks = await loader.flashBegin(totalBytes, address);
+        let seq = 0;
+        let imageOffset = 0;
+        let timeout = loader.DEFAULT_TIMEOUT || 3000;
+        if (flashOptions.reportProgress) flashOptions.reportProgress(i, 0, totalBytes);
+
+        const t1 = Date.now();
+        while (imageOffset < image.length) {
+          const blockSize = Math.min(loader.FLASH_WRITE_SIZE, image.length - imageOffset);
+          const block = image.slice(imageOffset, imageOffset + blockSize);
+          const pct = Math.min(100, Math.floor((100 * (seq + 1)) / Math.max(blocks, 1)));
+          loader.info(`Writing at 0x${(address + imageOffset).toString(16)}... (${pct}%)`);
+
+          if (typeof loader.timeoutPerMb === "function") {
+            timeout = Math.max(loader.DEFAULT_TIMEOUT || 3000, loader.timeoutPerMb(loader.ERASE_WRITE_TIMEOUT_PER_MB, block.length));
+          }
+
+          await loader.flashBlock(block, seq, timeout);
+          imageOffset += blockSize;
+          seq += 1;
+
+          if (flashOptions.reportProgress) {
+            flashOptions.reportProgress(i, imageOffset, totalBytes);
+          }
+        }
+
+        await loader.flashFinish(false, timeout);
+
+        const elapsedSeconds = ((Date.now() - t1) / 1000).toFixed(3);
+        loader.info(`Wrote ${totalBytes} bytes at 0x${address.toString(16)} in ${elapsedSeconds} seconds.`);
+
+        if (calcmd5) {
+          loader.info("File  md5: " + calcmd5);
+          const flashMd5 = await loader.flashMd5sum(address, totalBytes);
+          loader.info("Flash md5: " + flashMd5);
+          if (String(flashMd5) !== calcmd5) {
+            throw new Error("MD5 of file does not match data in flash!");
+          }
+          loader.info("Hash of data verified.");
+        }
+      }
+
+      loader.info("Leaving...");
+    };
+
 const flash = async () => {
       ensureSupport();
       if (!state.esploader) {
@@ -889,7 +983,13 @@ <h2>Browser support</h2>
           },
           calculateMD5Hash: (image) => CryptoJS.MD5(CryptoJS.enc.Latin1.parse(image)),
         };
-        await state.esploader.writeFlash(flashOptions);
+        const romChipName = state.esploader?.chip?.CHIP_NAME || "";
+        if (!flashingFromStub && romChipName === "ESP32-C5") {
+          log("Using uncompressed ROM flash path for ESP32-C5 to bypass FLASH_DEFL failures in esptool-js.");
+          await writeFlashViaRom(state.esploader, files, flashOptions);
+        } else {
+          await state.esploader.writeFlash(flashOptions);
+        }
         await state.esploader.after();
         ui.progress.style.width = "100%";
         setStatus("Flash complete. Press RESET if the board doesn't reboot.");