@microbit/microbit-connection 0.9.0-apps.alpha.16 → 0.9.0-apps.alpha.17

package/build/esm/usb/daplink.test.js

@@ -0,0 +1,288 @@
+import { describe, it, expect, vi, beforeEach } from "vitest";
+import { DapTransferError } from "./cmsis-dap.js";
+import { ConsoleLogging } from "../logging.js";
+import { DAPLINK_VENDOR_READ_UNIQUE_ID, DAPLINK_VENDOR_READ_SETTINGS, DAPLINK_VENDOR_SERIAL_READ, DAPLINK_VENDOR_SERIAL_WRITE, DAPLINK_VENDOR_WRITE_SETTINGS, DAPLINK_VENDOR_FLASH_CLOSE, DAPLINK_VENDOR_FLASH_OPEN, DAPLINK_VENDOR_FLASH_RESET, DAPLINK_VENDOR_FLASH_WRITE, DapLinkSerial, dapLinkFlash, readDaplinkUniqueId, readMem32WithRetry, } from "./daplink.js";
+// ---------------------------------------------------------------------------
+// Helpers
+// ---------------------------------------------------------------------------
+const logging = new ConsoleLogging();
+/** Create a DataView response with a command echo and status/length byte. */
+function makeResponse(command, secondByte, extraBytes = []) {
+    const buf = new ArrayBuffer(64);
+    const view = new DataView(buf);
+    view.setUint8(0, command);
+    view.setUint8(1, secondByte);
+    extraBytes.forEach((b, i) => view.setUint8(2 + i, b));
+    return view;
+}
+function createMockDap() {
+    return {
+        isOpen: true,
+        blockSize: 59,
+        send: vi.fn(),
+        clearAbort: vi.fn(),
+        swjSequence: vi.fn(),
+        swjClock: vi.fn(),
+        connect: vi.fn(),
+        disconnect: vi.fn(),
+        configureTransfer: vi.fn(),
+        open: vi.fn(),
+        close: vi.fn(),
+        transfer: vi.fn(),
+        transferBlockRead: vi.fn(),
+        transferBlockWrite: vi.fn(),
+        drainStaleResponses: vi.fn(),
+    };
+}
+function createMockAdi(dap) {
+    return {
+        dap,
+        get isOpen() {
+            return true;
+        },
+        readMem32: vi.fn(),
+        writeMem32: vi.fn(),
+        readMem32Ops: vi.fn(() => []),
+        writeMem32Ops: vi.fn(() => []),
+        readBlock: vi.fn(),
+        writeBlock: vi.fn(),
+        transferSequence: vi.fn(),
+        resetState: vi.fn(),
+        connect: vi.fn(),
+        disconnect: vi.fn(),
+        reinit: vi.fn(),
+    };
+}
+// ---------------------------------------------------------------------------
+// DapLinkSerial
+// ---------------------------------------------------------------------------
+describe("DapLinkSerial", () => {
+    let dap;
+    let serial;
+    beforeEach(() => {
+        dap = createMockDap();
+        serial = new DapLinkSerial(dap, logging);
+    });
+    describe("getBaudrate", () => {
+        it("reads baud rate from READ_SETTINGS response", async () => {
+            const response = new DataView(new ArrayBuffer(64));
+            response.setUint8(0, DAPLINK_VENDOR_READ_SETTINGS);
+            response.setUint32(1, 115200, true);
+            vi.mocked(dap.send).mockResolvedValueOnce(response);
+            const baud = await serial.getBaudrate();
+            expect(baud).toBe(115200);
+            expect(dap.send).toHaveBeenCalledWith(DAPLINK_VENDOR_READ_SETTINGS);
+        });
+    });
+    describe("setBaudrate", () => {
+        it("sends baud rate via WRITE_SETTINGS", async () => {
+            vi.mocked(dap.send).mockResolvedValueOnce(new DataView(new ArrayBuffer(64)));
+            await serial.setBaudrate(9600);
+            expect(dap.send).toHaveBeenCalledWith(DAPLINK_VENDOR_WRITE_SETTINGS, expect.any(Uint8Array));
+            const payload = vi.mocked(dap.send).mock.calls[0][1];
+            const sentBaud = new DataView(payload.buffer).getUint32(0, true);
+            expect(sentBaud).toBe(9600);
+        });
+    });
+    describe("read", () => {
+        it("returns decoded string when data is available", async () => {
+            const text = "Hi";
+            const encoded = new TextEncoder().encode(text);
+            const response = new DataView(new ArrayBuffer(64));
+            response.setUint8(0, DAPLINK_VENDOR_SERIAL_READ);
+            response.setUint8(1, encoded.length);
+            encoded.forEach((b, i) => response.setUint8(2 + i, b));
+            vi.mocked(dap.send).mockResolvedValueOnce(response);
+            const result = await serial.read();
+            expect(result).toBe("Hi");
+        });
+        it("returns undefined when no data", async () => {
+            vi.mocked(dap.send).mockResolvedValueOnce(makeResponse(DAPLINK_VENDOR_SERIAL_READ, 0));
+            const result = await serial.read();
+            expect(result).toBeUndefined();
+        });
+    });
+    describe("write", () => {
+        it("sends encoded string with length prefix", async () => {
+            vi.mocked(dap.send).mockResolvedValueOnce(new DataView(new ArrayBuffer(64)));
+            await serial.write("AB");
+            expect(dap.send).toHaveBeenCalledWith(DAPLINK_VENDOR_SERIAL_WRITE, expect.any(Uint8Array));
+            const payload = vi.mocked(dap.send).mock.calls[0][1];
+            expect(payload[0]).toBe(2); // length
+            expect(payload[1]).toBe(0x41); // 'A'
+            expect(payload[2]).toBe(0x42); // 'B'
+        });
+    });
+    describe("drain", () => {
+        it("reads until empty", async () => {
+            // Two reads with data, then one empty
+            const text = new TextEncoder().encode("x");
+            const withData = new DataView(new ArrayBuffer(64));
+            withData.setUint8(1, 1);
+            withData.setUint8(2, text[0]);
+            vi.mocked(dap.send)
+                .mockResolvedValueOnce(withData)
+                .mockResolvedValueOnce(withData)
+                .mockResolvedValueOnce(makeResponse(0, 0)); // empty
+            await serial.drain();
+            expect(dap.send).toHaveBeenCalledTimes(3);
+        });
+        it("does nothing when already empty", async () => {
+            vi.mocked(dap.send).mockResolvedValueOnce(makeResponse(0, 0));
+            await serial.drain();
+            expect(dap.send).toHaveBeenCalledTimes(1);
+        });
+    });
+    describe("startPolling / stopPolling", () => {
+        it("calls onData for each read and stops when requested", async () => {
+            const received = [];
+            let callCount = 0;
+            vi.mocked(dap.send).mockImplementation(async () => {
+                callCount++;
+                if (callCount <= 2) {
+                    const resp = new DataView(new ArrayBuffer(64));
+                    resp.setUint8(1, 1);
+                    resp.setUint8(2, 0x41 + callCount - 1); // 'A', 'B'
+                    return resp;
+                }
+                // After 2 data reads, stop polling
+                serial.stopPolling();
+                return makeResponse(0, 0);
+            });
+            await serial.startPolling((data) => received.push(data), 0);
+            expect(received).toEqual(["A", "B"]);
+        });
+    });
+});
+// ---------------------------------------------------------------------------
+// dapLinkFlash
+// ---------------------------------------------------------------------------
+describe("dapLinkFlash", () => {
+    let dap;
+    let adi;
+    beforeEach(() => {
+        dap = createMockDap();
+        adi = createMockAdi(dap);
+    });
+    it("streams hex data in 62-byte pages", async () => {
+        // 124 bytes = 2 full pages
+        const buffer = new Uint8Array(124);
+        buffer.fill(0x3a); // ':' characters (Intel HEX)
+        vi.mocked(dap.send)
+            // FLASH_OPEN → success
+            .mockResolvedValueOnce(makeResponse(DAPLINK_VENDOR_FLASH_OPEN, 0))
+            // FLASH_WRITE page 1 → success
+            .mockResolvedValueOnce(makeResponse(DAPLINK_VENDOR_FLASH_WRITE, 0))
+            // FLASH_WRITE page 2 → success
+            .mockResolvedValueOnce(makeResponse(DAPLINK_VENDOR_FLASH_WRITE, 0))
+            // FLASH_CLOSE → success
+            .mockResolvedValueOnce(makeResponse(DAPLINK_VENDOR_FLASH_CLOSE, 0))
+            // FLASH_RESET
+            .mockResolvedValueOnce(makeResponse(DAPLINK_VENDOR_FLASH_RESET, 0));
+        const progress = vi.fn();
+        await dapLinkFlash(adi, buffer, progress);
+        // OPEN + 2 WRITE + CLOSE + RESET = 5 sends
+        expect(dap.send).toHaveBeenCalledTimes(5);
+        // Progress called for each page + final 1.0
+        expect(progress).toHaveBeenCalledWith(1.0);
+        // resetState called in finally
+        expect(adi.resetState).toHaveBeenCalled();
+    });
+    it("stops early on ERROR_SUCCESS_DONE", async () => {
+        const buffer = new Uint8Array(124);
+        vi.mocked(dap.send)
+            .mockResolvedValueOnce(makeResponse(DAPLINK_VENDOR_FLASH_OPEN, 0))
+            // First page returns DONE (18)
+            .mockResolvedValueOnce(makeResponse(DAPLINK_VENDOR_FLASH_WRITE, 18))
+            .mockResolvedValueOnce(makeResponse(DAPLINK_VENDOR_FLASH_CLOSE, 0))
+            .mockResolvedValueOnce(makeResponse(DAPLINK_VENDOR_FLASH_RESET, 0));
+        await dapLinkFlash(adi, buffer);
+        // Only 1 write (stopped at DONE), then CLOSE + RESET
+        expect(dap.send).toHaveBeenCalledTimes(4);
+    });
+    it("throws on FLASH_OPEN error", async () => {
+        vi.mocked(dap.send).mockResolvedValueOnce(makeResponse(DAPLINK_VENDOR_FLASH_OPEN, 5));
+        await expect(dapLinkFlash(adi, new Uint8Array(10))).rejects.toThrow("Flash open error");
+        // The throw happens before the try/finally block, so resetState is not called.
+        expect(adi.resetState).not.toHaveBeenCalled();
+    });
+    it("throws on FLASH_CLOSE error and attempts cleanup", async () => {
+        const buffer = new Uint8Array(10);
+        vi.mocked(dap.send)
+            .mockResolvedValueOnce(makeResponse(DAPLINK_VENDOR_FLASH_OPEN, 0))
+            .mockResolvedValueOnce(makeResponse(DAPLINK_VENDOR_FLASH_WRITE, 0))
+            // FLASH_CLOSE returns error
+            .mockResolvedValueOnce(makeResponse(DAPLINK_VENDOR_FLASH_CLOSE, 7))
+            // Cleanup FLASH_CLOSE in catch
+            .mockResolvedValueOnce(makeResponse(DAPLINK_VENDOR_FLASH_CLOSE, 0));
+        await expect(dapLinkFlash(adi, buffer)).rejects.toThrow("Flash close error");
+        expect(adi.resetState).toHaveBeenCalled();
+    });
+});
+// ---------------------------------------------------------------------------
+// readDaplinkUniqueId
+// ---------------------------------------------------------------------------
+describe("readDaplinkUniqueId", () => {
+    let dap;
+    beforeEach(() => {
+        dap = createMockDap();
+    });
+    it("returns the unique ID string", async () => {
+        const id = "9900012345678901234567890123456789012345678901234";
+        const encoded = new TextEncoder().encode(id);
+        const response = new DataView(new ArrayBuffer(64));
+        response.setUint8(0, DAPLINK_VENDOR_READ_UNIQUE_ID);
+        response.setUint8(1, encoded.length);
+        encoded.forEach((b, i) => response.setUint8(2 + i, b));
+        vi.mocked(dap.send).mockResolvedValueOnce(response);
+        const result = await readDaplinkUniqueId(dap, logging);
+        expect(result).toBe(id);
+    });
+    it("returns undefined for zero-length response", async () => {
+        vi.mocked(dap.send).mockResolvedValueOnce(makeResponse(DAPLINK_VENDOR_READ_UNIQUE_ID, 0));
+        const result = await readDaplinkUniqueId(dap, logging);
+        expect(result).toBeUndefined();
+    });
+    it("returns undefined on error", async () => {
+        vi.mocked(dap.send).mockRejectedValueOnce(new Error("USB gone"));
+        const result = await readDaplinkUniqueId(dap, logging);
+        expect(result).toBeUndefined();
+    });
+});
+// ---------------------------------------------------------------------------
+// readMem32WithRetry
+// ---------------------------------------------------------------------------
+describe("readMem32WithRetry", () => {
+    let dap;
+    let adi;
+    beforeEach(() => {
+        dap = createMockDap();
+        adi = createMockAdi(dap);
+    });
+    it("returns value on first success", async () => {
+        vi.mocked(adi.readMem32).mockResolvedValueOnce(0xdeadbeef);
+        const value = await readMem32WithRetry(adi, 0x10000010, logging);
+        expect(value).toBe(0xdeadbeef);
+        expect(adi.readMem32).toHaveBeenCalledTimes(1);
+    });
+    it("retries on DapTransferError", async () => {
+        vi.mocked(adi.readMem32)
+            .mockRejectedValueOnce(new DapTransferError(0x04, 0, 1))
+            .mockRejectedValueOnce(new DapTransferError(0x04, 0, 1))
+            .mockResolvedValueOnce(0x42);
+        const value = await readMem32WithRetry(adi, 0x10000010, logging, 5, 0);
+        expect(value).toBe(0x42);
+        expect(adi.readMem32).toHaveBeenCalledTimes(3);
+    });
+    it("throws non-transfer errors immediately", async () => {
+        vi.mocked(adi.readMem32).mockRejectedValueOnce(new Error("USB gone"));
+        await expect(readMem32WithRetry(adi, 0x10000010, logging, 5, 0)).rejects.toThrow("USB gone");
+        expect(adi.readMem32).toHaveBeenCalledTimes(1);
+    });
+    it("throws after exhausting retries", async () => {
+        vi.mocked(adi.readMem32).mockRejectedValue(new DapTransferError(0x04, 0, 1));
+        await expect(readMem32WithRetry(adi, 0x10000010, logging, 3, 0)).rejects.toThrow(DapTransferError);
+        expect(adi.readMem32).toHaveBeenCalledTimes(3);
+    });
+});
+//# sourceMappingURL=daplink.test.js.map

package/build/esm/usb/daplink.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"daplink.test.js","sourceRoot":"","sources":["../../../src/usb/daplink.test.ts"],"names":[],"mappings":"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"}

package/build/esm/usb/device-wrapper.d.ts

@@ -0,0 +1,34 @@
+/**
+ * (c) 2021, Micro:bit Educational Foundation and contributors
+ *
+ * SPDX-License-Identifier: MIT
+ */
+import { BoardSerialInfo } from "./board-serial-info.js";
+import { Logging } from "../logging.js";
+import { ArmDebugSwd } from "./arm-debug.js";
+import { CortexM } from "./cortex-m.js";
+import { DapLinkSerial } from "./daplink.js";
+export interface BoardConnectionInfo {
+    boardSerialInfo: BoardSerialInfo;
+    deviceId: number;
+    pageSize: number;
+    numPages: number;
+}
+export declare class USBDeviceWrapper {
+    readonly usbDevice: USBDevice;
+    private logging;
+    adi: ArmDebugSwd;
+    cortexM: CortexM;
+    serial: DapLinkSerial;
+    private initialConnectionComplete;
+    constructor(usbDevice: USBDevice, logging: Logging);
+    reconnect(): Promise<BoardConnectionInfo>;
+    /**
+     * Read the board serial info, preferring the DAPLink vendor command.
+     * Chrome may anonymize USBDevice.serialNumber for anti-fingerprinting
+     * (https://github.com/microbit-foundation/microbit-connection/issues/57)
+     * so we read it via the DAP protocol instead.
+     */
+    private readBoardSerialInfo;
+    disconnect(): Promise<void>;
+}

package/build/esm/usb/device-wrapper.js

@@ -0,0 +1,98 @@
+/**
+ * (c) 2021, Micro:bit Educational Foundation and contributors
+ *
+ * SPDX-License-Identifier: MIT
+ */
+import { BoardSerialInfo } from "./board-serial-info.js";
+import { ArmDebugSwd } from "./arm-debug.js";
+import { CmsisDapUsb } from "./cmsis-dap.js";
+import { CortexM } from "./cortex-m.js";
+import { DapLinkSerial, readDaplinkUniqueId, readMem32WithRetry, } from "./daplink.js";
+import { UsbTransport } from "./transport.js";
+// FICR Registers (Nordic nRF SoC Factory Information Configuration)
+// https://docs.nordicsemi.com/bundle/ps_nrf52833/page/ficr.html
+const FICR_CODEPAGESIZE = 0x10000010;
+const FICR_CODESIZE = 0x10000014;
+const FICR_DEVICE_ID_1 = 0x10000064;
+export class USBDeviceWrapper {
+    constructor(usbDevice, logging) {
+        Object.defineProperty(this, "usbDevice", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: usbDevice
+        });
+        Object.defineProperty(this, "logging", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: logging
+        });
+        Object.defineProperty(this, "adi", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "cortexM", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "serial", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "initialConnectionComplete", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: false
+        });
+        const cmsisDap = new CmsisDapUsb(new UsbTransport(this.usbDevice), this.logging);
+        this.adi = new ArmDebugSwd(cmsisDap, this.logging);
+        this.cortexM = new CortexM(this.adi);
+        this.serial = new DapLinkSerial(cmsisDap, this.logging);
+    }
+    // Drawn from https://github.com/microsoft/pxt-microbit/blob/dec5b8ce72d5c2b4b0b20aafefce7474a6f0c7b2/editor/extension.tsx#L119
+    async reconnect() {
+        if (this.initialConnectionComplete) {
+            await this.disconnect();
+        }
+        else {
+            this.initialConnectionComplete = true;
+        }
+        await this.adi.connect();
+        const boardSerialInfo = await this.readBoardSerialInfo();
+        this.logging.log(`Detected board ID ${boardSerialInfo.id}`);
+        // https://support.microbit.org/support/solutions/articles/19000067679-how-to-find-the-name-of-your-micro-bit
+        // We retry on errors as immediately after flash the micro:bit won't be ready to respond
+        const deviceId = await readMem32WithRetry(this.adi, FICR_DEVICE_ID_1, this.logging);
+        const pageSize = await readMem32WithRetry(this.adi, FICR_CODEPAGESIZE, this.logging);
+        const numPages = await readMem32WithRetry(this.adi, FICR_CODESIZE, this.logging);
+        return { boardSerialInfo, deviceId, pageSize, numPages };
+    }
+    /**
+     * Read the board serial info, preferring the DAPLink vendor command.
+     * Chrome may anonymize USBDevice.serialNumber for anti-fingerprinting
+     * (https://github.com/microbit-foundation/microbit-connection/issues/57)
+     * so we read it via the DAP protocol instead.
+     */
+    async readBoardSerialInfo() {
+        const dapSerial = await readDaplinkUniqueId(this.adi.dap, this.logging);
+        if (dapSerial) {
+            return BoardSerialInfo.fromSerial(dapSerial, this.logging.log.bind(this.logging));
+        }
+        this.logging.log("Failed to read unique ID via DAP vendor command, falling back to USB serial number (may be affected by anti-fingerprinting)");
+        return BoardSerialInfo.parse(this.usbDevice, this.logging.log.bind(this.logging));
+    }
+    async disconnect() {
+        if (this.usbDevice.opened && this.adi.isOpen) {
+            return this.adi.disconnect();
+        }
+    }
+}
+//# sourceMappingURL=device-wrapper.js.map

package/build/esm/usb/device-wrapper.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"device-wrapper.js","sourceRoot":"","sources":["../../../src/usb/device-wrapper.ts"],"names":[],"mappings":"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"}

package/build/esm/usb/index.d.ts

@@ -0,0 +1,5 @@
+/**
+ * @module @microbit/microbit-connection/usb
+ */
+export { createUSBConnection, DeviceSelectionMode, type MicrobitUSBConnection, type MicrobitUSBConnectionOptions, } from "./connection.js";
+export type { SerialConnectionEventMap, SerialData, SerialErrorData, } from "./serial-events.js";

package/build/esm/usb/index.js

@@ -0,0 +1,5 @@
+/**
+ * @module @microbit/microbit-connection/usb
+ */
+export { createUSBConnection, DeviceSelectionMode, } from "./connection.js";
+//# sourceMappingURL=index.js.map

package/build/esm/usb/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/usb/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EACL,mBAAmB,EACnB,mBAAmB,GAGpB,MAAM,iBAAiB,CAAC"}

package/build/{cjs/usb-partial-flashing-utils.d.ts → esm/usb/partial-flashing-utils.d.ts}

@@ -1,17 +1,14 @@
-export declare const CoreRegister: {
-    SP: number;
-    LR: number;
-    PC: number;
-};
+/**
+ * (c) 2021, Micro:bit Educational Foundation and contributors
+ *
+ * SPDX-License-Identifier: MIT
+ */
 export declare const read32FromUInt8Array: (data: Uint8Array, i: number) => number;
-export declare const bufferConcat: (bufs: Uint8Array[]) => Uint8Array;
 export declare const murmur3_core: (data: Uint8Array) => [number, number];
-export declare const apReg: (r: number, mode: number) => number;
-export declare const regRequest: (regId: number, isWrite?: boolean) => number;
 export declare class Page {
     readonly targetAddr: number;
     readonly data: Uint8Array;
     constructor(targetAddr: number, data: Uint8Array);
 }
 export declare const pageAlignBlocks: (buffer: Uint8Array, targetAddr: number, pageSize: number) => Page[];
-export declare const onlyChanged: (pages: Page[], checksums: Uint8Array, pageSize: number) => Page[];
+export declare const onlyChanged: (pages: Page[], checksums: Uint32Array, pageSize: number) => Page[];

package/build/esm/{usb-partial-flashing-utils.js → usb/partial-flashing-utils.js}

@@ -3,14 +3,6 @@
  *
  * SPDX-License-Identifier: MIT
  */
-import { DapVal } from "./constants.js";
-// Represents the micro:bit's core registers
-// Drawn from https://armmbed.github.io/dapjs/docs/enums/coreregister.html
-export const CoreRegister = {
-    SP: 13,
-    LR: 14,
-    PC: 15,
-};
 export const read32FromUInt8Array = (data, i) => {
     return ((data[i] |
         (data[i + 1] << 8) |
@@ -18,19 +10,6 @@ export const read32FromUInt8Array = (data, i) => {
         (data[i + 3] << 24)) >>>
         0);
 };
-export const bufferConcat = (bufs) => {
-    let len = 0;
-    for (const b of bufs) {
-        len += b.length;
-    }
-    const r = new Uint8Array(len);
-    len = 0;
-    for (const b of bufs) {
-        r.set(b, len);
-        len += b.length;
-    }
-    return r;
-};
 // Returns the MurmurHash of the data passed to it, used for checksum calculation.
 // Drawn from https://github.com/microsoft/pxt-microbit/blob/dec5b8ce72d5c2b4b0b20aafefce7474a6f0c7b2/editor/extension.tsx#L14
 export const murmur3_core = (data) => {
@@ -50,25 +29,6 @@ export const murmur3_core = (data) => {
     }
     return [h0, h1];
 };
-// Returns a representation of an Access Port Register.
-// Drawn from https://github.com/mmoskal/dapjs/blob/a32f11f54e9e76a9c61896ddd425c1cb1a29c143/src/util.ts#L63
-export const apReg = (r, mode) => {
-    const v = r | mode | DapVal.AP_ACC;
-    return 4 + ((v & 0x0c) >> 2);
-};
-// Returns a code representing a request to read/write a certain register.
-// Drawn from https://github.com/mmoskal/dapjs/blob/a32f11f54e9e76a9c61896ddd425c1cb1a29c143/src/util.ts#L92
-export const regRequest = (regId, isWrite = false) => {
-    let request = !isWrite ? 1 << 1 /* READ */ : 0 << 1; /* WRITE */
-    if (regId < 4) {
-        request |= 0 << 0 /* DP_ACC */;
-    }
-    else {
-        request |= 1 << 0 /* AP_ACC */;
-    }
-    request |= (regId & 3) << 2;
-    return request;
-};
 export class Page {
     constructor(targetAddr, data) {
         Object.defineProperty(this, "targetAddr", {
@@ -109,14 +69,14 @@ export const pageAlignBlocks = (buffer, targetAddr, pageSize) => {
 export const onlyChanged = (pages, checksums, pageSize) => {
     return pages.filter((page) => {
         let idx = page.targetAddr / pageSize;
-        if (idx * 8 + 8 > checksums.length)
+        if (idx * 2 + 2 > checksums.length)
             return true; // out of range?
-        let c0 = read32FromUInt8Array(checksums, idx * 8);
-        let c1 = read32FromUInt8Array(checksums, idx * 8 + 4);
+        let c0 = checksums[idx * 2];
+        let c1 = checksums[idx * 2 + 1];
         let ch = murmur3_core(page.data);
         if (c0 === ch[0] && c1 === ch[1])
             return false;
         return true;
     });
 };
-//# sourceMappingURL=usb-partial-flashing-utils.js.map
+//# sourceMappingURL=partial-flashing-utils.js.map

package/build/esm/usb/partial-flashing-utils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"partial-flashing-utils.js","sourceRoot":"","sources":["../../../src/usb/partial-flashing-utils.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,IAAgB,EAAE,CAAS,EAAU,EAAE;IAC1E,OAAO,CACL,CAAC,IAAI,CAAC,CAAC,CAAC;QACN,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC;QAClB,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;QACnB,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;QACtB,CAAC,CACF,CAAC;AACJ,CAAC,CAAC;AAEF,kFAAkF;AAClF,8HAA8H;AAC9H,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,IAAgB,EAAoB,EAAE;IACjE,IAAI,EAAE,GAAG,UAAU,CAAC;IACpB,IAAI,EAAE,GAAG,UAAU,CAAC;IAEpB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;QAC5C,IAAI,CAAC,GAAG,oBAAoB,CAAC,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC;QAC5C,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC;QAC7B,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC;QAC3B,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC;QAE7B,EAAE,IAAI,CAAC,CAAC;QACR,EAAE,IAAI,CAAC,CAAC;QACR,EAAE,GAAG,CAAC,EAAE,IAAI,EAAE,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;QAC9B,EAAE,GAAG,CAAC,EAAE,IAAI,EAAE,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;QAC9B,EAAE,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC;QAC3C,EAAE,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC;IAC7C,CAAC;IACD,OAAO,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAClB,CAAC,CAAC;AAEF,MAAM,OAAO,IAAI;IACf,YACW,UAAkB,EAClB,IAAgB;QADzB;;;;mBAAS,UAAU;WAAQ;QAC3B;;;;mBAAS,IAAI;WAAY;IACxB,CAAC;CACL;AAED,kDAAkD;AAClD,+HAA+H;AAC/H,MAAM,CAAC,MAAM,eAAe,GAAG,CAC7B,MAAkB,EAClB,UAAkB,EAClB,QAAgB,EACR,EAAE;IACV,IAAI,SAAS,GAAG,IAAI,UAAU,CAAC,MAAM,CAAC,CAAC;IACvC,IAAI,KAAK,GAAG,EAAE,CAAC;IACf,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC,UAAU,GAAI,CAAC;QAC3C,IAAI,MAAM,GAAG,IAAI,UAAU,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACjD,IAAI,QAAQ,GAAG,CAAC,UAAU,GAAG,CAAC,CAAC,GAAG,CAAC,QAAQ,GAAG,CAAC,CAAC,CAAC;QACjD,IAAI,OAAO,GAAG,UAAU,GAAG,CAAC,GAAG,QAAQ,CAAC;QACxC,OAAO,CAAC,GAAG,SAAS,CAAC,UAAU,EAAE,EAAE,CAAC,EAAE,CAAC;YACrC,IAAI,UAAU,GAAG,CAAC,IAAI,OAAO,GAAG,QAAQ;gBAAE,MAAM;YAChD,MAAM,CAAC,UAAU,GAAG,CAAC,GAAG,OAAO,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC;QAClD,CAAC;QACD,IAAI,IAAI,GAAG,IAAI,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QACrC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACnB,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AAEF,2GAA2G;AAC3G,+HAA+H;AAC/H,MAAM,CAAC,MAAM,WAAW,GAAG,CACzB,KAAa,EACb,SAAsB,EACtB,QAAgB,EACR,EAAE;IACV,OAAO,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE;QAC3B,IAAI,GAAG,GAAG,IAAI,CAAC,UAAU,GAAG,QAAQ,CAAC;QACrC,IAAI,GAAG,GAAG,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC,MAAM;YAAE,OAAO,IAAI,CAAC,CAAC,gBAAgB;QACjE,IAAI,EAAE,GAAG,SAAS,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC;QAC5B,IAAI,EAAE,GAAG,SAAS,CAAC,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;QAChC,IAAI,EAAE,GAAG,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACjC,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;YAAE,OAAO,KAAK,CAAC;QAC/C,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;AACL,CAAC,CAAC"}

package/build/{cjs/usb-partial-flashing.d.ts → esm/usb/partial-flashing.d.ts}

@@ -37,20 +37,28 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-import { Logging } from "./logging.js";
-import { DAPWrapper } from "./usb-device-wrapper.js";
-import { BoardVersion, ProgressCallback } from "./device.js";
+/**
+ * Implementation of partial flashing for the micro:bit.
+ *
+ * Latest Microsoft implementation is here:
+ * https://github.com/microsoft/pxt-microbit/blob/master/editor/flash.ts
+ */
+import { Logging } from "../logging.js";
+import { BoardVersion, ProgressCallback } from "../device.js";
 import MemoryMap from "nrf-intel-hex";
+import { USBDeviceWrapper } from "./device-wrapper.js";
 /**
- * Uses a DAPWrapper to flash the micro:bit.
+ * Uses a USBDeviceWrapper to flash the micro:bit.
  *
- * Intented to be used for a single flash with a pre-connected DAPWrapper.
+ * Intended to be used for a single flash with a pre-connected USBDeviceWrapper.
  */
 export declare class PartialFlashing {
-    private dapwrapper;
+    private device;
     private logging;
     private boardVersion;
-    constructor(dapwrapper: DAPWrapper, logging: Logging, boardVersion: BoardVersion);
+    private pageSize;
+    private numPages;
+    constructor(device: USBDeviceWrapper, logging: Logging, boardVersion: BoardVersion, pageSize: number, numPages: number);
     private log;
     private getFlashChecksumsAsync;
     private runFlash;