@nordicsemiconductor/pc-nrfconnect-shared 223.0.0 → 224.0.0
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/Changelog.md +65 -55
- package/ipc/launcherConfig.ts +0 -2
- package/nrfutil/device/logLibVersions.ts +5 -5
- package/nrfutil/sandbox.ts +1 -1
- package/nrfutil/version/jlinkVersion.test.ts +13 -13
- package/nrfutil/version/jlinkVersion.ts +5 -5
- package/package.json +2 -2
- package/release_notes.md +6 -4
- package/src/Device/deviceLister.ts +1 -1
- package/src/FactoryReset/FactoryResetButton.tsx +3 -1
- package/src/utils/systemReport.ts +1 -1
- package/typings/generated/ipc/launcherConfig.d.ts +0 -2
- package/typings/generated/ipc/launcherConfig.d.ts.map +1 -1
- package/typings/generated/nrfutil/version/jlinkVersion.d.ts +4 -4
- package/typings/generated/src/FactoryReset/FactoryResetButton.d.ts.map +1 -1
package/Changelog.md
CHANGED
|
@@ -7,6 +7,16 @@ This project does _not_ adhere to
|
|
|
7
7
|
[Semantic Versioning](https://semver.org/spec/v2.0.0.html) but contrary to it
|
|
8
8
|
every new version is a new major version.
|
|
9
9
|
|
|
10
|
+
## 224.0.0 - 2025-08-27
|
|
11
|
+
|
|
12
|
+
### Fixed
|
|
13
|
+
|
|
14
|
+
- Apps did not reload after restoring the default settings.
|
|
15
|
+
|
|
16
|
+
### Removed
|
|
17
|
+
|
|
18
|
+
- Removed the `isSkipUpdate*` properties from the launcher config.
|
|
19
|
+
|
|
10
20
|
## 223.0.0 - 2025-07-28
|
|
11
21
|
|
|
12
22
|
### Changed
|
|
@@ -109,7 +119,7 @@ every new version is a new major version.
|
|
|
109
119
|
|
|
110
120
|
### Added
|
|
111
121
|
|
|
112
|
-
- Specify what core version of
|
|
122
|
+
- Specify what core version of nRF Util an app depends on.
|
|
113
123
|
|
|
114
124
|
### Removed
|
|
115
125
|
|
|
@@ -122,7 +132,7 @@ every new version is a new major version.
|
|
|
122
132
|
### Steps to upgrade when using this package
|
|
123
133
|
|
|
124
134
|
- In apps in `package.json` set the field `nrfConnectForDesktop.nrfutilCore`
|
|
125
|
-
to the core version of
|
|
135
|
+
to the core version of nRF Util that the nRF Util commands will use.
|
|
126
136
|
- Replace usage of `prepareSandbox` with `NrfutilSandbox.create`
|
|
127
137
|
- Update calls of `xRead`.
|
|
128
138
|
|
|
@@ -141,18 +151,18 @@ every new version is a new major version.
|
|
|
141
151
|
- Scrollbars no longer appear in the device list for a second when
|
|
142
152
|
disconnecting a device.
|
|
143
153
|
- `Dropdown` active label now handles overflow.
|
|
144
|
-
-
|
|
154
|
+
- nRF Util device batch will not run if no subcommand has been added to the
|
|
145
155
|
batch.
|
|
146
156
|
|
|
147
157
|
### Steps to upgrade when using this package
|
|
148
158
|
|
|
149
|
-
- Minimum version of nrfutil
|
|
159
|
+
- Minimum version of `nrfutil device` is 2.7.16.
|
|
150
160
|
|
|
151
161
|
## 209.0.0 - 2025-04-30
|
|
152
162
|
|
|
153
163
|
### Changed
|
|
154
164
|
|
|
155
|
-
-
|
|
165
|
+
- `nrfutil device` use of `fw-read` is replaced with `x-read`.
|
|
156
166
|
|
|
157
167
|
### Steps to upgrade when using this package
|
|
158
168
|
|
|
@@ -209,11 +219,11 @@ every new version is a new major version.
|
|
|
209
219
|
|
|
210
220
|
### Added
|
|
211
221
|
|
|
212
|
-
- `nrf-probe` verison check for nrfutil device
|
|
222
|
+
- `nrf-probe` verison check for `nrfutil device`.
|
|
213
223
|
|
|
214
224
|
### Removed
|
|
215
225
|
|
|
216
|
-
- `nrfjprog` verison check for nrfutil device
|
|
226
|
+
- `nrfjprog` verison check for `nrfutil device`.
|
|
217
227
|
|
|
218
228
|
### Changed
|
|
219
229
|
|
|
@@ -306,7 +316,7 @@ Overrides v202 as it was released a prerelease.
|
|
|
306
316
|
|
|
307
317
|
### Fixed
|
|
308
318
|
|
|
309
|
-
-
|
|
319
|
+
- nRF Util: mcu-state-set caused an error if no target was specified.
|
|
310
320
|
|
|
311
321
|
## 193.0.0 - 2024-12-04
|
|
312
322
|
|
|
@@ -329,9 +339,9 @@ Overrides v202 as it was released a prerelease.
|
|
|
329
339
|
|
|
330
340
|
### Changed
|
|
331
341
|
|
|
332
|
-
-
|
|
333
|
-
-
|
|
334
|
-
reflecting the behaviour since `nrfutil
|
|
342
|
+
- nRF Util: The core gets upgraded before installing a command.
|
|
343
|
+
- nRF Util: The `version` properties of dependencies are now optional,
|
|
344
|
+
reflecting the behaviour since `nrfutil device` v2.7.0.
|
|
335
345
|
- Warning for J-Link versions: Only inform (not warn) if the installed version
|
|
336
346
|
is newer than the tested version. Updated the text for all cases.
|
|
337
347
|
|
|
@@ -351,11 +361,11 @@ Overrides v202 as it was released a prerelease.
|
|
|
351
361
|
|
|
352
362
|
- Dropdown helper functions which are used in `pc-nrfconnect-serial-terminal`
|
|
353
363
|
and `pc-nrfconnect-programmer`.
|
|
354
|
-
- Add
|
|
364
|
+
- Add nRF Util `mcu-state-options` for multi target support.
|
|
355
365
|
|
|
356
366
|
### Steps to upgrade when using this package
|
|
357
367
|
|
|
358
|
-
- Minimum support version of nrfutil device is now 2.5.0
|
|
368
|
+
- Minimum support version of `nrfutil device` is now 2.5.0.
|
|
359
369
|
|
|
360
370
|
## 188.0.0 - 2024-10-15
|
|
361
371
|
|
|
@@ -397,7 +407,7 @@ Overrides v202 as it was released a prerelease.
|
|
|
397
407
|
|
|
398
408
|
### Fixed
|
|
399
409
|
|
|
400
|
-
- Stop
|
|
410
|
+
- Stop nRF Util sandbox from starting to run an aborted command.
|
|
401
411
|
- Device setup event call order when autoreconnecting at the same time as
|
|
402
412
|
selecting.
|
|
403
413
|
|
|
@@ -438,13 +448,13 @@ Overrides v202 as it was released a prerelease.
|
|
|
438
448
|
|
|
439
449
|
### Changed
|
|
440
450
|
|
|
441
|
-
-
|
|
451
|
+
- nRF Util sandbox deletes any residual sandbox folder before install.
|
|
442
452
|
|
|
443
453
|
## 180.0.0 - 2024-07-01
|
|
444
454
|
|
|
445
455
|
### Changed
|
|
446
456
|
|
|
447
|
-
-
|
|
457
|
+
- nRF Util sandbox folder is deleted if installation fails.
|
|
448
458
|
|
|
449
459
|
## 179.0.0 - 2024-06-20
|
|
450
460
|
|
|
@@ -478,7 +488,7 @@ Overrides v202 as it was released a prerelease.
|
|
|
478
488
|
|
|
479
489
|
### Fixed
|
|
480
490
|
|
|
481
|
-
-
|
|
491
|
+
- nRF Util Sandbox s installed on Apple Silicon now uses the arm64 folder and
|
|
482
492
|
not the intel one.
|
|
483
493
|
|
|
484
494
|
## 175.0.0 - 2024-05-02
|
|
@@ -514,7 +524,7 @@ Overrides v202 as it was released a prerelease.
|
|
|
514
524
|
|
|
515
525
|
### Added
|
|
516
526
|
|
|
517
|
-
- Support for splitting M1 and x64
|
|
527
|
+
- Support for splitting M1 and x64 nRF Util sandboxes.
|
|
518
528
|
|
|
519
529
|
## 172.0.0 - 2024-04-15
|
|
520
530
|
|
|
@@ -602,7 +612,7 @@ Overrides v202 as it was released a prerelease.
|
|
|
602
612
|
|
|
603
613
|
### Added
|
|
604
614
|
|
|
605
|
-
- Auto update
|
|
615
|
+
- Auto update nRF Util core for sandboxes
|
|
606
616
|
|
|
607
617
|
## 164.0.0 - 2024-03-05
|
|
608
618
|
|
|
@@ -693,11 +703,11 @@ Overrides v202 as it was released a prerelease.
|
|
|
693
703
|
### Changed
|
|
694
704
|
|
|
695
705
|
- `getReadbackProtection` now returns protection type `ProtectionStatus` from
|
|
696
|
-
nrfutil device common.ts
|
|
706
|
+
`nrfutil device` common.ts
|
|
697
707
|
|
|
698
708
|
### Steps to upgrade when using this package
|
|
699
709
|
|
|
700
|
-
- Minimum support version of nrfutil device is now 2.1.1
|
|
710
|
+
- Minimum support version of `nrfutil device` is now 2.1.1.
|
|
701
711
|
|
|
702
712
|
## 157.0.0 - 2024-02-06
|
|
703
713
|
|
|
@@ -778,9 +788,9 @@ Overrides v202 as it was released a prerelease.
|
|
|
778
788
|
### Fixed
|
|
779
789
|
|
|
780
790
|
- `Overlay` tooltips weren't centered due to incorrect sizing styles.
|
|
781
|
-
- When spawning the
|
|
791
|
+
- When spawning the nRF Util process fails in certain ways, an uncaught
|
|
782
792
|
exception in the main process got thrown. The “certain ways” make this a bit
|
|
783
|
-
hard to reproduce: On macOS this happened, when the
|
|
793
|
+
hard to reproduce: On macOS this happened, when the nRF Util executable did
|
|
784
794
|
not have the executable file mode. Usually this should not happen, because
|
|
785
795
|
we set that mode ourselves correctly.
|
|
786
796
|
|
|
@@ -804,10 +814,10 @@ Overrides v202 as it was released a prerelease.
|
|
|
804
814
|
### Added
|
|
805
815
|
|
|
806
816
|
- `getModule` export from `@nordicsemiconductor/pc-nrfconnect-shared/nrfutil`
|
|
807
|
-
to retrieve/initialise specific
|
|
817
|
+
to retrieve/initialise specific nRF Util module sandbox.
|
|
808
818
|
- `setVerboseLogging`, `setLogLevel` and `getAllModuleVersions` exports from
|
|
809
819
|
`@nordicsemiconductor/pc-nrfconnect-shared/nrfutil` to target all
|
|
810
|
-
initialised
|
|
820
|
+
initialised nRF Util modules.
|
|
811
821
|
|
|
812
822
|
### Changed
|
|
813
823
|
|
|
@@ -816,14 +826,14 @@ Overrides v202 as it was released a prerelease.
|
|
|
816
826
|
(previously this was only used to determine whether an app should have
|
|
817
827
|
verbose logging enabled on startup). This allows code which does/should not
|
|
818
828
|
have access to the redux store to still retrieve the verbose logging state.
|
|
819
|
-
- `Create system report` now logs the version of all initialised
|
|
829
|
+
- `Create system report` now logs the version of all initialised nRF Util
|
|
820
830
|
modules.
|
|
821
|
-
- nrfutil device exports have now been moved to
|
|
831
|
+
- `nrfutil device` exports have now been moved to
|
|
822
832
|
`@nordicsemiconductor/pc-nrfconnect-shared/nrfutil/device`.
|
|
823
833
|
|
|
824
834
|
### Steps to upgrade
|
|
825
835
|
|
|
826
|
-
- Replace all calls of nrfutil device imported from
|
|
836
|
+
- Replace all calls of `nrfutil device` imported from
|
|
827
837
|
`@nordicsemiconductor/pc-nrfconnect-shared/nrfutil` to
|
|
828
838
|
`@nordicsemiconductor/pc-nrfconnect-shared/nrfutil/device`.
|
|
829
839
|
|
|
@@ -903,7 +913,7 @@ Overrides v202 as it was released a prerelease.
|
|
|
903
913
|
### Added
|
|
904
914
|
|
|
905
915
|
- Added command wrappers to interact with the Board Controller using
|
|
906
|
-
`nrfutil
|
|
916
|
+
`nrfutil device`. `boardController()` to write board controller config to
|
|
907
917
|
the DK. `getBoardControllerVersion()` to get the version information from
|
|
908
918
|
the Board Controller. (like firmware version and board hardware revision)
|
|
909
919
|
|
|
@@ -915,7 +925,7 @@ Overrides v202 as it was released a prerelease.
|
|
|
915
925
|
|
|
916
926
|
### Fixed
|
|
917
927
|
|
|
918
|
-
-
|
|
928
|
+
- nRF Util sandbox `execCommand` did not escape executable path leading to
|
|
919
929
|
failure when path has whitespace
|
|
920
930
|
|
|
921
931
|
## 137.0.0 - 2023-12-04
|
|
@@ -939,7 +949,7 @@ Overrides v202 as it was released a prerelease.
|
|
|
939
949
|
dependency of a useEffect
|
|
940
950
|
- `useStopWatch` start optional time param no longer default to the last time
|
|
941
951
|
when paused but 0.
|
|
942
|
-
- `nrfutil device
|
|
952
|
+
- `nrfutil device device-info` returns undefined if reading info throws
|
|
943
953
|
|
|
944
954
|
### Steps to upgrade when using this package
|
|
945
955
|
|
|
@@ -980,7 +990,7 @@ Overrides v202 as it was released a prerelease.
|
|
|
980
990
|
|
|
981
991
|
### Changed
|
|
982
992
|
|
|
983
|
-
-
|
|
993
|
+
- nRF Util `sandbox` default logging level to 'off' in production and 'error'
|
|
984
994
|
in development environments
|
|
985
995
|
|
|
986
996
|
## 132.0.0 - 2023-11-14
|
|
@@ -1012,7 +1022,7 @@ Overrides v202 as it was released a prerelease.
|
|
|
1012
1022
|
### Fixed
|
|
1013
1023
|
|
|
1014
1024
|
- Ensure that all enumerated devices are always processed in order to avoid:
|
|
1015
|
-
- calling nrfutil device-info multiple times for the same device
|
|
1025
|
+
- calling `nrfutil device-info` multiple times for the same device
|
|
1016
1026
|
- only calling onSuccess once when waiting for device when rebooting
|
|
1017
1027
|
- `nrfutil device` now calls `device-info` before notifying the app with an
|
|
1018
1028
|
onSelectedDevice. This is to ensure the operations to the device are
|
|
@@ -1022,17 +1032,17 @@ Overrides v202 as it was released a prerelease.
|
|
|
1022
1032
|
|
|
1023
1033
|
### Added
|
|
1024
1034
|
|
|
1025
|
-
-
|
|
1026
|
-
|
|
1027
|
-
-
|
|
1035
|
+
- nRF Util sandbox now allows caller to pass optional lambda to manipulate the
|
|
1036
|
+
env values
|
|
1037
|
+
- nRF Util provides an alternative to spawn and just exec
|
|
1028
1038
|
- `nrfutil device` auto logs version information when it is initialed for the
|
|
1029
1039
|
first time.
|
|
1030
1040
|
|
|
1031
1041
|
### Changed
|
|
1032
1042
|
|
|
1033
|
-
- `ErrorBoundary` only collect device lib info if these app adds
|
|
1034
|
-
device as a dependency in `package.json`
|
|
1035
|
-
- `App` no longer logs nrfutil device version.
|
|
1043
|
+
- `ErrorBoundary` only collect device lib info if these app adds
|
|
1044
|
+
`nrfutil device` as a dependency in `package.json`
|
|
1045
|
+
- `App` no longer logs `nrfutil device` version.
|
|
1036
1046
|
|
|
1037
1047
|
## 128.0.0 - 2023-11-08
|
|
1038
1048
|
|
|
@@ -1206,7 +1216,7 @@ render(<App panes={[]} />);
|
|
|
1206
1216
|
|
|
1207
1217
|
### Fixed
|
|
1208
1218
|
|
|
1209
|
-
-
|
|
1219
|
+
- nRF Util's abort log messages is now more descriptive
|
|
1210
1220
|
- `nrfutil device batch` could previously call the `onException` when task was
|
|
1211
1221
|
complete.
|
|
1212
1222
|
|
|
@@ -1278,7 +1288,7 @@ declare module '!!@svgr!*.svg' {
|
|
|
1278
1288
|
|
|
1279
1289
|
### Changed
|
|
1280
1290
|
|
|
1281
|
-
- Improve
|
|
1291
|
+
- Improve nRF Util sandbox error messages.
|
|
1282
1292
|
|
|
1283
1293
|
### Added
|
|
1284
1294
|
|
|
@@ -1307,7 +1317,7 @@ declare module '!!@svgr!*.svg' {
|
|
|
1307
1317
|
|
|
1308
1318
|
### Added
|
|
1309
1319
|
|
|
1310
|
-
- Log warning for any
|
|
1320
|
+
- Log warning for any device that was not enumerated with `nrfutil device`.
|
|
1311
1321
|
|
|
1312
1322
|
### Fixed
|
|
1313
1323
|
|
|
@@ -1317,8 +1327,8 @@ declare module '!!@svgr!*.svg' {
|
|
|
1317
1327
|
|
|
1318
1328
|
### Changed
|
|
1319
1329
|
|
|
1320
|
-
- `
|
|
1321
|
-
nrfutil device 1.4.2
|
|
1330
|
+
- `nrfutil device` batch now generate batch JSON using the CLI. Requires
|
|
1331
|
+
`nrfutil device` 1.4.2
|
|
1322
1332
|
|
|
1323
1333
|
### Fixed
|
|
1324
1334
|
|
|
@@ -1361,25 +1371,25 @@ declare module '!!@svgr!*.svg' {
|
|
|
1361
1371
|
|
|
1362
1372
|
### Fixed
|
|
1363
1373
|
|
|
1364
|
-
- Unable to use nrfutil device in production due to issue with
|
|
1365
|
-
logging when set to off.
|
|
1374
|
+
- Unable to use `nrfutil device` in production due to issue with
|
|
1375
|
+
`nrfutil device` logging when set to off.
|
|
1366
1376
|
|
|
1367
1377
|
## 99.0.0 - 2023-09-04
|
|
1368
1378
|
|
|
1369
1379
|
### Added
|
|
1370
1380
|
|
|
1371
|
-
- nrfutil device list now supports optional timeout parameter
|
|
1381
|
+
- `nrfutil device list` now supports optional timeout parameter
|
|
1372
1382
|
|
|
1373
1383
|
### Changed
|
|
1374
1384
|
|
|
1375
|
-
-
|
|
1385
|
+
- `nrfutil device list` now default to 3000ms timeout when enumerating (was
|
|
1376
1386
|
1000ms)
|
|
1377
|
-
-
|
|
1378
|
-
-
|
|
1387
|
+
- `nrfutil device` now support `nrfutil device` 1.4.x only
|
|
1388
|
+
- `nrfutil device` will not log in production unless verbose logging is on
|
|
1379
1389
|
|
|
1380
1390
|
### Fixed
|
|
1381
1391
|
|
|
1382
|
-
-
|
|
1392
|
+
- `nrfutil device` std error message string
|
|
1383
1393
|
- When SDFU MCU State change fails, wait for device is now canceled
|
|
1384
1394
|
|
|
1385
1395
|
### Removed
|
|
@@ -1454,19 +1464,19 @@ declare module '!!@svgr!*.svg' {
|
|
|
1454
1464
|
|
|
1455
1465
|
### Added
|
|
1456
1466
|
|
|
1457
|
-
-
|
|
1467
|
+
- nRF Util progress now has a new property `totalProgressPercentage` that
|
|
1458
1468
|
computes the progress across all steps
|
|
1459
1469
|
|
|
1460
1470
|
### Changed
|
|
1461
1471
|
|
|
1462
|
-
-
|
|
1472
|
+
- nRF Util progress properties `step` and `amountOfSteps` are now always
|
|
1463
1473
|
present
|
|
1464
|
-
-
|
|
1474
|
+
- nRF Util progress properties `progressPercentage` has been renamed to
|
|
1465
1475
|
`stepProgressPercentage`
|
|
1466
1476
|
|
|
1467
1477
|
### Steps to upgrade
|
|
1468
1478
|
|
|
1469
|
-
- Any usage of
|
|
1479
|
+
- Any usage of nRF Util property `progressPercentage` need to be renamed to
|
|
1470
1480
|
`stepProgressPercentage`
|
|
1471
1481
|
|
|
1472
1482
|
## 92.0.0 - 2023-08-24
|
package/ipc/launcherConfig.ts
CHANGED
|
@@ -35,29 +35,29 @@ export default (moduleVersion: ModuleVersion) => {
|
|
|
35
35
|
try {
|
|
36
36
|
const dependencies = moduleVersion.dependencies;
|
|
37
37
|
|
|
38
|
-
log('nrfutil
|
|
38
|
+
log('nrfutil device', moduleVersion.version);
|
|
39
39
|
log('nrf-device-lib', findDependency('nrfdl', dependencies));
|
|
40
40
|
log('nrf-probe', findDependency('nrf-probe', dependencies));
|
|
41
|
-
log('
|
|
41
|
+
log('SEGGER J-Link', findDependency('JlinkARM', dependencies));
|
|
42
42
|
|
|
43
43
|
const jlinkCompatibility = getJlinkCompatibility(moduleVersion);
|
|
44
44
|
|
|
45
45
|
switch (jlinkCompatibility.kind) {
|
|
46
|
-
case 'No J-Link installed':
|
|
46
|
+
case 'No SEGGER J-Link installed':
|
|
47
47
|
logger?.warn(
|
|
48
48
|
`SEGGER J-Link is not installed. ` +
|
|
49
49
|
`Install at least version ${jlinkCompatibility.requiredJlink} ` +
|
|
50
50
|
`from https://www.segger.com/downloads/jlink`
|
|
51
51
|
);
|
|
52
52
|
break;
|
|
53
|
-
case 'Outdated J-Link':
|
|
53
|
+
case 'Outdated SEGGER J-Link':
|
|
54
54
|
logger?.warn(
|
|
55
55
|
`Outdated SEGGER J-Link. Your version of SEGGER J-Link (${jlinkCompatibility.actualJlink}) ` +
|
|
56
56
|
`is older than the one this app was tested with (${jlinkCompatibility.requiredJlink}). ` +
|
|
57
57
|
`Install the newer version from https://www.segger.com/downloads/jlink`
|
|
58
58
|
);
|
|
59
59
|
break;
|
|
60
|
-
case 'Newer J-Link is used':
|
|
60
|
+
case 'Newer SEGGER J-Link is used':
|
|
61
61
|
logger?.info(
|
|
62
62
|
`Your version of SEGGER J-Link (${jlinkCompatibility.actualJlink}) ` +
|
|
63
63
|
`is newer than the one this app was tested with (${jlinkCompatibility.requiredJlink}). ` +
|
package/nrfutil/sandbox.ts
CHANGED
|
@@ -190,7 +190,7 @@ export class NrfutilSandbox {
|
|
|
190
190
|
this.coreVersion ?? CORE_VERSION_FOR_LEGACY_APPS;
|
|
191
191
|
if (currentCoreVersion.version === requestedCoreVersion) {
|
|
192
192
|
getNrfutilLogger()?.debug(
|
|
193
|
-
`Requested
|
|
193
|
+
`Requested nRF Util's core version ${requestedCoreVersion} is already installed.`
|
|
194
194
|
);
|
|
195
195
|
|
|
196
196
|
return;
|
|
@@ -206,7 +206,7 @@ describe('getJlinkCompatibility', () => {
|
|
|
206
206
|
...dependencies: Dependency[]
|
|
207
207
|
): ModuleVersion => ({
|
|
208
208
|
classification: 'nrf-external',
|
|
209
|
-
name: 'nrfutil
|
|
209
|
+
name: 'nrfutil device',
|
|
210
210
|
version: '2.5.0',
|
|
211
211
|
build_timestamp: '',
|
|
212
212
|
commit_date: '',
|
|
@@ -227,15 +227,15 @@ describe('getJlinkCompatibility', () => {
|
|
|
227
227
|
host: '',
|
|
228
228
|
});
|
|
229
229
|
|
|
230
|
-
it(`Reports no installed J-Link for for module versions reported by nrfutil
|
|
230
|
+
it(`Reports no installed SEGGER J-Link for for module versions reported by nrfutil device before v2.7`, () => {
|
|
231
231
|
expect(getJlinkCompatibility(createModuleVersion())).toEqual({
|
|
232
|
-
kind: 'No J-Link installed',
|
|
232
|
+
kind: 'No SEGGER J-Link installed',
|
|
233
233
|
requiredJlink: '7.94e',
|
|
234
234
|
actualJlink: 'none',
|
|
235
235
|
});
|
|
236
236
|
});
|
|
237
237
|
|
|
238
|
-
it(`Reports no installed J-Link for for module versions reported by nrfutil
|
|
238
|
+
it(`Reports no installed SEGGER J-Link for for module versions reported by nrfutil device since v2.7`, () => {
|
|
239
239
|
expect(
|
|
240
240
|
getJlinkCompatibility(
|
|
241
241
|
createModuleVersion({
|
|
@@ -247,13 +247,13 @@ describe('getJlinkCompatibility', () => {
|
|
|
247
247
|
})
|
|
248
248
|
)
|
|
249
249
|
).toEqual({
|
|
250
|
-
kind: 'No J-Link installed',
|
|
250
|
+
kind: 'No SEGGER J-Link installed',
|
|
251
251
|
requiredJlink: '8.10f',
|
|
252
252
|
actualJlink: 'none',
|
|
253
253
|
});
|
|
254
254
|
});
|
|
255
255
|
|
|
256
|
-
it(`Reports an outdated J-Link version`, () => {
|
|
256
|
+
it(`Reports an outdated SEGGER J-Link version`, () => {
|
|
257
257
|
expect(
|
|
258
258
|
getJlinkCompatibility(
|
|
259
259
|
createModuleVersion({
|
|
@@ -267,13 +267,13 @@ describe('getJlinkCompatibility', () => {
|
|
|
267
267
|
})
|
|
268
268
|
)
|
|
269
269
|
).toEqual({
|
|
270
|
-
kind: 'Outdated J-Link',
|
|
270
|
+
kind: 'Outdated SEGGER J-Link',
|
|
271
271
|
requiredJlink: '7.94i',
|
|
272
272
|
actualJlink: '7.94e',
|
|
273
273
|
});
|
|
274
274
|
});
|
|
275
275
|
|
|
276
|
-
it(`Reports a newer J-Link version is used`, () => {
|
|
276
|
+
it(`Reports a newer SEGGER J-Link version is used`, () => {
|
|
277
277
|
expect(
|
|
278
278
|
getJlinkCompatibility(
|
|
279
279
|
createModuleVersion({
|
|
@@ -287,13 +287,13 @@ describe('getJlinkCompatibility', () => {
|
|
|
287
287
|
})
|
|
288
288
|
)
|
|
289
289
|
).toEqual({
|
|
290
|
-
kind: 'Newer J-Link is used',
|
|
290
|
+
kind: 'Newer SEGGER J-Link is used',
|
|
291
291
|
requiredJlink: '7.94i',
|
|
292
292
|
actualJlink: '8.10f',
|
|
293
293
|
});
|
|
294
294
|
});
|
|
295
295
|
|
|
296
|
-
it(`Reports the tested J-Link version is used`, () => {
|
|
296
|
+
it(`Reports the tested SEGGER J-Link version is used`, () => {
|
|
297
297
|
expect(
|
|
298
298
|
getJlinkCompatibility(
|
|
299
299
|
createModuleVersion({
|
|
@@ -306,10 +306,10 @@ describe('getJlinkCompatibility', () => {
|
|
|
306
306
|
},
|
|
307
307
|
})
|
|
308
308
|
)
|
|
309
|
-
).toEqual({ kind: 'Tested J-Link is used' });
|
|
309
|
+
).toEqual({ kind: 'Tested SEGGER J-Link is used' });
|
|
310
310
|
});
|
|
311
311
|
|
|
312
|
-
it(`Reports the tested J-Link version is used by specifying no expected version`, () => {
|
|
312
|
+
it(`Reports the tested SEGGER J-Link version is used by specifying no expected version`, () => {
|
|
313
313
|
expect(
|
|
314
314
|
getJlinkCompatibility(
|
|
315
315
|
createModuleVersion({
|
|
@@ -318,6 +318,6 @@ describe('getJlinkCompatibility', () => {
|
|
|
318
318
|
versionFormat: 'string',
|
|
319
319
|
})
|
|
320
320
|
)
|
|
321
|
-
).toEqual({ kind: 'Tested J-Link is used' });
|
|
321
|
+
).toEqual({ kind: 'Tested SEGGER J-Link is used' });
|
|
322
322
|
});
|
|
323
323
|
});
|
|
@@ -34,7 +34,7 @@ export const hasExpectedVersionFormat = (
|
|
|
34
34
|
|
|
35
35
|
if (!result && logFailure) {
|
|
36
36
|
console.error(
|
|
37
|
-
`The J-Link version was not reported in the expected format. ` +
|
|
37
|
+
`The SEGGER J-Link version was not reported in the expected format. ` +
|
|
38
38
|
`Format: ${dependency.versionFormat}, ` +
|
|
39
39
|
`version: ${JSON.stringify(dependency)}, `
|
|
40
40
|
);
|
|
@@ -99,7 +99,7 @@ export const getJlinkCompatibility = (moduleVersion: ModuleVersion) => {
|
|
|
99
99
|
? strippedVersionName(jlinkVersionDependency.expectedVersion)
|
|
100
100
|
: nrfutilDeviceToJLink(moduleVersion.version);
|
|
101
101
|
return {
|
|
102
|
-
kind: 'No J-Link installed',
|
|
102
|
+
kind: 'No SEGGER J-Link installed',
|
|
103
103
|
requiredJlink: requiredVersion,
|
|
104
104
|
actualJlink: 'none',
|
|
105
105
|
} as const;
|
|
@@ -115,7 +115,7 @@ export const getJlinkCompatibility = (moduleVersion: ModuleVersion) => {
|
|
|
115
115
|
const actualJlink = strippedVersionName(jlinkVersionDependency);
|
|
116
116
|
|
|
117
117
|
return {
|
|
118
|
-
kind: 'Outdated J-Link',
|
|
118
|
+
kind: 'Outdated SEGGER J-Link',
|
|
119
119
|
requiredJlink,
|
|
120
120
|
actualJlink,
|
|
121
121
|
} as const;
|
|
@@ -127,7 +127,7 @@ export const getJlinkCompatibility = (moduleVersion: ModuleVersion) => {
|
|
|
127
127
|
jlinkVersionDependency.expectedVersion.version
|
|
128
128
|
) {
|
|
129
129
|
return {
|
|
130
|
-
kind: 'Tested J-Link is used',
|
|
130
|
+
kind: 'Tested SEGGER J-Link is used',
|
|
131
131
|
} as const;
|
|
132
132
|
}
|
|
133
133
|
|
|
@@ -137,7 +137,7 @@ export const getJlinkCompatibility = (moduleVersion: ModuleVersion) => {
|
|
|
137
137
|
const actualJlink = strippedVersionName(jlinkVersionDependency);
|
|
138
138
|
|
|
139
139
|
return {
|
|
140
|
-
kind: 'Newer J-Link is used',
|
|
140
|
+
kind: 'Newer SEGGER J-Link is used',
|
|
141
141
|
requiredJlink,
|
|
142
142
|
actualJlink,
|
|
143
143
|
} as const;
|
package/package.json
CHANGED
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nordicsemiconductor/pc-nrfconnect-shared",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "224.0.0",
|
|
4
4
|
"description": "Shared commodities for developing pc-nrfconnect-* packages",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
7
7
|
"url": "git+https://github.com/NordicSemiconductor/pc-nrfconnect-shared.git"
|
|
8
8
|
},
|
|
9
9
|
"author": "Nordic Semiconductor ASA",
|
|
10
|
-
"license": "
|
|
10
|
+
"license": "SEE LICENSE IN LICENSE",
|
|
11
11
|
"bin": {
|
|
12
12
|
"check-for-typescript": "scripts/check-for-typescript.ts",
|
|
13
13
|
"check-app-properties": "scripts/check-app-properties.ts",
|
package/release_notes.md
CHANGED
|
@@ -1,5 +1,7 @@
|
|
|
1
|
-
###
|
|
1
|
+
### Fixed
|
|
2
2
|
|
|
3
|
-
-
|
|
4
|
-
|
|
5
|
-
|
|
3
|
+
- Apps did not reload after restoring the default settings.
|
|
4
|
+
|
|
5
|
+
### Removed
|
|
6
|
+
|
|
7
|
+
- Removed the `isSkipUpdate*` properties from the launcher config.
|
|
@@ -162,7 +162,7 @@ const removeDeviceFromList =
|
|
|
162
162
|
}
|
|
163
163
|
};
|
|
164
164
|
/*
|
|
165
|
-
* Starts watching for devices with the given traits. See the nrfutil
|
|
165
|
+
* Starts watching for devices with the given traits. See the nrfutil device
|
|
166
166
|
* library for available traits. Whenever devices are attached/detached, this
|
|
167
167
|
* will dispatch AddDevice or removeDevice and trigger events.
|
|
168
168
|
*/
|
|
@@ -5,6 +5,7 @@
|
|
|
5
5
|
*/
|
|
6
6
|
|
|
7
7
|
import React, { FC, useRef, useState } from 'react';
|
|
8
|
+
import { getCurrentWindow } from '@electron/remote';
|
|
8
9
|
|
|
9
10
|
import Button, { ButtonVariants } from '../Button/Button';
|
|
10
11
|
import { Dialog, DialogButton } from '../Dialog/Dialog';
|
|
@@ -21,7 +22,7 @@ interface Props {
|
|
|
21
22
|
}
|
|
22
23
|
|
|
23
24
|
const DEFAULT_MODAL_TEXT =
|
|
24
|
-
'By restoring
|
|
25
|
+
'By restoring the default settings, all locally stored, app-specific configuration values will be lost. This does not include configurations such as device renames and favorites. The app will be reloaded. Are you sure you want to proceed?';
|
|
25
26
|
|
|
26
27
|
const FactoryResetButton: FC<Props> = ({
|
|
27
28
|
resetFn,
|
|
@@ -36,6 +37,7 @@ const FactoryResetButton: FC<Props> = ({
|
|
|
36
37
|
const defaultResetFn = () => {
|
|
37
38
|
store().clear();
|
|
38
39
|
logger.info('Successfully restored defaults');
|
|
40
|
+
getCurrentWindow().reload();
|
|
39
41
|
};
|
|
40
42
|
|
|
41
43
|
return (
|
|
@@ -72,7 +72,7 @@ const generalInfoReport = async () => {
|
|
|
72
72
|
|
|
73
73
|
moduleVersions.forEach(moduleVersion => {
|
|
74
74
|
result.push(
|
|
75
|
-
` - nrfutil
|
|
75
|
+
` - nrfutil ${moduleVersion.name}: ${moduleVersion.version}`
|
|
76
76
|
);
|
|
77
77
|
if (moduleVersion.name === 'device') {
|
|
78
78
|
const dependencies = moduleVersion.dependencies;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"launcherConfig.d.ts","sourceRoot":"","sources":["../../../ipc/launcherConfig.ts"],"names":[],"mappings":"AAQA,MAAM,WAAW,aAAa;IAC1B,2BAA2B,EAAE,OAAO,CAAC;IACrC,
|
|
1
|
+
{"version":3,"file":"launcherConfig.d.ts","sourceRoot":"","sources":["../../../ipc/launcherConfig.ts"],"names":[],"mappings":"AAQA,MAAM,WAAW,aAAa;IAC1B,2BAA2B,EAAE,OAAO,CAAC;IACrC,eAAe,EAAE,MAAM,CAAC;IACxB,WAAW,EAAE,MAAM,CAAC;CACvB;AASD,eAAO,MAAM,WAAW;gCALW,aAAa;CAKA,CAAC;AACjD,eAAO,MAAM,MAAM;qBAPG,aAAa;CAOA,CAAC"}
|
|
@@ -5,19 +5,19 @@ export declare const hasExpectedVersionFormat: (dependency: Dependency | Discrim
|
|
|
5
5
|
export declare const convertToSemver: (version: DiscriminatedVersion) => string;
|
|
6
6
|
export declare const existingIsOlderThanExpected: (jlinkVersionDependency: Dependency) => boolean;
|
|
7
7
|
export declare const getJlinkCompatibility: (moduleVersion: ModuleVersion) => {
|
|
8
|
-
readonly kind: "No J-Link installed";
|
|
8
|
+
readonly kind: "No SEGGER J-Link installed";
|
|
9
9
|
readonly requiredJlink: string;
|
|
10
10
|
readonly actualJlink: "none";
|
|
11
11
|
} | {
|
|
12
|
-
readonly kind: "Outdated J-Link";
|
|
12
|
+
readonly kind: "Outdated SEGGER J-Link";
|
|
13
13
|
readonly requiredJlink: string;
|
|
14
14
|
readonly actualJlink: string;
|
|
15
15
|
} | {
|
|
16
|
-
readonly kind: "Tested J-Link is used";
|
|
16
|
+
readonly kind: "Tested SEGGER J-Link is used";
|
|
17
17
|
readonly requiredJlink?: undefined;
|
|
18
18
|
readonly actualJlink?: undefined;
|
|
19
19
|
} | {
|
|
20
|
-
readonly kind: "Newer J-Link is used";
|
|
20
|
+
readonly kind: "Newer SEGGER J-Link is used";
|
|
21
21
|
readonly requiredJlink: string;
|
|
22
22
|
readonly actualJlink: string;
|
|
23
23
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FactoryResetButton.d.ts","sourceRoot":"","sources":["../../../../src/FactoryReset/FactoryResetButton.tsx"],"names":[],"mappings":"AAMA,OAAc,EAAE,EAAE,EAAoB,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"FactoryResetButton.d.ts","sourceRoot":"","sources":["../../../../src/FactoryReset/FactoryResetButton.tsx"],"names":[],"mappings":"AAMA,OAAc,EAAE,EAAE,EAAoB,MAAM,OAAO,CAAC;AAGpD,OAAe,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAK1D,UAAU,KAAK;IACX,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;IACrB,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,cAAc,CAAC;IACzB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,KAAK,CAAC,EAAE,OAAO,CAAC;CACnB;AAKD,QAAA,MAAM,kBAAkB,EAAE,EAAE,CAAC,KAAK,CAsDjC,CAAC;AAEF,eAAe,kBAAkB,CAAC"}
|