GitHub/web-bluetooth-dfu
1
0
Fork 0
mirror of https://github.com/thegecko/web-bluetooth-dfu.git synced 2025-12-12 20:18:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

min and max address should be optional and specified based on target/image type.

Browse Source
This commit is contained in:
Michael Dietz
2016-03-04 11:26:23 +01:00
parent a6b0da5855
commit 82714d55b9
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
dist/hex2bin.js vendored
View File

@@ -130,6 +130,9 @@
var startAddress = helperGetBinaryStartAddress(hex); var startAddress = helperGetBinaryStartAddress(hex);
var endAddress = helperGetBinaryEndAddress(hex); var endAddress = helperGetBinaryEndAddress(hex);
minAddress = minAddress || startAddress;
maxAddress = maxAddress || endAddress;
if (startAddress < minAddress) { if (startAddress < minAddress) {
startAddress = minAddress; startAddress = minAddress;
} }
@@ -155,7 +158,7 @@
var data = line.substr(9, length * 2); var data = line.substr(9, length * 2);
for (var i = 0; i < length * 2; i += 2) { for (var i = 0; i < length * 2; i += 2) {
var index = (baseAddress + addressOffset) - startAddress + (i / 2); var index = (baseAddress + addressOffset) - startAddress + (i / 2);
if (index > 0 || index <= binarySizeBytes) { if (index > 0 || index <= binarySizeBytes) { // This cuts off any data below minAddress and above maxAddress.
view[index] = parseInt(data.substr(i, 2), 16); view[index] = parseInt(data.substr(i, 2), 16);
} }
} }
@@ -166,7 +169,7 @@
case RECORD_TYPE.EXTENDED_SEGMENT_ADDRESS: case RECORD_TYPE.EXTENDED_SEGMENT_ADDRESS:
throw 'ERROR - invalid hex file - extended segment address is not handled'; throw 'ERROR - invalid hex file - extended segment address is not handled';
case RECORD_TYPE.START_SEGMENT_ADDRESS: case RECORD_TYPE.START_SEGMENT_ADDRESS:
throw 'ERROR - invalid hex file - start segment address is for 80x86 processors'; throw 'ERROR - invalid hex file - start segment address is not handled';
case RECORD_TYPE.EXTENDED_LINEAR_ADDRESS: case RECORD_TYPE.EXTENDED_LINEAR_ADDRESS:
baseAddress = parseInt(line.substr(9, 4), 16) << 16; baseAddress = parseInt(line.substr(9, 4), 16) << 16;
break; break;