@nordicsemiconductor/pc-nrfconnect-shared 135.0.0 → 137.0.0

package/Changelog.md

@@ -7,6 +7,34 @@ This project does _not_ adhere to
 [Semantic Versioning](https://semver.org/spec/v2.0.0.html) but contrary to it
 every new version is a new major version.
 
+## 137.0.0 - 2023-12-04
+
+### Added
+
+-   `jprogDeviceSetup` take in aan optional boolean to skip the device setup if
+    device is protected. Default remain to show dialog. Apps will need to opt-in
+
+## 136.0.0 - 2023-12-01
+
+### Fixed
+
+-   `useStopWatch` milliseconds was not correctly calculated
+-   External JLink devices would not connect to apps device list properly if
+    selected before they are connected to the debug-in heder of the device
+
+### Changed
+
+-   `useStopWatch` reset and start no longer force a rerender if these are a
+    dependency of a useEffect
+-   `useStopWatch` start optional time param no longer default to the last time
+    when paused but 0.
+-   `nrfutil device` `device-info` return undefined if reading info throws
+
+### Steps to upgrade when using this package
+
+-   `useStopWatch` If start() was used after a pause() with no call to reset()
+    start need to be called with time i.e. start(time)
+
 ## 135.0.0 - 2023-11-29
 
 ### Changed

package/nrfutil/device/deviceInfo.ts

@@ -56,15 +56,20 @@ export default async (
     core?: DeviceCore,
     onProgress?: (progress: Progress) => void,
     controller?: AbortController
-) =>
-    device.traits.jlink || device.traits.nordicDfu
-        ? (
-              await deviceSingleTaskEndOperation<DeviceInfoRaw>(
-                  device,
-                  'device-info',
-                  onProgress,
-                  controller,
-                  core ? ['--core', core] : []
-              )
-          ).deviceInfo
-        : undefined;
+) => {
+    try {
+        return device.traits.jlink || device.traits.nordicDfu
+            ? (
+                  await deviceSingleTaskEndOperation<DeviceInfoRaw>(
+                      device,
+                      'device-info',
+                      onProgress,
+                      controller,
+                      core ? ['--core', core] : []
+                  )
+              ).deviceInfo
+            : undefined;
+    } catch (_) {
+        return undefined;
+    }
+};

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@nordicsemiconductor/pc-nrfconnect-shared",
-    "version": "135.0.0",
+    "version": "137.0.0",
     "description": "Shared commodities for developing pc-nrfconnect-* packages",
     "repository": {
         "type": "git",

package/src/Device/jprogOperations.ts

@@ -135,7 +135,8 @@ const firmwareOptions = (
 
 export const jprogDeviceSetup = (
     firmware: JprogEntry[],
-    needSerialport = false
+    needSerialport = false,
+    hideDeviceSetupWhenProtected = false
 ): DeviceSetup => ({
     supportsProgrammingMode: device =>
         (needSerialport === !!device.traits.serialPorts || !needSerialport) &&
@@ -176,6 +177,16 @@ export const jprogDeviceSetup = (
                     });
                 }
 
+                if (
+                    hideDeviceSetupWhenProtected &&
+                    readbackProtection === 'protected'
+                ) {
+                    return Promise.resolve({
+                        device,
+                        validFirmware: true,
+                    });
+                }
+
                 return Promise.resolve({
                     device,
                     validFirmware: false,

package/src/utils/useStopwatch.test.tsx

@@ -88,7 +88,7 @@ describe('Stop Watch', () => {
         expect(stopwatch.isRunning).toBeFalsy();
     });
 
-    test('Start a paused timer will continue timer', () => {
+    test('Start a paused timer will continue timer from provided time', () => {
         const stopwatch = setup({
             autoStart: true,
             resolution: 1000,
@@ -120,7 +120,7 @@ describe('Stop Watch', () => {
         mockNow.mockReturnValue(5000);
 
         act(() => {
-            stopwatch.start();
+            stopwatch.start(500);
             stopwatch;
         });
 

package/src/utils/useStopwatch.ts

@@ -37,7 +37,7 @@ const splitMS = (ms: number) => {
     ms -= minutes * 60 * 1000;
 
     const seconds = Math.floor(ms / 1000);
-    const millisecond = ms - seconds * 60 * 1000;
+    const millisecond = ms - seconds * 1000;
 
     return {
         time,
@@ -89,7 +89,7 @@ export default ({
     );
 
     const start = useCallback(
-        (elapsedTime = time) => {
+        (elapsedTime = 0) => {
             if (pauseTimeout.current === null) {
                 previousTickTime.current = timer.now();
                 expectedTickTime.current =
@@ -98,7 +98,7 @@ export default ({
                 pauseTimeout.current = nextTick(elapsedTime);
             }
         },
-        [nextTick, resolution, time, timer]
+        [nextTick, resolution, timer]
     );
 
     const pause = useCallback(() => {

package/typings/generated/nrfutil/device/deviceInfo.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deviceInfo.d.ts","sourceRoot":"","sources":["../../../../nrfutil/device/deviceInfo.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC3C,OAAO,EACH,UAAU,EAEV,aAAa,EAChB,MAAM,UAAU,CAAC;AAElB,MAAM,WAAW,MAAM;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC;CACzB;AAED,MAAM,WAAW,eAAe;IAC5B,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,sBAAsB,EAAE,MAAM,CAAC;IAC/B,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,aAAa,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACjC;AAED,MAAM,WAAW,cAAc;IAC3B,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE,MAAM,CAAC;IACtB,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,MAAM,CAAC;CAC1B;AACD,MAAM,WAAW,iBAAiB;IAC9B,MAAM,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,UAAU;IACvB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,eAAe,CAAC;IACxB,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;IACtC,cAAc,CAAC,EAAE,cAAc,CAAC;CACnC;AAED,MAAM,WAAW,aAAa;IAC1B,IAAI,EAAE,aAAa,CAAC;IACpB,UAAU,EAAE,UAAU,CAAC;CAC1B;iCAGW,aAAa,SACd,UAAU,2BACO,QAAQ,KAAK,IAAI,4BAC5B,eAAe;AAJhC,wBAgBoB"}
+{"version":3,"file":"deviceInfo.d.ts","sourceRoot":"","sources":["../../../../nrfutil/device/deviceInfo.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC3C,OAAO,EACH,UAAU,EAEV,aAAa,EAChB,MAAM,UAAU,CAAC;AAElB,MAAM,WAAW,MAAM;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC;CACzB;AAED,MAAM,WAAW,eAAe;IAC5B,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,sBAAsB,EAAE,MAAM,CAAC;IAC/B,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,aAAa,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACjC;AAED,MAAM,WAAW,cAAc;IAC3B,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE,MAAM,CAAC;IACtB,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,MAAM,CAAC;CAC1B;AACD,MAAM,WAAW,iBAAiB;IAC9B,MAAM,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,UAAU;IACvB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,eAAe,CAAC;IACxB,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;IACtC,cAAc,CAAC,EAAE,cAAc,CAAC;CACnC;AAED,MAAM,WAAW,aAAa;IAC1B,IAAI,EAAE,aAAa,CAAC;IACpB,UAAU,EAAE,UAAU,CAAC;CAC1B;iCAGW,aAAa,SACd,UAAU,2BACO,QAAQ,KAAK,IAAI,4BAC5B,eAAe;AAJhC,wBAqBE"}

package/typings/generated/src/Device/jprogOperations.d.ts

@@ -1,3 +1,3 @@
 import { DeviceSetup, JprogEntry } from './deviceSetup';
-export declare const jprogDeviceSetup: (firmware: JprogEntry[], needSerialport?: boolean) => DeviceSetup;
+export declare const jprogDeviceSetup: (firmware: JprogEntry[], needSerialport?: boolean, hideDeviceSetupWhenProtected?: boolean) => DeviceSetup;
 //# sourceMappingURL=jprogOperations.d.ts.map

package/typings/generated/src/Device/jprogOperations.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"jprogOperations.d.ts","sourceRoot":"","sources":["../../../../src/Device/jprogOperations.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AA4HxD,eAAO,MAAM,gBAAgB,aACf,UAAU,EAAE,+BAEvB,WAgDD,CAAC"}
+{"version":3,"file":"jprogOperations.d.ts","sourceRoot":"","sources":["../../../../src/Device/jprogOperations.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AA4HxD,eAAO,MAAM,gBAAgB,aACf,UAAU,EAAE,uEAGvB,WA0DD,CAAC"}