universal-hex: Fix issue in block format converting Extended Segmented Address record to Linear.

Also add tests for the "sections" format.

Author: microbit-carlos

src/__tests__/universal-hex.spec.ts

@@ -268,6 +268,31 @@ describe('Test iHexToCustomFormatBlocks()', () => {
     expect(resultFFFF).toEqual(expectedFFFF.join(''));
   });
 
+  it('It converts Extended Segmented Address records to Linear.', () => {
+    const hexStr32 =
+      ':020000020000FC\n' +
+      ':20F38000257016202EDF70BD002803D00E49C860002070470E207047002803D00A4908617B\n' +
+      ':20F3A000002070470E20704710B507484068002807D08047002803D000221146FFF76CFF3A\n' +
+      ':020000023000CC\n' +
+      ':203F40006A4623C210A82A46FF21808A0C9B02F0F1F9002802D0FFF7A4F8EFE66846007C6C\n';
+    const expected32 =
+      ':020000040000FA\n' +
+      ':0400000A9903C0DEB8\n' +
+      ':20F3800D257016202EDF70BD002803D00E49C860002070470E207047002803D00A4908616E\n' +
+      ':20F3A00D002070470E20704710B507484068002807D08047002803D000221146FFF76CFF2D\n' +
+      ':020000040003F7\n' +
+      ':203F400D6A4623C210A82A46FF21808A0C9B02F0F1F9002802D0FFF7A4F8EFE66846007C5F\n' +
+      ':2000000CFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF4\n' +
+      ':2000000CFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF4\n' +
+      ':1C00000CFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF4\n' +
+      ':0000000BF5\n';
+
+    const result32 = uh.iHexToCustomFormatBlocks(hexStr32, 0x9903);
+
+    expect(result32).toEqual(expected32);
+    expect(result32.length).toEqual(512);
+  });
+
   it('EoF record placed after an unpadded last block if it fits', () => {
     const hexStr =
       ':020000040000FA\n' +
@@ -861,6 +886,45 @@ describe('Test iHexToCustomFormatSection()', () => {
     expect(resultFFFF).toEqual(expectedFFFF.join(''));
   });
 
+  it('It converts Extended Segmented Address records to Linear.', () => {
+    const hexStr32 =
+      ':020000020000FC\n' +
+      ':20F2A000C860BFF34F8FFEE70400FA0500ED00E010B5002904D0002211461046FFF7ECFF6F\n' +
+      ':20F2C00000F010F810BD10B50021024A0846FFF761FF10BDB1F2030010B508461146FCF7C3\n' +
+      ':20F2E000C3FF10BDF8B5384C2078002837D02069002807D00026E068002805D00025002E41\n' +
+      ':20F3000004D013E00126F6E70125F8E7684651DF052806D0002806D000221146FFF7BCFF14\n' +
+      ':20F3200004E0012602E0216900988847002D12D1608869460880A06861DF052806D000284D\n' +
+      ':20F3400006D000221146FFF7A7FF04E0012502E0E168A0688847002ED8D0002DCFD0F8BD5F\n' +
+      ':16F3600070B5002901D08C0701D0072070BD164C0125A160628055\n' +
+      ':20F38000257016202EDF70BD002803D00E49C860002070470E207047002803D00A4908617B\n' +
+      ':20F3A000002070470E20704710B507484068002807D08047002803D000221146FFF76CFF3A\n' +
+      ':020000023000CC\n' +
+      ':203F40006A4623C210A82A46FF21808A0C9B02F0F1F9002802D0FFF7A4F8EFE66846007C6C\n';
+    const expected32 =
+      ':020000040000FA\n' +
+      ':0400000A9903C0DEB8\n' +
+      ':20F2A00DC860BFF34F8FFEE70400FA0500ED00E010B5002904D0002211461046FFF7ECFF62\n' +
+      ':20F2C00D00F010F810BD10B50021024A0846FFF761FF10BDB1F2030010B508461146FCF7B6\n' +
+      ':20F2E00DC3FF10BDF8B5384C2078002837D02069002807D00026E068002805D00025002E34\n' +
+      ':20F3000D04D013E00126F6E70125F8E7684651DF052806D0002806D000221146FFF7BCFF07\n' +
+      ':20F3200D04E0012602E0216900988847002D12D1608869460880A06861DF052806D0002840\n' +
+      ':20F3400D06D000221146FFF7A7FF04E0012502E0E168A0688847002ED8D0002DCFD0F8BD52\n' +
+      ':16F3600D70B5002901D08C0701D0072070BD164C0125A160628048\n' +
+      ':20F3800D257016202EDF70BD002803D00E49C860002070470E207047002803D00A4908616E\n' +
+      ':20F3A00D002070470E20704710B507484068002807D08047002803D000221146FFF76CFF2D\n' +
+      ':020000040003F7\n' +
+      ':203F400D6A4623C210A82A46FF21808A0C9B02F0F1F9002802D0FFF7A4F8EFE66846007C5F\n' +
+      ':2000000CFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF4\n' +
+      ':2000000CFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF4\n' +
+      ':1C00000CFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF4\n' +
+      ':0000000BF5\n';
+
+    const result32 = uh.iHexToCustomFormatSection(hexStr32, 0x9903);
+
+    expect(result32).toEqual(expected32);
+    expect(result32.length).toEqual(1024);
+  });
+
   it('EoF record placed after a fully padded section', () => {
     const hexStr =
       ':020000040000FA\n' +

src/universal-hex.ts

@@ -78,7 +78,8 @@ function iHexToCustomFormatBlocks(iHexStr: string, boardId: number): string {
       } else if (recordType === ihex.RecordType.ExtendedLinearAddress) {
         currentExtAddr = record;
       } else if (recordType === ihex.RecordType.ExtendedSegmentAddress) {
-        currentExtAddr = ihex.convertExtSegToLinAddressRecord(record);
+        record = ihex.convertExtSegToLinAddressRecord(record);
+        currentExtAddr = record;
       } else if (recordType === ihex.RecordType.EndOfFile) {
         endOfFile = true;
         break;