fix typo

Author: ctzsnooze

src/js/msp/MSPHelper.js

@@ -2443,7 +2443,7 @@ 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 occured).
+ * of the returned data to the given callback (or null for the data if an error occurred).
  */
 MspHelper.prototype.dataflashRead = function(address, blockSize, onDataCallback) {
     let outData = [
@@ -2472,113 +2472,43 @@ MspHelper.prototype.dataflashRead = function(address, blockSize, onDataCallback)
             const dataSize = response.data.readU16();
             const dataCompressionType = response.data.readU8();
 
-            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);
+            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');
+                    payloadView = new DataView(
+                        response.data.buffer,
+                        response.data.byteOffset + headerSize,
+                        dataSize
+                    );
                 }
-            } catch (e) {
-                console.warn('Decompression or read failed, delivering raw data anyway');
-                payloadView = new DataView(response.data.buffer, response.data.byteOffset + headerSize, dataSize);
+            } else {
+                console.log(`Expected address ${address} but received ${chunkAddress}`);
             }
-
-            // always deliver the data, even if addresses mismatch or CRC fails
-            onDataCallback(chunkAddress, payloadView);
-        } else {
-            // if no data at all, deliver null
-            onDataCallback(address, null);
         }
-    });
-};
 
         // Deliver payloadView if defined, otherwise pass null
-        onDataCallback(address, payloadView);
-
-        if (!response || response.crcError) {
-            console.log(`CRC error or missing data at address ${address} - delivering whatever we got`);
-        } else if (payloadView) {
-            console.log(`Block at ${address} received (${payloadView.byteLength} bytes)`);
-        }
-    }, true);
-};
-
-MspHelper.prototype.sendServoConfigurations = function (onCompleteCallback) {
-    let nextFunction = send_next_servo_configuration;
-
-    let servoIndex = 0;
-
-    if (FC.SERVO_CONFIG.length == 0) {
-        onCompleteCallback();
-    } else {
-        nextFunction();
-    }
-
-    function send_next_servo_configuration() {
-        const buffer = [];
-
-        // send one at a time, with index
-
-        const servoConfiguration = FC.SERVO_CONFIG[servoIndex];
-
-        buffer
-            .push8(servoIndex)
-            .push16(servoConfiguration.min)
-            .push16(servoConfiguration.max)
-            .push16(servoConfiguration.middle)
-            .push8(servoConfiguration.rate);
-
-        let out = servoConfiguration.indexOfChannelToForward;
-        if (out == undefined) {
-            out = 255; // Cleanflight defines "CHANNEL_FORWARDING_DISABLED" as "(uint8_t)0xFF"
-        }
-        buffer.push8(out).push32(servoConfiguration.reversedInputSources);
-
-        // prepare for next iteration
-        servoIndex++;
-        if (servoIndex == FC.SERVO_CONFIG.length) {
-            nextFunction = onCompleteCallback;
-        }
-
-        MSP.send_message(MSPCodes.MSP_SET_SERVO_CONFIGURATION, buffer, false, nextFunction);
-    }
-};
-
-MspHelper.prototype.sendModeRanges = function (onCompleteCallback) {
-    let nextFunction = send_next_mode_range;
-
-    let modeRangeIndex = 0;
-
-    if (FC.MODE_RANGES.length == 0) {
-        onCompleteCallback();
-    } else {
-        send_next_mode_range();
-    }
-
-    function send_next_mode_range() {
-        const modeRange = FC.MODE_RANGES[modeRangeIndex];
-        const buffer = [];
-
-        buffer
-            .push8(modeRangeIndex)
-            .push8(modeRange.id)
-            .push8(modeRange.auxChannelIndex)
-            .push8((modeRange.range.start - 900) / 25)
-            .push8((modeRange.range.end - 900) / 25);
-
-        const modeRangeExtra = FC.MODE_RANGES_EXTRA[modeRangeIndex];
-
-        buffer.push8(modeRangeExtra.modeLogic).push8(modeRangeExtra.linkedTo);
-
-        // prepare for next iteration
-        modeRangeIndex++;
-        if (modeRangeIndex == FC.MODE_RANGES.length) {
-            nextFunction = onCompleteCallback;
-        }
-        MSP.send_message(MSPCodes.MSP_SET_MODE_RANGE, buffer, false, nextFunction);
     }
 };