@@ -2475,11 +2475,7 @@ MspHelper.prototype.dataflashRead = function(address, blockSize, onDataCallback)
2475
2475
if ( chunkAddress === address ) {
2476
2476
try {
2477
2477
if ( dataCompressionType === 0 ) {
2478
- payloadView = new DataView (
2479
- response . data . buffer ,
2480
- response . data . byteOffset + headerSize ,
2481
- dataSize
2482
- ) ;
2478
+ payloadView = new DataView ( response . data . buffer , response . data . byteOffset + headerSize , dataSize ) ;
2483
2479
} else if ( dataCompressionType === 1 ) {
2484
2480
const compressedCharCount = response . data . readU16 ( ) ;
2485
2481
const compressedArray = new Uint8Array (
@@ -2497,20 +2493,24 @@ MspHelper.prototype.dataflashRead = function(address, blockSize, onDataCallback)
2497
2493
}
2498
2494
} catch ( e ) {
2499
2495
console . warn ( 'Decompression or read failed, delivering raw data anyway' ) ;
2500
- payloadView = new DataView (
2501
- response . data . buffer ,
2502
- response . data . byteOffset + headerSize ,
2503
- dataSize
2504
- ) ;
2496
+ payloadView = new DataView ( response . data . buffer , response . data . byteOffset + headerSize , dataSize ) ;
2505
2497
}
2506
2498
} else {
2507
2499
console . log ( `Expected address ${ address } but received ${ chunkAddress } ` ) ;
2508
2500
}
2509
2501
}
2510
2502
2511
2503
// Deliver payloadView if defined, otherwise pass null
2512
- }
2513
- } ;
2504
+ onDataCallback ( address , payloadView ) ;
2505
+
2506
+ if ( ! response || response . crcError ) {
2507
+ console . log ( `CRC error or missing data at address ${ address } - delivering whatever we got` ) ;
2508
+ } else if ( payloadView ) {
2509
+ console . log ( `Block at ${ address } received (${ payloadView . byteLength } bytes)` ) ;
2510
+ }
2511
+ } , true ) ; // end of send_message
2512
+ } ; // end of dataflashRead
2513
+
2514
2514
2515
2515
MspHelper . prototype . sendAdjustmentRanges = function ( onCompleteCallback ) {
2516
2516
let nextFunction = send_next_adjustment_range ;
0 commit comments