LAST TIME

Author: ctzsnooze

src/js/tabs/onboard_logging.js

@@ -489,8 +489,8 @@ onboard_logging.initialize = function (callback) {
 
                     show_saving_dialog();
 
-const activeRetries = new Set();
-const MAX_RETRIES = 3;
+const activeRetries = new Set(); // tracks blocks currently retrying
+const MAX_RETRIES = 3;           // maximum number of retries per block
 
 async function onChunkRead(St, blockAddr, blockData) {
     if (!blockData || blockData.byteLength === 0) {
@@ -500,14 +500,24 @@ async function onChunkRead(St, blockAddr, blockData) {
 
     let retries = 0;
 
+    // Retry loop for CRC failures
     while (!checkCRC(blockData) && retries < MAX_RETRIES) {
-        if (activeRetries.has(blockAddr)) return;
+        console.warn(`CRC failed at ${blockAddr}, retrying (${retries + 1}/${MAX_RETRIES})`);
+
+        // Prevent multiple concurrent retries for the same block
+        if (activeRetries.has(blockAddr)) {
+            console.warn(`Already retrying block at ${blockAddr}, skipping`);
+            return;
+        }
         activeRetries.add(blockAddr);
 
-        const retryBlock = await St.dataflashRead(blockAddr);
+        const retryBlock = await requestBlock(St, blockAddr);
         activeRetries.delete(blockAddr);
 
-        if (!retryBlock || retryBlock.byteLength === 0) break;
+        if (!retryBlock || retryBlock.byteLength === 0) {
+            console.error(`Retry failed for block at ${blockAddr}`);
+            break; // abort retries
+        }
 
         blockData = retryBlock;
         retries++;
@@ -519,17 +529,24 @@ async function onChunkRead(St, blockAddr, blockData) {
     }
 
     try {
-        St.process_data(blockData);
+        St.process_data(blockData); // feed valid block to parser
     } catch (err) {
         console.error(`Processing error at ${blockAddr}:`, err);
     }
 }
 
-// CRC check for DataView
+async function requestBlock(St, addr) {
+    try {
+        return await St.dataflashRead(addr); // must return a Promise
+    } catch (e) {
+        console.error(`Request failed for block at ${addr}:`, e);
+        return null;
+    }
+}
+
 function checkCRC(block) {
-    // Example: compute CRC from bytes in DataView if needed
-    // For now, just assume valid if block has content
-    return block && block.byteLength > 0;
+    // Replace with your actual CRC logic
+    return block.crcValid === true;
 }
 
 const startTime = new Date().getTime();