@microbit/microbit-connection 0.9.0-apps.alpha.14 → 0.9.0-apps.alpha.16
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build/cjs/accelerometer-service.js.map +1 -1
- package/build/cjs/accelerometer.js.map +1 -1
- package/build/cjs/async-util.js.map +1 -1
- package/build/cjs/async-util.test.d.ts +1 -0
- package/build/cjs/async-util.test.js +20 -0
- package/build/cjs/async-util.test.js.map +1 -0
- package/build/cjs/availability.js.map +1 -1
- package/build/cjs/bluetooth-device-wrapper.d.ts +15 -1
- package/build/cjs/bluetooth-device-wrapper.js +89 -19
- package/build/cjs/bluetooth-device-wrapper.js.map +1 -1
- package/build/cjs/bluetooth-profile.d.ts +8 -0
- package/build/cjs/bluetooth-profile.js +6 -0
- package/build/cjs/bluetooth-profile.js.map +1 -1
- package/build/cjs/bluetooth.d.ts +2 -0
- package/build/cjs/bluetooth.js +52 -8
- package/build/cjs/bluetooth.js.map +1 -1
- package/build/cjs/bluetooth.test.d.ts +1 -0
- package/build/cjs/bluetooth.test.js +88 -0
- package/build/cjs/bluetooth.test.js.map +1 -0
- package/build/cjs/board-id.js.map +1 -1
- package/build/cjs/board-serial-info.js.map +1 -1
- package/build/cjs/board-serial-info.test.d.ts +1 -0
- package/build/cjs/board-serial-info.test.js +48 -0
- package/build/cjs/board-serial-info.test.js.map +1 -0
- package/build/cjs/button-service.js.map +1 -1
- package/build/cjs/buttons.js.map +1 -1
- package/build/cjs/constants.js.map +1 -1
- package/build/cjs/device-bond-state.d.ts +14 -0
- package/build/cjs/device-bond-state.js +26 -0
- package/build/cjs/device-bond-state.js.map +1 -0
- package/build/cjs/device-information-service.js.map +1 -1
- package/build/cjs/device.d.ts +2 -2
- package/build/cjs/device.js.map +1 -1
- package/build/cjs/dfu-service.js.map +1 -1
- package/build/cjs/events.js.map +1 -1
- package/build/cjs/events.test.d.ts +1 -0
- package/build/cjs/events.test.js +109 -0
- package/build/cjs/events.test.js.map +1 -0
- package/build/cjs/flashing/flashing-full.js.map +1 -1
- package/build/cjs/flashing/flashing-makecode.d.ts +5 -1
- package/build/cjs/flashing/flashing-makecode.js +5 -2
- package/build/cjs/flashing/flashing-makecode.js.map +1 -1
- package/build/cjs/flashing/flashing-makecode.test.d.ts +1 -0
- package/build/cjs/flashing/flashing-makecode.test.js +253 -0
- package/build/cjs/flashing/flashing-makecode.test.js.map +1 -0
- package/build/cjs/flashing/flashing-partial.d.ts +3 -2
- package/build/cjs/flashing/flashing-partial.js +108 -62
- package/build/cjs/flashing/flashing-partial.js.map +1 -1
- package/build/cjs/flashing/flashing-v1.js.map +1 -1
- package/build/cjs/flashing/nordic-dfu.js +14 -3
- package/build/cjs/flashing/nordic-dfu.js.map +1 -1
- package/build/cjs/flashing/zip.js.map +1 -1
- package/build/cjs/flashing/zip.test.d.ts +1 -0
- package/build/cjs/flashing/zip.test.js +96 -0
- package/build/cjs/flashing/zip.test.js.map +1 -0
- package/build/cjs/hex-flash-data-source.d.ts +1 -0
- package/build/cjs/hex-flash-data-source.js +12 -1
- package/build/cjs/hex-flash-data-source.js.map +1 -1
- package/build/cjs/index.d.ts +2 -1
- package/build/cjs/index.js.map +1 -1
- package/build/cjs/led-service.js.map +1 -1
- package/build/cjs/led.js.map +1 -1
- package/build/cjs/logging.js.map +1 -1
- package/build/cjs/magnetometer-service.js.map +1 -1
- package/build/cjs/magnetometer.js.map +1 -1
- package/build/cjs/partial-flashing-service.js.map +1 -1
- package/build/cjs/promise-queue.js.map +1 -1
- package/build/cjs/promise-queue.test.d.ts +1 -0
- package/build/cjs/promise-queue.test.js +68 -0
- package/build/cjs/promise-queue.test.js.map +1 -0
- package/build/cjs/serial-events.js.map +1 -1
- package/build/cjs/service-events.js.map +1 -1
- package/build/cjs/setupTests.js +8 -0
- package/build/cjs/setupTests.js.map +1 -1
- package/build/cjs/uart-service.js.map +1 -1
- package/build/cjs/uart.js.map +1 -1
- package/build/cjs/usb-device-wrapper.js.map +1 -1
- package/build/cjs/usb-partial-flashing-utils.js.map +1 -1
- package/build/cjs/usb-partial-flashing.js +2 -1
- package/build/cjs/usb-partial-flashing.js.map +1 -1
- package/build/cjs/usb-radio-bridge.js.map +1 -1
- package/build/cjs/usb-serial-protocol.js.map +1 -1
- package/build/cjs/usb.js.map +1 -1
- package/build/cjs/usb.test.d.ts +1 -0
- package/build/cjs/usb.test.js +256 -0
- package/build/cjs/usb.test.js.map +1 -0
- package/build/esm/accelerometer-service.js.map +1 -1
- package/build/esm/accelerometer.js.map +1 -1
- package/build/esm/async-util.js.map +1 -1
- package/build/esm/async-util.test.d.ts +1 -0
- package/build/esm/async-util.test.js +18 -0
- package/build/esm/async-util.test.js.map +1 -0
- package/build/esm/availability.js.map +1 -1
- package/build/esm/bluetooth-device-wrapper.d.ts +15 -1
- package/build/esm/bluetooth-device-wrapper.js +88 -19
- package/build/esm/bluetooth-device-wrapper.js.map +1 -1
- package/build/esm/bluetooth-profile.d.ts +8 -0
- package/build/esm/bluetooth-profile.js +6 -0
- package/build/esm/bluetooth-profile.js.map +1 -1
- package/build/esm/bluetooth.d.ts +2 -0
- package/build/esm/bluetooth.js +52 -8
- package/build/esm/bluetooth.js.map +1 -1
- package/build/esm/bluetooth.test.d.ts +1 -0
- package/build/esm/bluetooth.test.js +86 -0
- package/build/esm/bluetooth.test.js.map +1 -0
- package/build/esm/board-id.js.map +1 -1
- package/build/esm/board-serial-info.js.map +1 -1
- package/build/esm/board-serial-info.test.d.ts +1 -0
- package/build/esm/board-serial-info.test.js +46 -0
- package/build/esm/board-serial-info.test.js.map +1 -0
- package/build/esm/button-service.js.map +1 -1
- package/build/esm/buttons.js.map +1 -1
- package/build/esm/constants.js.map +1 -1
- package/build/esm/device-bond-state.d.ts +14 -0
- package/build/esm/device-bond-state.js +22 -0
- package/build/esm/device-bond-state.js.map +1 -0
- package/build/esm/device-information-service.js.map +1 -1
- package/build/esm/device.d.ts +2 -2
- package/build/esm/device.js.map +1 -1
- package/build/esm/dfu-service.js.map +1 -1
- package/build/esm/events.js.map +1 -1
- package/build/esm/events.test.d.ts +1 -0
- package/build/esm/events.test.js +107 -0
- package/build/esm/events.test.js.map +1 -0
- package/build/esm/flashing/flashing-full.js.map +1 -1
- package/build/esm/flashing/flashing-makecode.d.ts +5 -1
- package/build/esm/flashing/flashing-makecode.js +5 -2
- package/build/esm/flashing/flashing-makecode.js.map +1 -1
- package/build/esm/flashing/flashing-makecode.test.d.ts +1 -0
- package/build/esm/flashing/flashing-makecode.test.js +248 -0
- package/build/esm/flashing/flashing-makecode.test.js.map +1 -0
- package/build/esm/flashing/flashing-partial.d.ts +3 -2
- package/build/esm/flashing/flashing-partial.js +111 -65
- package/build/esm/flashing/flashing-partial.js.map +1 -1
- package/build/esm/flashing/flashing-v1.js.map +1 -1
- package/build/esm/flashing/nordic-dfu.js +14 -3
- package/build/esm/flashing/nordic-dfu.js.map +1 -1
- package/build/esm/flashing/zip.js.map +1 -1
- package/build/esm/flashing/zip.test.d.ts +1 -0
- package/build/esm/flashing/zip.test.js +94 -0
- package/build/esm/flashing/zip.test.js.map +1 -0
- package/build/esm/hex-flash-data-source.d.ts +1 -0
- package/build/esm/hex-flash-data-source.js +10 -0
- package/build/esm/hex-flash-data-source.js.map +1 -1
- package/build/esm/index.d.ts +2 -1
- package/build/esm/index.js.map +1 -1
- package/build/esm/led-service.js.map +1 -1
- package/build/esm/led.js.map +1 -1
- package/build/esm/logging.js.map +1 -1
- package/build/esm/magnetometer-service.js.map +1 -1
- package/build/esm/magnetometer.js.map +1 -1
- package/build/esm/partial-flashing-service.js.map +1 -1
- package/build/esm/promise-queue.js.map +1 -1
- package/build/esm/promise-queue.test.d.ts +1 -0
- package/build/esm/promise-queue.test.js +66 -0
- package/build/esm/promise-queue.test.js.map +1 -0
- package/build/esm/serial-events.js.map +1 -1
- package/build/esm/service-events.js.map +1 -1
- package/build/esm/setupTests.js +7 -0
- package/build/esm/setupTests.js.map +1 -1
- package/build/esm/uart-service.js.map +1 -1
- package/build/esm/uart.js.map +1 -1
- package/build/esm/usb-device-wrapper.js.map +1 -1
- package/build/esm/usb-partial-flashing-utils.js.map +1 -1
- package/build/esm/usb-partial-flashing.js +2 -1
- package/build/esm/usb-partial-flashing.js.map +1 -1
- package/build/esm/usb-radio-bridge.js.map +1 -1
- package/build/esm/usb-serial-protocol.js.map +1 -1
- package/build/esm/usb.js.map +1 -1
- package/build/esm/usb.test.d.ts +1 -0
- package/build/esm/usb.test.js +254 -0
- package/build/esm/usb.test.js.map +1 -0
- package/package.json +13 -14
- package/LICENSE.md +0 -21
- package/README.md +0 -125
- package/typedoc.json +0 -14
|
@@ -0,0 +1,253 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
const vitest_1 = require("vitest");
|
|
7
|
+
const fs_1 = require("fs");
|
|
8
|
+
const path_1 = require("path");
|
|
9
|
+
const nrf_intel_hex_1 = __importDefault(require("nrf-intel-hex"));
|
|
10
|
+
const microbit_universal_hex_1 = require("@microbit/microbit-universal-hex");
|
|
11
|
+
const flashing_makecode_js_1 = require("./flashing-makecode.js");
|
|
12
|
+
const hex_flash_data_source_js_1 = require("../hex-flash-data-source.js");
|
|
13
|
+
const hexDir = (0, path_1.resolve)(__dirname, "../../examples");
|
|
14
|
+
const loadHex = (name) => (0, fs_1.readFileSync)((0, path_1.resolve)(hexDir, name), "utf-8");
|
|
15
|
+
/**
|
|
16
|
+
* Load a hex file, separate if universal, and return parsed MemoryMaps
|
|
17
|
+
* keyed by board ID (or 0 for thin hex).
|
|
18
|
+
*/
|
|
19
|
+
const loadParsedHex = (name) => {
|
|
20
|
+
const raw = loadHex(name);
|
|
21
|
+
if ((0, microbit_universal_hex_1.isUniversalHex)(raw)) {
|
|
22
|
+
return (0, microbit_universal_hex_1.separateUniversalHex)(raw).map((p) => ({
|
|
23
|
+
boardId: p.boardId,
|
|
24
|
+
memoryMap: nrf_intel_hex_1.default.fromHex(p.hex),
|
|
25
|
+
}));
|
|
26
|
+
}
|
|
27
|
+
return [
|
|
28
|
+
{ boardId: 0, memoryMap: nrf_intel_hex_1.default.fromHex((0, hex_flash_data_source_js_1.truncateHexAfterEof)(raw)) },
|
|
29
|
+
];
|
|
30
|
+
};
|
|
31
|
+
const fullFlashRegion = (end) => ({
|
|
32
|
+
start: 0,
|
|
33
|
+
end,
|
|
34
|
+
hash: "",
|
|
35
|
+
});
|
|
36
|
+
// All example hex files with expected regions per board
|
|
37
|
+
const hexFiles = [
|
|
38
|
+
{
|
|
39
|
+
// v0 embeds source directly in the flash binary (JSON + LZMA at ~0x315f0)
|
|
40
|
+
// rather than in custom Intel HEX record type 0x0E like later versions.
|
|
41
|
+
name: "microbit-small-heart-makecode-v0.hex",
|
|
42
|
+
label: "MakeCode v0",
|
|
43
|
+
universal: false,
|
|
44
|
+
regions: [
|
|
45
|
+
{
|
|
46
|
+
boardId: 0,
|
|
47
|
+
start: 0x30c00,
|
|
48
|
+
end: 0x3fc40,
|
|
49
|
+
hash: "AB433FFB2EC06262",
|
|
50
|
+
appHash: "653E46119D3A701B",
|
|
51
|
+
},
|
|
52
|
+
],
|
|
53
|
+
},
|
|
54
|
+
{
|
|
55
|
+
name: "microbit-small-heart-makecode-v1.hex",
|
|
56
|
+
label: "MakeCode v1",
|
|
57
|
+
universal: false,
|
|
58
|
+
regions: [
|
|
59
|
+
{
|
|
60
|
+
boardId: 0,
|
|
61
|
+
start: 0x32c00,
|
|
62
|
+
end: 0x3fc40,
|
|
63
|
+
hash: "13FC432659DAE036",
|
|
64
|
+
appHash: "579ACD9774545DAA",
|
|
65
|
+
},
|
|
66
|
+
],
|
|
67
|
+
},
|
|
68
|
+
{
|
|
69
|
+
name: "microbit-small-heart-makecode-v2.hex",
|
|
70
|
+
label: "MakeCode v2",
|
|
71
|
+
universal: false,
|
|
72
|
+
regions: [
|
|
73
|
+
{
|
|
74
|
+
boardId: 0,
|
|
75
|
+
start: 0x34800,
|
|
76
|
+
end: 0x3fc40,
|
|
77
|
+
hash: "02F597B8CE253C03",
|
|
78
|
+
appHash: "AF81BA51A0E7E921",
|
|
79
|
+
},
|
|
80
|
+
],
|
|
81
|
+
},
|
|
82
|
+
{
|
|
83
|
+
name: "microbit-small-heart-makecode-v3.hex",
|
|
84
|
+
label: "MakeCode v3",
|
|
85
|
+
universal: true,
|
|
86
|
+
regions: [
|
|
87
|
+
{
|
|
88
|
+
boardId: 0x9901,
|
|
89
|
+
start: 0x35000,
|
|
90
|
+
end: 0x3fc40,
|
|
91
|
+
hash: "4F4FD28A88324C7E",
|
|
92
|
+
appHash: "C1008100AB00DD00",
|
|
93
|
+
},
|
|
94
|
+
{
|
|
95
|
+
boardId: 0x9903,
|
|
96
|
+
start: 0x45000,
|
|
97
|
+
end: 0x7f340,
|
|
98
|
+
hash: "FFC95E6502F1C747",
|
|
99
|
+
appHash: "DB0013005900BE00",
|
|
100
|
+
},
|
|
101
|
+
],
|
|
102
|
+
},
|
|
103
|
+
{
|
|
104
|
+
name: "microbit-small-heart-makecode-v4.hex",
|
|
105
|
+
label: "MakeCode v4",
|
|
106
|
+
universal: true,
|
|
107
|
+
regions: [
|
|
108
|
+
{
|
|
109
|
+
boardId: 0x9901,
|
|
110
|
+
start: 0x35000,
|
|
111
|
+
end: 0x3fc40,
|
|
112
|
+
hash: "02E34856C566087A",
|
|
113
|
+
appHash: "54005A00F1008000",
|
|
114
|
+
},
|
|
115
|
+
{
|
|
116
|
+
boardId: 0x9903,
|
|
117
|
+
start: 0x47000,
|
|
118
|
+
end: 0x7f340,
|
|
119
|
+
hash: "8E4D117FB81B2B19",
|
|
120
|
+
appHash: "39006F00D900A600",
|
|
121
|
+
},
|
|
122
|
+
],
|
|
123
|
+
},
|
|
124
|
+
{
|
|
125
|
+
name: "microbit-small-heart-makecode-v5.hex",
|
|
126
|
+
label: "MakeCode v5",
|
|
127
|
+
universal: true,
|
|
128
|
+
regions: [
|
|
129
|
+
{
|
|
130
|
+
boardId: 0x9900,
|
|
131
|
+
start: 0x36800,
|
|
132
|
+
end: 0x3fc40,
|
|
133
|
+
hash: "FFDA7A967870CC1B",
|
|
134
|
+
appHash: "E4006A0031002200",
|
|
135
|
+
},
|
|
136
|
+
{
|
|
137
|
+
boardId: 0x9903,
|
|
138
|
+
start: 0x47000,
|
|
139
|
+
end: 0x7f340,
|
|
140
|
+
hash: "3BD7683DA9B220E8",
|
|
141
|
+
appHash: "3E003800AF001600",
|
|
142
|
+
},
|
|
143
|
+
],
|
|
144
|
+
},
|
|
145
|
+
{
|
|
146
|
+
name: "microbit-small-heart-makecode-v6.hex",
|
|
147
|
+
label: "MakeCode v6",
|
|
148
|
+
universal: true,
|
|
149
|
+
regions: [
|
|
150
|
+
{
|
|
151
|
+
boardId: 0x9900,
|
|
152
|
+
start: 0x35400,
|
|
153
|
+
end: 0x3fc40,
|
|
154
|
+
hash: "F4B5733CAAC69708",
|
|
155
|
+
appHash: "78005900AB000900",
|
|
156
|
+
},
|
|
157
|
+
{
|
|
158
|
+
boardId: 0x9903,
|
|
159
|
+
start: 0x47000,
|
|
160
|
+
end: 0x7f340,
|
|
161
|
+
hash: "890F5019E604A158",
|
|
162
|
+
appHash: "E300B400A6003100",
|
|
163
|
+
},
|
|
164
|
+
],
|
|
165
|
+
},
|
|
166
|
+
{
|
|
167
|
+
name: "microbit-small-heart-makecode-v7.hex",
|
|
168
|
+
label: "MakeCode v7",
|
|
169
|
+
universal: true,
|
|
170
|
+
regions: [
|
|
171
|
+
{
|
|
172
|
+
boardId: 0x9900,
|
|
173
|
+
start: 0x35400,
|
|
174
|
+
end: 0x3fc40,
|
|
175
|
+
hash: "F87DD6F924D49825",
|
|
176
|
+
appHash: "2B00EF0092003900",
|
|
177
|
+
},
|
|
178
|
+
{
|
|
179
|
+
boardId: 0x9903,
|
|
180
|
+
start: 0x47000,
|
|
181
|
+
end: 0x7f340,
|
|
182
|
+
hash: "42B6FF95F591DA1F",
|
|
183
|
+
appHash: "9100F3005800E800",
|
|
184
|
+
},
|
|
185
|
+
],
|
|
186
|
+
},
|
|
187
|
+
{
|
|
188
|
+
name: "microbit-small-heart-makecode-v8.hex",
|
|
189
|
+
label: "MakeCode v8",
|
|
190
|
+
universal: true,
|
|
191
|
+
regions: [
|
|
192
|
+
{
|
|
193
|
+
boardId: 0x9900,
|
|
194
|
+
start: 0x35400,
|
|
195
|
+
end: 0x3fc40,
|
|
196
|
+
hash: "8E76592A9CB06B29",
|
|
197
|
+
appHash: "8300A70050005500",
|
|
198
|
+
},
|
|
199
|
+
{
|
|
200
|
+
boardId: 0x9903,
|
|
201
|
+
start: 0x47000,
|
|
202
|
+
end: 0x7f340,
|
|
203
|
+
hash: "22204AC874977E7F",
|
|
204
|
+
appHash: "900022002E00BE00",
|
|
205
|
+
},
|
|
206
|
+
],
|
|
207
|
+
},
|
|
208
|
+
];
|
|
209
|
+
(0, vitest_1.describe)("findMakeCodeRegionInMemoryMap", () => {
|
|
210
|
+
for (const { name, label, universal, regions } of hexFiles) {
|
|
211
|
+
(0, vitest_1.describe)(label, () => {
|
|
212
|
+
const parts = loadParsedHex(name);
|
|
213
|
+
if (!universal) {
|
|
214
|
+
(0, vitest_1.it)("is a non-universal (thin) hex", () => {
|
|
215
|
+
(0, vitest_1.expect)((0, microbit_universal_hex_1.isUniversalHex)(loadHex(name))).toBe(false);
|
|
216
|
+
});
|
|
217
|
+
}
|
|
218
|
+
for (const expected of regions) {
|
|
219
|
+
const part = parts.find((p) => p.boardId === expected.boardId);
|
|
220
|
+
const isV2Board = expected.boardId === 0x9903 || expected.boardId === 0x9904;
|
|
221
|
+
const boardLabel = expected.boardId === 0
|
|
222
|
+
? "thin V1"
|
|
223
|
+
: `boardId=0x${expected.boardId.toString(16)}`;
|
|
224
|
+
const flashEnd = isV2Board ? 0x80000 : 0x40000;
|
|
225
|
+
(0, vitest_1.it)(`finds the MakeCode region (${boardLabel})`, () => {
|
|
226
|
+
(0, vitest_1.expect)(part).toBeDefined();
|
|
227
|
+
const region = (0, flashing_makecode_js_1.findMakeCodeRegionInMemoryMap)(part.memoryMap, fullFlashRegion(flashEnd));
|
|
228
|
+
(0, vitest_1.expect)(region).toEqual({
|
|
229
|
+
start: expected.start,
|
|
230
|
+
end: expected.end,
|
|
231
|
+
hash: expected.hash,
|
|
232
|
+
appHash: expected.appHash,
|
|
233
|
+
});
|
|
234
|
+
});
|
|
235
|
+
}
|
|
236
|
+
});
|
|
237
|
+
}
|
|
238
|
+
(0, vitest_1.describe)("thin hex EOF truncation", () => {
|
|
239
|
+
const thinFiles = hexFiles.filter((f) => !f.universal);
|
|
240
|
+
for (const { name, label } of thinFiles) {
|
|
241
|
+
(0, vitest_1.it)(`${label} raw hex has data after EOF that MemoryMap.fromHex rejects`, () => {
|
|
242
|
+
const raw = loadHex(name);
|
|
243
|
+
(0, vitest_1.expect)(() => nrf_intel_hex_1.default.fromHex(raw)).toThrow(/after.*EOF/i);
|
|
244
|
+
});
|
|
245
|
+
(0, vitest_1.it)(`${label} can be parsed after truncating at EOF`, () => {
|
|
246
|
+
const parts = loadParsedHex(name);
|
|
247
|
+
(0, vitest_1.expect)(parts).toHaveLength(1);
|
|
248
|
+
(0, vitest_1.expect)(parts[0].memoryMap).toBeInstanceOf(nrf_intel_hex_1.default);
|
|
249
|
+
});
|
|
250
|
+
}
|
|
251
|
+
});
|
|
252
|
+
});
|
|
253
|
+
//# sourceMappingURL=flashing-makecode.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"flashing-makecode.test.js","sourceRoot":"","sources":["../../../src/flashing/flashing-makecode.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
import MemoryMap from "nrf-intel-hex";
|
|
2
2
|
import { BluetoothDeviceWrapper } from "../bluetooth-device-wrapper.js";
|
|
3
|
-
import { ProgressCallback } from "../device.js";
|
|
3
|
+
import { BoardVersion, ProgressCallback } from "../device.js";
|
|
4
4
|
export declare enum PartialFlashResult {
|
|
5
5
|
Success = "Success",
|
|
6
|
+
AlreadyUpToDate = "AlreadyUpToDate",
|
|
6
7
|
AttemptFullFlash = "AttemptFullFlash"
|
|
7
8
|
}
|
|
8
|
-
declare const partialFlash: (connection: BluetoothDeviceWrapper, memoryMap: MemoryMap, progress: ProgressCallback) => Promise<PartialFlashResult>;
|
|
9
|
+
declare const partialFlash: (connection: BluetoothDeviceWrapper, boardVersion: BoardVersion, memoryMap: MemoryMap, progress: ProgressCallback) => Promise<PartialFlashResult>;
|
|
9
10
|
export default partialFlash;
|
|
@@ -1,19 +1,50 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.PartialFlashResult = void 0;
|
|
4
|
+
const bluetooth_device_wrapper_js_1 = require("../bluetooth-device-wrapper.js");
|
|
4
5
|
const partial_flashing_service_js_1 = require("../partial-flashing-service.js");
|
|
5
6
|
const flashing_makecode_js_1 = require("./flashing-makecode.js");
|
|
6
7
|
const async_util_js_1 = require("../async-util.js");
|
|
7
8
|
const device_js_1 = require("../device.js");
|
|
9
|
+
const FLASH_PAGE_SIZE = {
|
|
10
|
+
V1: 0x400,
|
|
11
|
+
V2: 0x1000,
|
|
12
|
+
};
|
|
8
13
|
var PartialFlashResult;
|
|
9
14
|
(function (PartialFlashResult) {
|
|
10
15
|
PartialFlashResult["Success"] = "Success";
|
|
16
|
+
PartialFlashResult["AlreadyUpToDate"] = "AlreadyUpToDate";
|
|
11
17
|
PartialFlashResult["AttemptFullFlash"] = "AttemptFullFlash";
|
|
12
18
|
})(PartialFlashResult || (exports.PartialFlashResult = PartialFlashResult = {}));
|
|
13
|
-
const partialFlash = async (connection, memoryMap, progress) => {
|
|
19
|
+
const partialFlash = async (connection, boardVersion, memoryMap, progress) => {
|
|
14
20
|
const pf = new partial_flashing_service_js_1.PartialFlashingService(connection);
|
|
15
|
-
|
|
16
|
-
|
|
21
|
+
let result;
|
|
22
|
+
try {
|
|
23
|
+
// For iOS, starting notifications can throw error if user does not choose
|
|
24
|
+
// "Pair" in the pairing dialog. We cannot rely on connect to catch this
|
|
25
|
+
// because user can forget micro:bit before cancelling the pairing dialog.
|
|
26
|
+
await pf.startNotifications();
|
|
27
|
+
result = await connection.raceDisconnectAndTimeout(partialFlashInternal(connection, pf, boardVersion, memoryMap, progress), { timeout: 30_000, actionName: "partial flash" });
|
|
28
|
+
}
|
|
29
|
+
catch (e) {
|
|
30
|
+
connection.error("Partial flash failed", e);
|
|
31
|
+
if ((0, bluetooth_device_wrapper_js_1.isCharacteristicNotFoundError)(e)) {
|
|
32
|
+
return PartialFlashResult.AttemptFullFlash;
|
|
33
|
+
}
|
|
34
|
+
if (
|
|
35
|
+
// Error thrown in iOS only for when user cancels the pairing dialog.
|
|
36
|
+
e instanceof Error &&
|
|
37
|
+
e.message === "Encryption is insufficient.") {
|
|
38
|
+
connection.setBonded(false);
|
|
39
|
+
}
|
|
40
|
+
if (e instanceof device_js_1.DeviceError) {
|
|
41
|
+
throw e;
|
|
42
|
+
}
|
|
43
|
+
throw new device_js_1.DeviceError({
|
|
44
|
+
code: "flash-partial-failed",
|
|
45
|
+
message: e instanceof Error ? e.message : String(e),
|
|
46
|
+
});
|
|
47
|
+
}
|
|
17
48
|
try {
|
|
18
49
|
await pf.stopNotifications();
|
|
19
50
|
}
|
|
@@ -25,74 +56,89 @@ const partialFlash = async (connection, memoryMap, progress) => {
|
|
|
25
56
|
}
|
|
26
57
|
return result;
|
|
27
58
|
};
|
|
28
|
-
const partialFlashInternal = async (connection, pf, memoryMap, progress) => {
|
|
59
|
+
const partialFlashInternal = async (connection, pf, boardVersion, memoryMap, progress) => {
|
|
29
60
|
connection.log("Partial flash");
|
|
30
61
|
progress(device_js_1.ProgressStage.PartialFlashing);
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
62
|
+
const deviceCodeRegion = await pf.getRegionInfo(partial_flashing_service_js_1.RegionId.MakeCode);
|
|
63
|
+
if (deviceCodeRegion === null) {
|
|
64
|
+
connection.log("Could not read code region");
|
|
65
|
+
return PartialFlashResult.AttemptFullFlash;
|
|
66
|
+
}
|
|
67
|
+
const deviceDalRegion = await pf.getRegionInfo(partial_flashing_service_js_1.RegionId.Dal);
|
|
68
|
+
if (deviceDalRegion === null) {
|
|
69
|
+
connection.log("Could not read DAL region");
|
|
70
|
+
return PartialFlashResult.AttemptFullFlash;
|
|
71
|
+
}
|
|
72
|
+
if (/^0+$/.test(deviceDalRegion.hash) || /^0+$/.test(deviceCodeRegion.hash)) {
|
|
73
|
+
connection.log("Device reported zero hash, skipping partial flash");
|
|
74
|
+
return PartialFlashResult.AttemptFullFlash;
|
|
75
|
+
}
|
|
76
|
+
progress(device_js_1.ProgressStage.PartialFlashing);
|
|
77
|
+
const fileCodeRegion = (0, flashing_makecode_js_1.findMakeCodeRegionInMemoryMap)(memoryMap, deviceCodeRegion);
|
|
78
|
+
if (fileCodeRegion === null) {
|
|
79
|
+
connection.log("No partial flash data");
|
|
80
|
+
return PartialFlashResult.AttemptFullFlash;
|
|
81
|
+
}
|
|
82
|
+
if (fileCodeRegion.hash !== deviceDalRegion.hash) {
|
|
83
|
+
connection.log(`DAL hash comparison failed. Hex: ${fileCodeRegion.hash} vs device: ${deviceDalRegion.hash}`);
|
|
84
|
+
return PartialFlashResult.AttemptFullFlash;
|
|
85
|
+
}
|
|
86
|
+
if (deviceCodeRegion.start !== fileCodeRegion.start) {
|
|
87
|
+
connection.log("Code start address doesn't match");
|
|
88
|
+
return PartialFlashResult.AttemptFullFlash;
|
|
89
|
+
}
|
|
90
|
+
if (fileCodeRegion.appHash === deviceCodeRegion.hash) {
|
|
91
|
+
connection.log("Application hash matches, already up to date");
|
|
92
|
+
await pf.resetToMode(partial_flashing_service_js_1.MicroBitMode.Application);
|
|
93
|
+
return PartialFlashResult.AlreadyUpToDate;
|
|
94
|
+
}
|
|
95
|
+
// The device-side partial flash service erases each flash page when it
|
|
96
|
+
// receives a write at a page-aligned address. After erase, every byte
|
|
97
|
+
// in the page is 0xFF, so writing 0xFF within an already-erased page
|
|
98
|
+
// is redundant. We skip interior 0xFF blocks but always send at page
|
|
99
|
+
// boundaries to trigger the erase.
|
|
100
|
+
//
|
|
101
|
+
// See the page-erase logic:
|
|
102
|
+
// V1: https://github.com/lancaster-university/microbit-dal/blob/master/source/bluetooth/MicroBitPartialFlashingService.cpp
|
|
103
|
+
// V2: https://github.com/lancaster-university/codal-microbit-v2/blob/master/source/bluetooth/MicroBitPartialFlashingService.cpp
|
|
104
|
+
const flashPageSize = FLASH_PAGE_SIZE[boardVersion];
|
|
105
|
+
let nextPacketNumber = 0;
|
|
106
|
+
outer: for (let offset = fileCodeRegion.start; offset < fileCodeRegion.end;) {
|
|
107
|
+
// Skip 64-byte blocks that are entirely 0xFF, unless at a page boundary.
|
|
108
|
+
// At page boundaries we must always send data so the device erases the
|
|
109
|
+
// page (setting all bytes to 0xFF). Interior 0xFF blocks can be skipped
|
|
110
|
+
// because the page has already been erased by the boundary write.
|
|
111
|
+
if (offset % flashPageSize !== 0) {
|
|
112
|
+
if (memoryMap.slicePad(offset, 64).every((b) => b === 0xff)) {
|
|
113
|
+
offset += 64;
|
|
114
|
+
continue;
|
|
115
|
+
}
|
|
55
116
|
}
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
const
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
117
|
+
const batchStartAddress = offset;
|
|
118
|
+
for (let packetInBatch = 0; packetInBatch < 4; ++packetInBatch) {
|
|
119
|
+
const packetNumber = nextPacketNumber++;
|
|
120
|
+
const packetDataOffset = offset + packetInBatch * 16;
|
|
121
|
+
if (packetInBatch < 3) {
|
|
122
|
+
await pf.writeFlash(memoryMap, batchStartAddress, packetDataOffset, packetNumber, packetInBatch);
|
|
123
|
+
}
|
|
124
|
+
else {
|
|
125
|
+
const result = await pf.writeFlashForNotification(memoryMap, batchStartAddress, packetDataOffset, packetNumber, packetInBatch);
|
|
126
|
+
if (result === partial_flashing_service_js_1.PacketState.Retransmit) {
|
|
127
|
+
// Retry the whole 64 bytes.
|
|
128
|
+
connection.log(`Retransmit requested at offset ${offset}`);
|
|
129
|
+
continue outer;
|
|
64
130
|
}
|
|
65
131
|
else {
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
// Retry the whole 64 bytes.
|
|
69
|
-
connection.log(`Retransmit requested at offset ${offset}`);
|
|
70
|
-
continue outer;
|
|
71
|
-
}
|
|
72
|
-
else {
|
|
73
|
-
progress(device_js_1.ProgressStage.PartialFlashing, (offset - fileCodeRegion.start) /
|
|
74
|
-
(fileCodeRegion.end - fileCodeRegion.start));
|
|
75
|
-
}
|
|
132
|
+
progress(device_js_1.ProgressStage.PartialFlashing, (offset - fileCodeRegion.start) /
|
|
133
|
+
(fileCodeRegion.end - fileCodeRegion.start));
|
|
76
134
|
}
|
|
77
135
|
}
|
|
78
|
-
offset += 64;
|
|
79
136
|
}
|
|
80
|
-
|
|
81
|
-
await pf.writeEndOfFlashPacket();
|
|
82
|
-
await (0, async_util_js_1.delay)(100); // allow time for write to complete
|
|
83
|
-
progress(device_js_1.ProgressStage.PartialFlashing, 1);
|
|
84
|
-
return PartialFlashResult.Success;
|
|
85
|
-
}
|
|
86
|
-
catch (e) {
|
|
87
|
-
connection.error("Partial flash failed", e);
|
|
88
|
-
if (e instanceof device_js_1.DeviceError) {
|
|
89
|
-
throw e;
|
|
90
|
-
}
|
|
91
|
-
throw new device_js_1.DeviceError({
|
|
92
|
-
code: "flash-partial-failed",
|
|
93
|
-
message: e instanceof Error ? e.message : String(e),
|
|
94
|
-
});
|
|
137
|
+
offset += 64;
|
|
95
138
|
}
|
|
139
|
+
await pf.writeEndOfFlashPacket();
|
|
140
|
+
progress(device_js_1.ProgressStage.PartialFlashing, 1);
|
|
141
|
+
return PartialFlashResult.Success;
|
|
96
142
|
};
|
|
97
143
|
exports.default = partialFlash;
|
|
98
144
|
//# sourceMappingURL=flashing-partial.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"flashing-partial.js","sourceRoot":"","sources":["../../../
|
|
1
|
+
{"version":3,"file":"flashing-partial.js","sourceRoot":"","sources":["../../../src/flashing/flashing-partial.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"flashing-v1.js","sourceRoot":"","sources":["../../../
|
|
1
|
+
{"version":3,"file":"flashing-v1.js","sourceRoot":"","sources":["../../../src/flashing/flashing-v1.ts"],"names":[],"mappings":";;;AAAA,oEAA8D;AAE9D;;;;;;;;;GASG;AACI,MAAM,2CAA2C,GAAG,KAAK,EAC9D,QAAgB,EAChB,kBAA0B,EAC1B,EAAE;IACF,MAAM,QAAQ,GAAG,MAAM,wBAAS,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;IACvD,MAAM,gBAAgB,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,kBAAkB,CAAC,CAAC;IAC7E,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACtB,wDAAwD;QACxD,MAAM,wBAAS,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;IAC7C,CAAC;AACH,CAAC,CAAC;AAVW,QAAA,2CAA2C,+CAUtD"}
|
|
@@ -98,16 +98,16 @@ async function flashDfu(connection, boardVersion, appBin, progress) {
|
|
|
98
98
|
}
|
|
99
99
|
});
|
|
100
100
|
// Note this doesn't await the whole DFU process, just its initialization
|
|
101
|
+
const isAndroid = core_1.Capacitor.getPlatform() === "android";
|
|
101
102
|
const error = await capacitor_community_nordic_dfu_1.NordicDfu.startDFU({
|
|
102
103
|
deviceName: device.name,
|
|
103
104
|
deviceAddress: device.deviceId,
|
|
104
105
|
filePath,
|
|
105
|
-
dfuOptions:
|
|
106
|
+
dfuOptions: isAndroid
|
|
106
107
|
? {
|
|
107
108
|
...{
|
|
108
109
|
V1: { forceDfu: true },
|
|
109
110
|
V2: {
|
|
110
|
-
unsafeExperimentalButtonlessServiceInSecureDfuEnabled: true,
|
|
111
111
|
disableNotification: true,
|
|
112
112
|
restoreBond: true,
|
|
113
113
|
},
|
|
@@ -116,7 +116,18 @@ async function flashDfu(connection, boardVersion, appBin, progress) {
|
|
|
116
116
|
keepBond: true,
|
|
117
117
|
packetReceiptNotificationsEnabled: true,
|
|
118
118
|
}
|
|
119
|
-
: {
|
|
119
|
+
: {
|
|
120
|
+
// The micro:bit bootloader is built with
|
|
121
|
+
// NRF_DFU_BLE_REQUIRES_BONDS=1, which compiles out the code
|
|
122
|
+
// path that reads a custom advertising name from settings. The
|
|
123
|
+
// bootloader always advertises as "DfuTarg" regardless of any
|
|
124
|
+
// name sent via opcode 0x02. With alternativeAdvertisingNameEnabled
|
|
125
|
+
// left as true (the default), the DFU library scans for the
|
|
126
|
+
// wrong name and times out. With it disabled, the library scans
|
|
127
|
+
// by DFU service UUID instead.
|
|
128
|
+
// Android is unaffected as it reconnects by MAC address.
|
|
129
|
+
alternativeAdvertisingNameEnabled: false,
|
|
130
|
+
},
|
|
120
131
|
});
|
|
121
132
|
if (error) {
|
|
122
133
|
connection.error(`DFU Error: ${error.message}`, error);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nordic-dfu.js","sourceRoot":"","sources":["../../../
|
|
1
|
+
{"version":3,"file":"nordic-dfu.js","sourceRoot":"","sources":["../../../src/flashing/nordic-dfu.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"zip.js","sourceRoot":"","sources":["../../../
|
|
1
|
+
{"version":3,"file":"zip.js","sourceRoot":"","sources":["../../../src/flashing/zip.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|