@nordicsemiconductor/pc-nrfconnect-shared 208.0.0 → 209.0.0

package/Changelog.md

@@ -7,6 +7,16 @@ 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.
 
+## 209.0.0 - 2025-04-30
+
+### Changed
+
+-   Nrfutil device use of `fw-read` is replaced with `x-read`.
+
+### Steps to upgrade when using this package
+
+-   Any use of `firmwareRead()` must be replaced with `xRead()`.
+
 ## 208.0.0 - 2025-04-17
 
 ### Changed

package/nrfutil/device/__mocks__/device.ts

@@ -4,6 +4,8 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-4-Clause
  */
 
+import xRead from '../xRead';
+
 const program = jest.fn();
 const programBuffer = jest.fn();
 const deviceInfo = jest.fn(() => Promise.resolve({}));
@@ -38,6 +40,7 @@ export default {
     getCoreInfo,
     list,
     firmwareRead,
+    xRead,
     onLogging,
     setLogLevel,
     setVerboseLogging,

package/nrfutil/device/batch.ts

@@ -19,7 +19,6 @@ import {
     NrfutilDevice,
     ResetKind,
 } from './common';
-import { DeviceBuffer } from './firmwareRead';
 import { DeviceCoreInfo } from './getCoreInfo';
 import { FWInfo } from './getFwInfo';
 import { GetProtectionStatusResult } from './getProtectionStatus';
@@ -28,6 +27,7 @@ import {
     ProgrammingOptions,
     programmingOptionsToArgs,
 } from './program';
+import { MemoryReadRaw, ReadResult, toIntelHex } from './xRead';
 
 type BatchOperationWrapperUnknown = BatchOperationWrapper<unknown>;
 type CallbacksUnknown = Callbacks<unknown>;
@@ -55,7 +55,9 @@ export class Batch {
                 await box.singleInfoOperationOptionalData<object>(
                     command,
                     undefined,
-                    ['--generate', '--core', core].concat(args)
+                    ['--generate', ...(core ? ['--core', core] : [])].concat(
+                        args
+                    )
                 );
 
             return {
@@ -156,25 +158,54 @@ export class Batch {
         return this;
     }
 
-    public firmwareRead(core: DeviceCore, callbacks?: Callbacks<Buffer>) {
-        this.enqueueBatchOperationObject('fw-read', core, {
-            ...callbacks,
-            onTaskEnd: (taskEnd: TaskEnd<DeviceBuffer>) => {
-                if (taskEnd.result === 'success' && taskEnd.data) {
-                    const data = Buffer.from(taskEnd.data.buffer, 'base64');
-                    callbacks?.onTaskEnd?.({
-                        ...taskEnd,
-                        task: {
-                            ...taskEnd.task,
+    public xRead(
+        core: DeviceCore,
+        address: number,
+        bytes: number,
+        width?: 8 | 15 | 32,
+        direct?: boolean,
+        callbacks?: Callbacks<ReadResult>
+    ) {
+        const args: string[] = [
+            '--address',
+            address.toString(),
+            '--bytes',
+            bytes.toString(),
+        ];
+
+        if (direct) {
+            args.push('--direct');
+        }
+
+        if (width) {
+            args.push('--width');
+            args.push(width.toString());
+        }
+
+        this.enqueueBatchOperationObject(
+            'x-read',
+            core,
+            {
+                ...callbacks,
+                onTaskEnd: (taskEnd: TaskEnd<MemoryReadRaw>) => {
+                    if (taskEnd.result === 'success' && taskEnd.data) {
+                        const data = toIntelHex(taskEnd.data.memoryData);
+
+                        callbacks?.onTaskEnd?.({
+                            ...taskEnd,
+                            task: {
+                                ...taskEnd.task,
+                                data,
+                            },
                             data,
-                        },
-                        data,
-                    });
-                } else {
-                    callbacks?.onException?.(new Error('Read failed'));
-                }
-            },
-        } as CallbacksUnknown);
+                        });
+                    } else {
+                        callbacks?.onException?.(new Error('Read failed'));
+                    }
+                },
+            } as CallbacksUnknown,
+            args
+        );
 
         return this;
     }

package/nrfutil/device/common.ts

@@ -73,7 +73,12 @@ export type VersionType =
     | 'NRFDL_VERSION_TYPE_INCREMENTAL'
     | 'NRFDL_VERSION_TYPE_STRING';
 
-export type DeviceCore = 'Application' | 'Modem' | 'Network';
+export type DeviceCore =
+    | 'Application'
+    | 'Modem'
+    | 'Network'
+    | 'Secure'
+    | 'FLPR';
 
 export interface DeviceTraits {
     usb?: boolean;

package/nrfutil/device/device.ts

@@ -10,7 +10,6 @@ import { Batch } from './batch';
 import boardController from './boardController';
 import deviceInfo from './deviceInfo';
 import erase from './erase';
-import firmwareRead from './firmwareRead';
 import getBoardControllerConfig from './getBoardControllerConfig';
 import getBoardControllerVersion from './getBoardControllerVersion';
 import getCoreInfo from './getCoreInfo';
@@ -57,7 +56,6 @@ export default {
     setMcuState,
     getCoreInfo,
     list,
-    firmwareRead,
     onLogging,
     setLogLevel,
     setVerboseLogging,

package/nrfutil/device/index.ts

@@ -14,6 +14,7 @@ export type {
     NrfutilDevice,
 } from './common';
 
+export type { ReadResult } from './xRead';
 export type { DeviceInfo } from './deviceInfo';
 export type { DeviceCoreInfo } from './getCoreInfo';
 export type { ImageType } from './getFwInfo';

package/nrfutil/device/xRead.ts

@@ -0,0 +1,133 @@
+/*
+ * Copyright (c) 2023 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: LicenseRef-Nordic-4-Clause
+ */
+
+/* eslint-disable no-bitwise */
+import { Progress } from '../sandboxTypes';
+import {
+    DeviceCore,
+    deviceSingleTaskEndOperation,
+    NrfutilDevice,
+} from './common';
+
+export interface MemoryData {
+    startAddress: string;
+    values: number[];
+}
+
+export interface MemoryReadRaw {
+    name: 'memory-read';
+    serialNumber: string;
+    memoryData: MemoryData[];
+}
+
+export type ReadResult = Awaited<ReturnType<typeof xRead>>;
+
+export function toIntelHex(memoryData: MemoryData[]) {
+    const sections = memoryData.map(d => ({
+        startAddress: Number.parseInt(d.startAddress, 16),
+        buffer: Buffer.from(d.values),
+    }));
+
+    const bytesPerLine = 16;
+
+    const checksum = (bytes: number[]): number => {
+        const sum = bytes.reduce((acc, b) => acc + b, 0);
+        return (~sum + 1) & 0xff;
+    };
+
+    const formatRecord = (record: number[]) =>
+        `:${record
+            .map(b => b.toString(16).padStart(2, '0').toUpperCase())
+            .join('')}`;
+
+    const records = sections.flatMap(({ startAddress, buffer }) => {
+        const totalLines = Math.ceil(buffer.length / bytesPerLine);
+        let currentExtAddr = -1;
+
+        return Array.from({ length: totalLines }).flatMap((_, i) => {
+            const offset = i * bytesPerLine;
+            const absoluteAddr = startAddress + offset;
+            const extAddr = absoluteAddr >>> 16;
+            const addr = absoluteAddr & 0xffff;
+            const lineBytes = buffer.subarray(offset, offset + bytesPerLine);
+            const recordList: string[] = [];
+
+            if (extAddr !== currentExtAddr) {
+                currentExtAddr = extAddr;
+                const extRecord = [
+                    0x02,
+                    0x00,
+                    0x00,
+                    0x04,
+                    (extAddr >> 8) & 0xff,
+                    extAddr & 0xff,
+                ];
+                extRecord.push(checksum(extRecord));
+                recordList.push(formatRecord(extRecord));
+            }
+
+            const dataRecord = [
+                lineBytes.length,
+                (addr >> 8) & 0xff,
+                addr & 0xff,
+                0x00,
+                ...lineBytes,
+            ];
+            dataRecord.push(checksum(dataRecord));
+            recordList.push(formatRecord(dataRecord));
+
+            return recordList;
+        });
+    });
+
+    records.push(':00000001FF');
+
+    return { intelHex: records.join('\n') };
+}
+
+const xRead = async (
+    device: NrfutilDevice,
+    address: number,
+    bytes: number,
+    core?: DeviceCore,
+    width?: 8 | 15 | 32, // defaults to 32
+    direct?: boolean,
+    onProgress?: (progress: Progress) => void,
+    controller?: AbortController
+) => {
+    const args: string[] = [
+        '--address',
+        address.toString(),
+        '--bytes',
+        bytes.toString(),
+    ];
+
+    if (direct) {
+        args.push('--direct');
+    }
+
+    if (width) {
+        args.push('--width');
+        args.push(width.toString());
+    }
+
+    if (core) {
+        args.push('--core');
+        args.push(core);
+    }
+
+    const result = await deviceSingleTaskEndOperation<MemoryReadRaw>(
+        device,
+        'x-read',
+        onProgress,
+        controller,
+        args
+    );
+
+    return toIntelHex(result.memoryData);
+};
+
+export default xRead;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@nordicsemiconductor/pc-nrfconnect-shared",
-    "version": "208.0.0",
+    "version": "209.0.0",
     "description": "Shared commodities for developing pc-nrfconnect-* packages",
     "repository": {
         "type": "git",

package/typings/generated/nrfutil/device/__mocks__/device.d.ts

@@ -15,6 +15,9 @@ declare const _default: {
         stop: jest.Mock<any, any, any>;
     }, [], any>;
     firmwareRead: jest.Mock<any, any, any>;
+    xRead: (device: import("..").NrfutilDevice, address: number, bytes: number, core?: import("..").DeviceCore | undefined, width?: 8 | 15 | 32 | undefined, direct?: boolean | undefined, onProgress?: ((progress: import("../..").Progress) => void) | undefined, controller?: AbortController | undefined) => Promise<{
+        intelHex: string;
+    }>;
     onLogging: jest.Mock<any, any, any>;
     setLogLevel: jest.Mock<any, any, any>;
     setVerboseLogging: jest.Mock<any, any, any>;

package/typings/generated/nrfutil/device/__mocks__/device.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"device.d.ts","sourceRoot":"","sources":["../../../../../nrfutil/device/__mocks__/device.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;AA0BA,wBAkBE"}
+{"version":3,"file":"device.d.ts","sourceRoot":"","sources":["../../../../../nrfutil/device/__mocks__/device.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AA4BA,wBAmBE"}

package/typings/generated/nrfutil/device/batch.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { TaskEnd } from '../sandboxTypes';
 import { Callbacks } from './batchTypes';
 import { DeviceCore, DeviceTraits, NrfutilDevice, ResetKind } from './common';
@@ -6,6 +5,7 @@ import { DeviceCoreInfo } from './getCoreInfo';
 import { FWInfo } from './getFwInfo';
 import { GetProtectionStatusResult } from './getProtectionStatus';
 import { FirmwareType, ProgrammingOptions } from './program';
+import { ReadResult } from './xRead';
 export declare class Batch {
     private operationBatchGeneration;
     private collectOperations;
@@ -15,7 +15,7 @@ export declare class Batch {
     boardController(data: object, callbacks?: Callbacks): this;
     getBoardControllerConfig(callbacks?: Callbacks): this;
     getBoardControllerVersion(callbacks?: Callbacks): this;
-    firmwareRead(core: DeviceCore, callbacks?: Callbacks<Buffer>): this;
+    xRead(core: DeviceCore, address: number, bytes: number, width?: 8 | 15 | 32, direct?: boolean, callbacks?: Callbacks<ReadResult>): this;
     getCoreInfo(core: DeviceCore, callbacks?: Callbacks<DeviceCoreInfo>): this;
     getFwInfo(core: DeviceCore, callbacks?: Callbacks<FWInfo>): this;
     getProtectionStatus(core: DeviceCore, callbacks?: Callbacks<GetProtectionStatusResult>): this;

package/typings/generated/nrfutil/device/batch.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"batch.d.ts","sourceRoot":"","sources":["../../../../nrfutil/device/batch.ts"],"names":[],"mappings":";AAYA,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAC1C,OAAO,EAAyB,SAAS,EAAE,MAAM,cAAc,CAAC;AAChE,OAAO,EACH,UAAU,EACV,YAAY,EAEZ,aAAa,EACb,SAAS,EACZ,MAAM,UAAU,CAAC;AAElB,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,yBAAyB,EAAE,MAAM,uBAAuB,CAAC;AAClE,OAAO,EACH,YAAY,EACZ,kBAAkB,EAErB,MAAM,WAAW,CAAC;AAKnB,qBAAa,KAAK;IACd,OAAO,CAAC,wBAAwB,CACzB;IAEP,OAAO,CAAC,iBAAiB,CAIhB;IAET,OAAO,CAAC,2BAA2B;IA2B5B,aAAa,CAAC,IAAI,EAAE,UAAU,EAAE,SAAS,CAAC,EAAE,SAAS,CAAC,MAAM,CAAC;IAU7D,KAAK,CAAC,IAAI,EAAE,UAAU,EAAE,SAAS,CAAC,EAAE,SAAS;IAU7C,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,SAAS;IAuBnD,wBAAwB,CAAC,SAAS,CAAC,EAAE,SAAS;IAsB9C,yBAAyB,CAAC,SAAS,CAAC,EAAE,SAAS;IAsB/C,YAAY,CAAC,IAAI,EAAE,UAAU,EAAE,SAAS,CAAC,EAAE,SAAS,CAAC,MAAM,CAAC;IAuB5D,WAAW,CACd,IAAI,EAAE,UAAU,EAChB,SAAS,CAAC,EAAE,SAAS,CAAC,cAAc,CAAC;IAWlC,SAAS,CAAC,IAAI,EAAE,UAAU,EAAE,SAAS,CAAC,EAAE,SAAS,CAAC,MAAM,CAAC;IAUzD,mBAAmB,CACtB,IAAI,EAAE,UAAU,EAChB,SAAS,CAAC,EAAE,SAAS,CAAC,yBAAyB,CAAC;IAW7C,OAAO,CACV,QAAQ,EAAE,YAAY,EACtB,IAAI,EAAE,UAAU,EAChB,kBAAkB,CAAC,EAAE,kBAAkB,EACvC,YAAY,CAAC,EAAE,YAAY,EAC3B,SAAS,CAAC,EAAE,SAAS;IA8ClB,OAAO,CAAC,IAAI,EAAE,UAAU,EAAE,SAAS,CAAC,EAAE,SAAS;IAU/C,KAAK,CAAC,IAAI,EAAE,UAAU,EAAE,KAAK,CAAC,EAAE,SAAS,EAAE,SAAS,CAAC,EAAE,SAAS;IAWhE,OAAO,CACV,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,CAAC,cAAc,EAAE,OAAO,CAAC,OAAO,CAAC,EAAE,KAAK,IAAI;IAW7C,GAAG,CACZ,MAAM,EAAE,aAAa,EACrB,UAAU,CAAC,EAAE,eAAe,GAAG,SAAS,GACzC,OAAO,CAAC,OAAO,EAAE,CAAC;CAqGxB"}
+{"version":3,"file":"batch.d.ts","sourceRoot":"","sources":["../../../../nrfutil/device/batch.ts"],"names":[],"mappings":"AAYA,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAC1C,OAAO,EAAyB,SAAS,EAAE,MAAM,cAAc,CAAC;AAChE,OAAO,EACH,UAAU,EACV,YAAY,EAEZ,aAAa,EACb,SAAS,EACZ,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,yBAAyB,EAAE,MAAM,uBAAuB,CAAC;AAClE,OAAO,EACH,YAAY,EACZ,kBAAkB,EAErB,MAAM,WAAW,CAAC;AACnB,OAAO,EAAiB,UAAU,EAAc,MAAM,SAAS,CAAC;AAKhE,qBAAa,KAAK;IACd,OAAO,CAAC,wBAAwB,CACzB;IAEP,OAAO,CAAC,iBAAiB,CAIhB;IAET,OAAO,CAAC,2BAA2B;IA6B5B,aAAa,CAAC,IAAI,EAAE,UAAU,EAAE,SAAS,CAAC,EAAE,SAAS,CAAC,MAAM,CAAC;IAU7D,KAAK,CAAC,IAAI,EAAE,UAAU,EAAE,SAAS,CAAC,EAAE,SAAS;IAU7C,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,SAAS;IAuBnD,wBAAwB,CAAC,SAAS,CAAC,EAAE,SAAS;IAsB9C,yBAAyB,CAAC,SAAS,CAAC,EAAE,SAAS;IAsB/C,KAAK,CACR,IAAI,EAAE,UAAU,EAChB,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,MAAM,EACb,KAAK,CAAC,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,EACnB,MAAM,CAAC,EAAE,OAAO,EAChB,SAAS,CAAC,EAAE,SAAS,CAAC,UAAU,CAAC;IA8C9B,WAAW,CACd,IAAI,EAAE,UAAU,EAChB,SAAS,CAAC,EAAE,SAAS,CAAC,cAAc,CAAC;IAWlC,SAAS,CAAC,IAAI,EAAE,UAAU,EAAE,SAAS,CAAC,EAAE,SAAS,CAAC,MAAM,CAAC;IAUzD,mBAAmB,CACtB,IAAI,EAAE,UAAU,EAChB,SAAS,CAAC,EAAE,SAAS,CAAC,yBAAyB,CAAC;IAW7C,OAAO,CACV,QAAQ,EAAE,YAAY,EACtB,IAAI,EAAE,UAAU,EAChB,kBAAkB,CAAC,EAAE,kBAAkB,EACvC,YAAY,CAAC,EAAE,YAAY,EAC3B,SAAS,CAAC,EAAE,SAAS;IA8ClB,OAAO,CAAC,IAAI,EAAE,UAAU,EAAE,SAAS,CAAC,EAAE,SAAS;IAU/C,KAAK,CAAC,IAAI,EAAE,UAAU,EAAE,KAAK,CAAC,EAAE,SAAS,EAAE,SAAS,CAAC,EAAE,SAAS;IAWhE,OAAO,CACV,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,CAAC,cAAc,EAAE,OAAO,CAAC,OAAO,CAAC,EAAE,KAAK,IAAI;IAW7C,GAAG,CACZ,MAAM,EAAE,aAAa,EACrB,UAAU,CAAC,EAAE,eAAe,GAAG,SAAS,GACzC,OAAO,CAAC,OAAO,EAAE,CAAC;CAqGxB"}

package/typings/generated/nrfutil/device/common.d.ts

@@ -26,7 +26,7 @@ export interface NrfutilDevice {
 export type DeviceFamily = 'NRF51_FAMILY' | 'NRF52_FAMILY' | 'NRF53_FAMILY' | 'NRF91_FAMILY';
 export type ProtectionStatus = 'NRFDL_PROTECTION_STATUS_NONE' | 'NRFDL_PROTECTION_STATUS_REGION0' | 'NRFDL_PROTECTION_STATUS_REGION0_REGION1' | 'NRFDL_PROTECTION_STATUS_SECURE_REGIONS' | 'NRFDL_PROTECTION_STATUS_ALL';
 export type VersionType = 'NRFDL_VERSION_TYPE_SEMANTIC' | 'NRFDL_VERSION_TYPE_INCREMENTAL' | 'NRFDL_VERSION_TYPE_STRING';
-export type DeviceCore = 'Application' | 'Modem' | 'Network';
+export type DeviceCore = 'Application' | 'Modem' | 'Network' | 'Secure' | 'FLPR';
 export interface DeviceTraits {
     usb?: boolean;
     nordicUsb?: boolean;

package/typings/generated/nrfutil/device/common.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../../../nrfutil/device/common.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../../../nrfutil/device/common.ts"],"names":[],"mappings":"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"}

package/typings/generated/nrfutil/device/device.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { LogLevel, LogMessage } from '../sandboxTypes';
 import { Batch } from './batch';
 declare const _default: {
@@ -20,7 +19,6 @@ declare const _default: {
         isRunning: () => boolean;
         onClosed: (handler: (error?: Error | undefined) => void) => () => ((error?: Error | undefined) => void)[];
     }>;
-    firmwareRead: (device: import("./common").NrfutilDevice, core?: import("./common").DeviceCore | undefined, onProgress?: ((progress: import("..").Progress) => void) | undefined, controller?: AbortController | undefined) => Promise<Buffer>;
     onLogging: (handler: (logging: LogMessage) => void) => Promise<() => ((logging: LogMessage, pid?: number | undefined) => void)[]>;
     setLogLevel: (level: LogLevel) => Promise<void>;
     setVerboseLogging: (verbose: boolean) => Promise<void>;

package/typings/generated/nrfutil/device/device.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"device.d.ts","sourceRoot":"","sources":["../../../../nrfutil/device/device.ts"],"names":[],"mappings":";AAOA,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AACvD,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAuChC,wBAqBE"}
+{"version":3,"file":"device.d.ts","sourceRoot":"","sources":["../../../../nrfutil/device/device.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AACvD,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAsChC,wBAoBE"}

package/typings/generated/nrfutil/device/index.d.ts

@@ -1,5 +1,6 @@
 export { default as NrfutilDeviceLib } from './device';
 export type { DeviceCore, DeviceTraits, ProtectionStatus, SerialPort as DeviceSerialPort, NrfutilDevice, } from './common';
+export type { ReadResult } from './xRead';
 export type { DeviceInfo } from './deviceInfo';
 export type { DeviceCoreInfo } from './getCoreInfo';
 export type { ImageType } from './getFwInfo';

package/typings/generated/nrfutil/device/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../nrfutil/device/index.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,OAAO,IAAI,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAEvD,YAAY,EACR,UAAU,EACV,YAAY,EACZ,gBAAgB,EAChB,UAAU,IAAI,gBAAgB,EAC9B,aAAa,GAChB,MAAM,UAAU,CAAC;AAElB,YAAY,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC/C,YAAY,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AACpD,YAAY,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAE7C,YAAY,EAAE,KAAK,IAAI,WAAW,EAAE,MAAM,SAAS,CAAC;AACpD,YAAY,EAAE,SAAS,IAAI,cAAc,EAAE,MAAM,cAAc,CAAC;AAChE,YAAY,EAAE,yBAAyB,EAAE,MAAM,uBAAuB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../nrfutil/device/index.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,OAAO,IAAI,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAEvD,YAAY,EACR,UAAU,EACV,YAAY,EACZ,gBAAgB,EAChB,UAAU,IAAI,gBAAgB,EAC9B,aAAa,GAChB,MAAM,UAAU,CAAC;AAElB,YAAY,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAC1C,YAAY,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC/C,YAAY,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AACpD,YAAY,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAE7C,YAAY,EAAE,KAAK,IAAI,WAAW,EAAE,MAAM,SAAS,CAAC;AACpD,YAAY,EAAE,SAAS,IAAI,cAAc,EAAE,MAAM,cAAc,CAAC;AAChE,YAAY,EAAE,yBAAyB,EAAE,MAAM,uBAAuB,CAAC"}

package/typings/generated/nrfutil/device/xRead.d.ts

@@ -0,0 +1,20 @@
+import { Progress } from '../sandboxTypes';
+import { DeviceCore, NrfutilDevice } from './common';
+export interface MemoryData {
+    startAddress: string;
+    values: number[];
+}
+export interface MemoryReadRaw {
+    name: 'memory-read';
+    serialNumber: string;
+    memoryData: MemoryData[];
+}
+export type ReadResult = Awaited<ReturnType<typeof xRead>>;
+export declare function toIntelHex(memoryData: MemoryData[]): {
+    intelHex: string;
+};
+declare const xRead: (device: NrfutilDevice, address: number, bytes: number, core?: DeviceCore, width?: 8 | 15 | 32, direct?: boolean, onProgress?: ((progress: Progress) => void) | undefined, controller?: AbortController) => Promise<{
+    intelHex: string;
+}>;
+export default xRead;
+//# sourceMappingURL=xRead.d.ts.map

package/typings/generated/nrfutil/device/xRead.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"xRead.d.ts","sourceRoot":"","sources":["../../../../nrfutil/device/xRead.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC3C,OAAO,EACH,UAAU,EAEV,aAAa,EAChB,MAAM,UAAU,CAAC;AAElB,MAAM,WAAW,UAAU;IACvB,YAAY,EAAE,MAAM,CAAC;IACrB,MAAM,EAAE,MAAM,EAAE,CAAC;CACpB;AAED,MAAM,WAAW,aAAa;IAC1B,IAAI,EAAE,aAAa,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,UAAU,EAAE,CAAC;CAC5B;AAED,MAAM,MAAM,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC,OAAO,KAAK,CAAC,CAAC,CAAC;AAE3D,wBAAgB,UAAU,CAAC,UAAU,EAAE,UAAU,EAAE;;EA6DlD;AAED,QAAA,MAAM,KAAK,WACC,aAAa,WACZ,MAAM,SACR,MAAM,SACN,UAAU,UACT,CAAC,GAAG,EAAE,GAAG,EAAE,WACV,OAAO,2BACQ,QAAQ,KAAK,IAAI,4BAC5B,eAAe;;EAgC/B,CAAC;AAEF,eAAe,KAAK,CAAC"}

package/nrfutil/device/firmwareRead.ts

@@ -1,34 +0,0 @@
-/*
- * Copyright (c) 2023 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: LicenseRef-Nordic-4-Clause
- */
-
-import { Progress } from '../sandboxTypes';
-import {
-    DeviceCore,
-    deviceSingleTaskEndOperation,
-    NrfutilDevice,
-} from './common';
-
-export interface DeviceBuffer {
-    serialNumber: string;
-    buffer: string;
-}
-
-export default async (
-    device: NrfutilDevice,
-    core?: DeviceCore,
-    onProgress?: (progress: Progress) => void,
-    controller?: AbortController
-) => {
-    const deviceBuffer = await deviceSingleTaskEndOperation<DeviceBuffer>(
-        device,
-        'fw-read',
-        onProgress,
-        controller,
-        core ? ['--core', core] : []
-    );
-
-    return Buffer.from(deviceBuffer.buffer, 'base64');
-};

package/typings/generated/nrfutil/device/firmwareRead.d.ts

@@ -1,10 +0,0 @@
-/// <reference types="node" />
-import { Progress } from '../sandboxTypes';
-import { DeviceCore, NrfutilDevice } from './common';
-export interface DeviceBuffer {
-    serialNumber: string;
-    buffer: string;
-}
-declare const _default: (device: NrfutilDevice, core?: DeviceCore, onProgress?: ((progress: Progress) => void) | undefined, controller?: AbortController) => Promise<Buffer>;
-export default _default;
-//# sourceMappingURL=firmwareRead.d.ts.map

package/typings/generated/nrfutil/device/firmwareRead.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"firmwareRead.d.ts","sourceRoot":"","sources":["../../../../nrfutil/device/firmwareRead.ts"],"names":[],"mappings":";AAMA,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC3C,OAAO,EACH,UAAU,EAEV,aAAa,EAChB,MAAM,UAAU,CAAC;AAElB,MAAM,WAAW,YAAY;IACzB,YAAY,EAAE,MAAM,CAAC;IACrB,MAAM,EAAE,MAAM,CAAC;CAClB;iCAGW,aAAa,SACd,UAAU,2BACO,QAAQ,KAAK,IAAI,4BAC5B,eAAe;AAJhC,wBAeE"}