diff --git a/Changelog.md b/Changelog.md index e9f2b9f..c29482b 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,3 +1,9 @@ +## 2.4.1 - UNRELEASED + +### Added + +- Support for Apple silicon. + ## 2.4.0 - 2024-04-09 ### Changed diff --git a/package-lock.json b/package-lock.json index e746a73..1e76587 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,15 +1,15 @@ { "name": "pc-nrfconnect-dtm", - "version": "2.4.0", + "version": "2.4.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "pc-nrfconnect-dtm", - "version": "2.4.0", + "version": "2.4.1", "license": "SEE LICENSE IN LICENSE", "devDependencies": { - "@nordicsemiconductor/pc-nrfconnect-shared": "^170.0.0", + "@nordicsemiconductor/pc-nrfconnect-shared": "^176.0.0", "@testing-library/user-event": "^13.1.9", "chart.js": "^4.0.1", "chartjs-plugin-datalabels": "2.2.0", @@ -17,7 +17,7 @@ "react-chartjs-2": "^5.0.1" }, "engines": { - "nrfconnect": ">=4.4.1" + "nrfconnect": ">=5.0.0" } }, "node_modules/@aashutoshrathi/word-wrap": { @@ -2873,13 +2873,13 @@ } }, "node_modules/@nordicsemiconductor/pc-nrfconnect-shared": { - "version": "170.0.0", - "resolved": "https://registry.npmjs.org/@nordicsemiconductor/pc-nrfconnect-shared/-/pc-nrfconnect-shared-170.0.0.tgz", - "integrity": "sha512-mZMPYpJRkqjwb74ueA2cHsR8HZVRboXeIvqfL8aScBUKRyC1aMEeV8JPCwxRVvM4FArWKUz9WOgWxuJtGNUUTA==", + "version": "176.0.0", + "resolved": "https://registry.npmjs.org/@nordicsemiconductor/pc-nrfconnect-shared/-/pc-nrfconnect-shared-176.0.0.tgz", + "integrity": "sha512-stdE9Y4UvVfCKvO+WvlXjgIUSnWULJJ1D5xZ6eio3nRWxRR8dnj1SEIvL2h107+kK817FQOfIxzt0NoY4c0gew==", "dev": true, "hasInstallScript": true, "dependencies": { - "@electron/remote": "^2.1.1", + "@electron/remote": "^2.1.2", "@mdi/font": "7.2.96", "@mdi/js": "^7.2.96", "@mdi/react": "^1.6.1", @@ -2912,7 +2912,7 @@ "bootstrap": "4.6.2", "commander": "10.0.0", "date-fns": "2.29.3", - "electron": "^28.1.4", + "electron": "^30.0.2", "electron-store": "8.1.0", "esbuild": "0.19.2", "esbuild-sass-plugin": "2.13.0", @@ -4453,10 +4453,13 @@ "dev": true }, "node_modules/@types/node": { - "version": "20.8.2", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.8.2.tgz", - "integrity": "sha512-Vvycsc9FQdwhxE3y3DzeIxuEJbWGDsnrxvMADzTDF/lcdR9/K+AQIeAghTQsHtotg/q0j3WEOYS/jQgSdWue3w==", - "dev": true + "version": "20.12.12", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.12.12.tgz", + "integrity": "sha512-eWLDGF/FOSPtAvEqeRAQ4C8LSA7M1I7i0ky1I8U7kD1J5ITyW3AsRhQrKVoWf5pFKZ2kILsEGJhsI9r93PYnOw==", + "dev": true, + "dependencies": { + "undici-types": "~5.26.4" + } }, "node_modules/@types/normalize-package-data": { "version": "2.4.2", @@ -6982,14 +6985,14 @@ "dev": true }, "node_modules/electron": { - "version": "28.2.2", - "resolved": "https://registry.npmjs.org/electron/-/electron-28.2.2.tgz", - "integrity": "sha512-8UcvIGFcjplHdjPFNAHVFg5bS0atDyT3Zx21WwuE4iLfxcAMsyMEOgrQX3im5LibA8srwsUZs7Cx0JAUfcQRpw==", + "version": "30.0.4", + "resolved": "https://registry.npmjs.org/electron/-/electron-30.0.4.tgz", + "integrity": "sha512-z8tGQeiVM6CHj0t8PKWVhAB4FZTRNN0vSrd1jA4edX1aOjBztddk4d0Gyw91pQb4arIVf2RGPu0hYbHG2+vDcA==", "dev": true, "hasInstallScript": true, "dependencies": { "@electron/get": "^2.0.0", - "@types/node": "^18.11.18", + "@types/node": "^20.9.0", "extract-zip": "^2.0.1" }, "bin": { @@ -7018,15 +7021,6 @@ "integrity": "sha512-aoCqgU6r9+o9/S7wkcSbmPRFi7OWZWiXS9rtjEd+Ouyu/Xyw5RSq2XN8s5Qp8IaFOLiRrhQCphCIjAxgG3eCAg==", "dev": true }, - "node_modules/electron/node_modules/@types/node": { - "version": "18.19.15", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.15.tgz", - "integrity": "sha512-AMZ2UWx+woHNfM11PyAEQmfSxi05jm9OlkxczuHeEqmvwPkYj6MWv44gbzDPefYOLysTOFyI3ziiy2ONmUZfpA==", - "dev": true, - "dependencies": { - "undici-types": "~5.26.4" - } - }, "node_modules/emitter-listener": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/emitter-listener/-/emitter-listener-1.1.2.tgz", diff --git a/package.json b/package.json index 511c031..a3e2a22 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pc-nrfconnect-dtm", - "version": "2.4.0", + "version": "2.4.1", "displayName": "Direct Test Mode", "description": "RF PHY testing of Bluetooth Low Energy devices", "homepage": "https://github.com/NordicSemiconductor/pc-nrfconnect-dtm", @@ -11,7 +11,7 @@ "author": "Nordic Semiconductor ASA", "license": "SEE LICENSE IN LICENSE", "engines": { - "nrfconnect": ">=4.4.1" + "nrfconnect": ">=5.0.0" }, "nrfConnectForDesktop": { "nrfutil": { @@ -45,7 +45,7 @@ "prepare": "husky install" }, "devDependencies": { - "@nordicsemiconductor/pc-nrfconnect-shared": "^170.0.0", + "@nordicsemiconductor/pc-nrfconnect-shared": "^176.0.0", "@testing-library/user-event": "^13.1.9", "chart.js": "^4.0.1", "chartjs-plugin-datalabels": "2.2.0", diff --git a/src/index.tsx b/src/index.tsx index 21ccf24..eb5b570 100644 --- a/src/index.tsx +++ b/src/index.tsx @@ -16,6 +16,7 @@ import Receiver from './Receiver'; import appReducer from './reducers'; import SidePanel from './SidePanel'; import Transmitter from './Transmitter'; +import { Panes } from './utils/panes'; import './index.scss'; @@ -28,10 +29,13 @@ render( sidePanel={} panes={[ { - name: 'Transmitter', + name: Panes.TRANSMITTER, Main: Transmitter, }, - { name: 'Receiver', Main: Receiver }, + { + name: Panes.RECEIVER, + Main: Receiver, + }, ]} /> ); diff --git a/src/utils/panes.ts b/src/utils/panes.ts index 71da1d3..b708df0 100644 --- a/src/utils/panes.ts +++ b/src/utils/panes.ts @@ -8,11 +8,14 @@ import { currentPane } from '@nordicsemiconductor/pc-nrfconnect-shared'; import { RootState } from '../reducers/types'; -export const TRANSMITTER = 0; -export const RECEIVER = 1; +// todo: sync with Mode type from 'src/reducers/types.ts' +export enum Panes { + TRANSMITTER = 'Transmitter', + RECEIVER = 'Receiver', +} export const isTransmitterPane = (state: RootState) => - currentPane(state) === TRANSMITTER; + currentPane(state) === Panes.TRANSMITTER; export const paneName = (state: RootState) => isTransmitterPane(state) ? 'transmitter' : 'receiver';