Merge pull request #997 from pybricks/dlech

dfu firmware flashing

Author: dlech

.yarn/patches/jest-mock-extended-npm-2.0.7-4cdf066556.patch

@@ -0,0 +1,13 @@
+diff --git a/lib/CalledWithFn.js b/lib/CalledWithFn.js
+index 56674799caceb24951e71ab00f20eb53a52c5b6c..1aec49f8c67eb840dba54e937fe49f66a9c13872 100644
+--- a/lib/CalledWithFn.js
++++ b/lib/CalledWithFn.js
+@@ -30,7 +30,7 @@ const calledWithFn = () => {
+             fn.mockImplementation((...args) => checkCalledWith(calledWithStack, args));
+             calledWithStack = [];
+         }
+-        calledWithStack.push({ args, calledWithFn });
++        calledWithStack.unshift({ args, calledWithFn });
+         return calledWithFn;
+     };
+     return fn;

CHANGELOG.md

@@ -6,6 +6,8 @@
 
 ### Added
 - Added better error message when no files to backup ([support#681]).
+- Added multi-step firmware flashing dialog.
+- Added support for flashing firmware via USB DFU.
 
 ### Fixed
 - Fixed deleting files that are not open in the editor.

package.json

@@ -9,10 +9,11 @@
     },
     "dependencies": {
         "@babel/core": "^7.18.9",
-        "@blueprintjs/core": "^4.5.0",
+        "@blueprintjs/core": "^4.6.1",
         "@blueprintjs/popover2": "^1.4.3",
+        "@blueprintjs/select": "^4.5.0",
         "@pmmmwh/react-refresh-webpack-plugin": "^0.5.7",
-        "@pybricks/firmware": "4.17.0",
+        "@pybricks/firmware": "5.0.0",
         "@pybricks/ide-docs": "2.2.0",
         "@pybricks/mpy-cross-v5": "^2.0.0",
         "@pybricks/mpy-cross-v6": "^2.0.0",
@@ -31,6 +32,7 @@
         "@types/react-splitter-layout": "^3.0.2",
         "@types/redux-logger": "^3.0.9",
         "@types/semver": "^7.3.10",
+        "@types/w3c-web-usb": "^1.0.6",
         "@types/web-bluetooth": "^0.0.15",
         "@types/web-locks-api": "^0.0.2",
         "@types/wicg-file-system-access": "^2020.9.5",
@@ -53,6 +55,7 @@
         "dexie": "^3.2.2",
         "dexie-observable": "^4.0.0-beta.13",
         "dexie-react-hooks": "^1.1.1",
+        "dfu": "^0.1.5",
         "dotenv": "^16.0.1",
         "dotenv-expand": "^8.0.3",
         "fake-indexeddb": "^4.0.0",
@@ -110,6 +113,7 @@
         "typed-redux-saga": "^1.5.0",
         "typescript": "~4.7.4",
         "usehooks-ts": "^2.6.0",
+        "user-agent-data-types": "^0.3.0",
         "web-vitals": "^2.1.4",
         "webpack": "^5.73.0",
         "webpack-dev-server": "^4.9.3",
@@ -162,7 +166,8 @@
     "resolutions": {
         "[email protected]": "patch:mq-polyfill@npm:1.1.8#.yarn/patches/mq-polyfill-npm-1.1.8-62fe162439.patch",
         "react-error-overlay": "6.0.9",
-        "react-dev-utils@^12.0.1": "patch:react-dev-utils@npm:12.0.1#.yarn/patches/react-dev-utils-npm-12.0.1-83ba06e3ee.patch"
+        "react-dev-utils@^12.0.1": "patch:react-dev-utils@npm:12.0.1#.yarn/patches/react-dev-utils-npm-12.0.1-83ba06e3ee.patch",
+        "jest-mock-extended@^2.0.7": "patch:jest-mock-extended@npm:2.0.7#.yarn/patches/jest-mock-extended-npm-2.0.7-4cdf066556.patch"
     },
     "jest": {
         "roots": [
@@ -189,7 +194,7 @@
             "^(?!.*\\.(js|jsx|mjs|cjs|ts|tsx|css|json)$)": "<rootDir>/config/jest/fileTransform.mjs"
         },
         "transformIgnorePatterns": [
-            "[/\\\\]node_modules[/\\\\](?!(monaco-editor|react-monaco-editor)[/\\\\]).+\\.(js|jsx|mjs|cjs|ts|tsx)$",
+            "[/\\\\]node_modules[/\\\\](?!(monaco-editor|react-monaco-editor|nanoevents)[/\\\\]).+\\.(js|jsx|mjs|cjs|ts|tsx)$",
             "^.+\\.module\\.(css|sass|scss)$"
         ],
         "modulePaths": [],

src/alerts.ts

@@ -3,13 +3,17 @@
 
 import { IToastProps } from '@blueprintjs/core';
 import alerts from './alerts/alerts';
+import ble from './ble/alerts';
 import explorer from './explorer/alerts';
+import firmware from './firmware/alerts';
 import { CreateToast } from './i18nToaster';
 
 /** This collects alerts from all of the subsystems of the app */
 const alertDomains = {
     alerts,
+    ble,
     explorer,
+    firmware,
 };
 
 /** Gets the type of available alert domains. */

src/alerts/sagas.ts

@@ -34,6 +34,8 @@ function* handleShowAlert(action: ReturnType<typeof alertsShowAlert>): Generator
 
     try {
         const alertAction = yield* take(chan);
+        // the dismiss actions will have called this already, but other actions don't
+        toaster.dismiss(key);
 
         yield* put(alertsDidShowAlert(action.domain, action.specific, alertAction));
     } finally {

src/app/constants.ts

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-// Copyright (c) 2021 The Pybricks Authors
+// Copyright (c) 2021-2022 The Pybricks Authors
 
 // Definitions for compile-time UI settings.
 
@@ -32,6 +32,12 @@ export const pybricksBugReportsUrl = 'https://github.com/pybricks/support/issues
 /** URL for Pybricks community chat on Gitter */
 export const pybricksGitterUrl = 'https://gitter.im/pybricks/community';
 
+export const pybricksBluetoothTroubleshootingUrl =
+    'https://github.com/pybricks/support/discussions/270';
+
+export const pybricksUsbDfuTroubleshootingUrl =
+    'https://github.com/pybricks/support/discussions/688';
+
 /** Pybricks copyright statement. */
 export const pybricksCopyright = 'Copyright (c) 2020-2022 The Pybricks Authors';
 

src/ble-device-info-service/protocol.test.ts

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-// Copyright (c) 2021 The Pybricks Authors
+// Copyright (c) 2021-2022 The Pybricks Authors
 
 import {
     HubType,
@@ -8,7 +8,7 @@ import {
 } from '../ble-lwp3-service/protocol';
 import { decodePnpId, getHubTypeName } from './protocol';
 
-function encodeInfo(id: HubType, variant?: number) {
+export function encodeInfo(id: HubType, variant?: number) {
     return new DataView(
         new Uint8Array([
             1, // Bluetooth SIG

src/ble-device-info-service/protocol.ts

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-// Copyright (c) 2021 The Pybricks Authors
+// Copyright (c) 2021-2022 The Pybricks Authors
 //
 // Pybricks uses the standard Device Info service.
 // Refer to Device Information Service (DIS) at https://www.bluetooth.com/specifications/specs/
@@ -13,7 +13,7 @@ import {
 } from '../ble-lwp3-service/protocol';
 
 /** Device Information service UUID. */
-export const serviceUUID = 0x180a;
+export const deviceInformationServiceUUID = 0x180a;
 
 /** Firmware Revision String characteristic UUID. */
 export const firmwareRevisionStringUUID = 0x2a26;

src/ble-nordic-uart-service/protocol.ts

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-// Copyright (c) 2020 The Pybricks Authors
+// Copyright (c) 2020-2022 The Pybricks Authors
 //
 // Definitions related to the nRF UART Bluetooth low energy GATT service.
 //
@@ -8,16 +8,16 @@
 // https://infocenter.nordicsemi.com/topic/sdk_nrf5_v16.0.0/ble_sdk_app_nus_eval.html
 
 /** nRF UART Service UUID. */
-export const ServiceUUID = '6e400001-b5a3-f393-e0a9-e50e24dcca9e';
+export const nordicUartServiceUUID = '6e400001-b5a3-f393-e0a9-e50e24dcca9e';
 
 /** nRF UART RX Characteristic UUID. Supports Write or Write without response. */
-export const RxCharUUID = '6e400002-b5a3-f393-e0a9-e50e24dcca9e';
+export const nordicUartRxCharUUID = '6e400002-b5a3-f393-e0a9-e50e24dcca9e';
 
 /** nRF UART TX Characteristic UUID. Supports Notifications. */
-export const TxCharUUID = '6e400003-b5a3-f393-e0a9-e50e24dcca9e';
+export const nordicUartTxCharUUID = '6e400003-b5a3-f393-e0a9-e50e24dcca9e';
 
 /**
  * This is the largest data size for the TX characteristic that is safe to use
  * when the negotiated MTU is unknown.
  */
-export const SafeTxCharLength = 20;
+export const nordicUartSafeTxCharLength = 20;

src/ble-pybricks-service/protocol.ts

@@ -1,14 +1,14 @@
 // SPDX-License-Identifier: MIT
-// Copyright (c) 2020-2021 The Pybricks Authors
+// Copyright (c) 2020-2022 The Pybricks Authors
 //
 // Definitions related to the Pybricks Bluetooth low energy GATT service.
 
 import { assert } from '../utils';
 
 /** Pybricks service UUID. */
-export const ServiceUUID = 'c5f50001-8280-46da-89f4-6d8051e4aeef';
+export const pybricksServiceUUID = 'c5f50001-8280-46da-89f4-6d8051e4aeef';
 /** Pybricks control characteristic UUID. */
-export const ControlCharacteristicUUID = 'c5f50002-8280-46da-89f4-6d8051e4aeef';
+export const pybricksControlCharacteristicUUID = 'c5f50002-8280-46da-89f4-6d8051e4aeef';
 
 /** Commands are instructions sent to the hub. */
 export enum CommandType {