Merge pull request #838 from NordicSemiconductor/update/nrf-intel-hex

Update nrf-intel-hex
NordicSemiconductor · Nov 29, 2023 · 12d7ba6 · 12d7ba6
2 parents 7ee0676 + c7bed9b
commit 12d7ba6
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 74 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -7,6 +7,13 @@ This project does _not_ adhere to
 [Semantic Versioning](https://semver.org/spec/v2.0.0.html) but contrary to it
 every new version is a new major version.
 
+## 135.0.0 - 2023-11-29
+
+### Changed
+
+-   Updated `nrf-intel-hex` to the latest version which slightly changed some
+    types (from `Buffer` to `Uint8Array`) because this was corrected there.
+
 ## 134.0.0 - 2023-11-22
 
 ### Added

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@nordicsemiconductor/pc-nrfconnect-shared",
-    "version": "134.0.0",
+    "version": "135.0.0",
     "description": "Shared commodities for developing pc-nrfconnect-* packages",
     "repository": {
         "type": "git",
@@ -90,7 +90,7 @@
         "lodash.range": "3.2.0",
         "mousetrap": "1.6.5",
         "npm-run-all2": "6.0.5",
-        "nrf-intel-hex": "^1.3.0",
+        "nrf-intel-hex": "^1.4.0",
         "postcss": "8.4.24",
         "postcss-modules": "^6.0.0",
         "prettier": "2.8.8",

diff --git a/src/Device/initPacket.ts b/src/Device/initPacket.ts
@@ -68,7 +68,7 @@ export const defaultInitPacket: InitPacket = {
 export interface DfuImage {
     name: string;
     initPacket: InitPacket;
-    firmwareImage: Buffer;
+    firmwareImage: Uint8Array;
 }
 
 // Create hash by using hash type and bytes

diff --git a/src/Device/sdfuOperations.ts b/src/Device/sdfuOperations.ts
@@ -317,7 +317,7 @@ function parseFirmwareImage(firmware: Buffer | string) {
     return memMap.slicePad(
         startAddress,
         Math.ceil((endAddress - startAddress) / 4) * 4
-    ) as Buffer;
+    );
 }
 
 function calculateSHA256Hash(image: Uint8Array) {
@@ -327,7 +327,7 @@ function calculateSHA256Hash(image: Uint8Array) {
 }
 
 interface DfuData {
-    application?: { bin: Buffer; dat: Buffer };
+    application?: { bin: Uint8Array; dat: Uint8Array };
     softdevice?: { bin: Uint8Array; dat: Uint8Array };
     params?: InitPacket;
 }
@@ -376,8 +376,8 @@ const createDfuZip = (dfuImages: DfuImage[]) =>
                 bin_file: 'application.bin',
                 dat_file: 'application.dat',
             };
-            zip.addFile('application.bin', data.application.bin);
-            zip.addFile('application.dat', data.application.dat);
+            zip.addFile('application.bin', data.application.bin as Buffer);
+            zip.addFile('application.dat', data.application.dat as Buffer);
         }
 
         if (data.softdevice) {

diff --git a/typings/nrf-intel-hex.d.ts b/typings/nrf-intel-hex.d.ts