precv commit oktry to fix dataflashRead

Author: ctzsnooze

src/js/msp/MSPHelper.js

@@ -2442,8 +2442,8 @@ MspHelper.prototype.setRawRx = function (channels) {
 };
 
 /**
- * Send a request to read a block of data from the dataflash at the given address and pass that address and a dataview
- * of the returned data to the given callback (or null for the data if an error occurred).
+ * Send a request to read a block of data from the dataflash at the given address and pass that address and a DataView
+ * of the returned data to the given callback. If an error or CRC fail occurs, the raw data is delivered instead of null.
  */
 MspHelper.prototype.dataflashRead = function(address, blockSize, onDataCallback) {
     let outData = [
@@ -2465,49 +2465,63 @@ MspHelper.prototype.dataflashRead = function(address, blockSize, onDataCallback)
 
     mspObj.send_message(MSPCodes.MSP_DATAFLASH_READ, outData, false, function(response) {
         let payloadView = null;
+        let bytesCompressed = 0;
 
         if (response && response.data) {
             const headerSize = 7;
             const chunkAddress = response.data.readU32();
             const dataSize = response.data.readU16();
             const dataCompressionType = response.data.readU8();
 
-            if (chunkAddress === address) {
-                try {
-                    if (dataCompressionType === 0) {
-                        payloadView = new DataView(response.data.buffer, response.data.byteOffset + headerSize, dataSize);
-                    } else if (dataCompressionType === 1) {
-                        const compressedCharCount = response.data.readU16();
-                        const compressedArray = new Uint8Array(
-                            response.data.buffer,
-                            response.data.byteOffset + headerSize + 2,
-                            dataSize - 2
-                        );
-                        const decompressedArray = huffmanDecodeBuf(
-                            compressedArray,
-                            compressedCharCount,
-                            defaultHuffmanTree,
-                            defaultHuffmanLenIndex
-                        );
-                        payloadView = new DataView(decompressedArray.buffer);
-                    }
-                } catch (e) {
-                    console.warn('Decompression or read failed, delivering raw data anyway');
+            if (chunkAddress !== address) {
+                console.log(`Expected address ${address} but received ${chunkAddress}`);
+            }
+
+            try {
+                if (dataCompressionType === 0) {
+                    // Raw, uncompressed
                     payloadView = new DataView(response.data.buffer, response.data.byteOffset + headerSize, dataSize);
+                    bytesCompressed = dataSize;
+                } else if (dataCompressionType === 1) {
+                    // Compressed
+                    const compressedCharCount = response.data.readU16();
+                    const compressedArray = new Uint8Array(
+                        response.data.buffer,
+                        response.data.byteOffset + headerSize + 2,
+                        dataSize - 2
+                    );
+                    const decompressedArray = huffmanDecodeBuf(
+                        compressedArray,
+                        compressedCharCount,
+                        defaultHuffmanTree,
+                        defaultHuffmanLenIndex
+                    );
+                    payloadView = new DataView(decompressedArray.buffer);
+                    bytesCompressed = compressedArray.length;
                 }
-            } else {
-                console.log(`Expected address ${address} but received ${chunkAddress}`);
+            } catch (e) {
+                console.warn('Decompression failed, delivering raw data anyway:', e);
+                // fallback to raw block
+                payloadView = new DataView(response.data.buffer, response.data.byteOffset + headerSize, dataSize);
+                bytesCompressed = dataSize;
             }
         }
 
-        // Deliver payloadView if defined, otherwise pass null
+        // Deliver payloadView even if CRC failed
         onDataCallback(address, payloadView);
 
+        // Logging
         if (!response || response.crcError) {
-            console.log(`CRC error or missing data at address ${address} - delivering whatever we got`);
+            console.log(`CRC error or missing data at address ${address} - delivering raw data (${payloadView ? payloadView.byteLength : 0} bytes)`);
         } else if (payloadView) {
             console.log(`Block at ${address} received (${payloadView.byteLength} bytes)`);
         }
+
+        // Track total compressed bytes globally, if needed
+        if (typeof bytesCompressed === "number") {
+            if (typeof totalBytesCompressed === "undefined" || totalBytesCompressed == null) totalBytesCompressed = 0;
+            totalBytesCompressed += bytesCompressed;
+        }
     }, true); // end of send_message
 }; // end of dataflashRead