improvement

Author: ctzsnooze

src/js/tabs/onboard_logging.js

@@ -490,45 +490,45 @@ onboard_logging.initialize = function (callback) {
                     show_saving_dialog();
 
 function onChunkRead(chunkAddress, chunkDataView, bytesCompressed) {
-    if (chunkDataView !== null) {
-        // Did we receive any data?
-        if (chunkDataView.byteLength > 0) {
-            nextAddress += chunkDataView.byteLength;
-            if (isNaN(bytesCompressed) || isNaN(totalBytesCompressed)) {
-                totalBytesCompressed = null;
+    if (chunkDataView !== null && chunkDataView.byteLength > 0) {
+        // Write whatever we received, even if the block had CRC issues
+        nextAddress += chunkDataView.byteLength;
+
+        if (isNaN(bytesCompressed) || isNaN(totalBytesCompressed)) {
+            totalBytesCompressed = null;
+        } else {
+            totalBytesCompressed += bytesCompressed;
+        }
+
+        $(".dataflash-saving progress").attr("value", (nextAddress / maxBytes) * 100);
+
+        const blob = new Blob([chunkDataView]);
+        FileSystem.writeChunck(openedFile, blob).then(() => {
+            if (saveCancelled || nextAddress >= maxBytes) {
+                mark_saving_dialog_done(startTime, nextAddress, totalBytesCompressed);
+                FileSystem.closeFile(openedFile);
             } else {
-                totalBytesCompressed += bytesCompressed;
+                mspHelper.dataflashRead(nextAddress, self.blockSize, onChunkRead);
             }
+        });
+
+    } else if (chunkDataView !== null && chunkDataView.byteLength === 0) {
+        // Zero-byte block → end-of-file
+        mark_saving_dialog_done(startTime, nextAddress, totalBytesCompressed);
+        FileSystem.closeFile(openedFile);
 
-            $(".dataflash-saving progress").attr("value", (nextAddress / maxBytes) * 100);
+    } else {
+        // CRC or address mismatch
+        console.warn(`Skipping block at address ${nextAddress} due to CRC or mismatch`);
 
+        // If some data arrived (chunkDataView not null), write it anyway
+        if (chunkDataView && chunkDataView.byteLength > 0) {
             const blob = new Blob([chunkDataView]);
-            FileSystem.writeChunck(openedFile, blob).then(() => {
-                if (saveCancelled || nextAddress >= maxBytes) {
-                    if (saveCancelled) {
-                        dismiss_saving_dialog();
-                    } else {
-                        mark_saving_dialog_done(startTime, nextAddress, totalBytesCompressed);
-                    }
-                    FileSystem.closeFile(openedFile);
-                } else {
-                    if (!self.writeError) {
-                        mspHelper.dataflashRead(nextAddress, self.blockSize, onChunkRead);
-                    } else {
-                        dismiss_saving_dialog();
-                        FileSystem.closeFile(openedFile);
-                    }
-                }
-            });
+            FileSystem.writeChunck(openedFile, blob);
+            nextAddress += chunkDataView.byteLength;
         } else {
-            // A zero-byte block indicates end-of-file, so we're done
-            mark_saving_dialog_done(startTime, nextAddress, totalBytesCompressed);
-            FileSystem.closeFile(openedFile);
+            nextAddress += self.blockSize;
         }
-    } else {
-        // There was an error with the received block (address didn't match the one we asked for), skip it
-        console.warn(`Skipping block at address ${nextAddress} due to CRC or mismatch`);
-        nextAddress += self.blockSize;
 
         if (nextAddress >= maxBytes) {
             mark_saving_dialog_done(startTime, nextAddress, totalBytesCompressed);