keep going on failure

Author: ctzsnooze

src/js/tabs/onboard_logging.js

@@ -489,49 +489,57 @@ 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;
-                                } 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) {
-                                        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);
-                                        }
-                                    }
-                                });
-                            } else {
-                                // A zero-byte block indicates end-of-file, so we're done
-                                mark_saving_dialog_done(startTime, nextAddress, totalBytesCompressed);
-                                FileSystem.closeFile(openedFile);
-                            }
-                        } else {
-                            // There was an error with the received block (address didn't match the one we asked for), retry
-                            mspHelper.dataflashRead(nextAddress, self.blockSize, onChunkRead);
-                        }
+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;
+            } 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) {
+                    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);
                     }
+                }
+            });
+        } else {
+            // A zero-byte block indicates end-of-file, so we're done
+            mark_saving_dialog_done(startTime, nextAddress, totalBytesCompressed);
+            FileSystem.closeFile(openedFile);
+        }
+    } 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);
+            FileSystem.closeFile(openedFile);
+        } else {
+            mspHelper.dataflashRead(nextAddress, self.blockSize, onChunkRead);
+        }
+    }
+}
 
-                    const startTime = new Date().getTime();
+const startTime = new Date().getTime();
                     // Fetch the initial block
                     FileSystem.openFile(fileWriter).then((file) => {
                         openedFile = file;