Feat: update shared

NordicSemiconductor · May 29, 2024 · b68cb7c · b68cb7c
1 parent f09bc6e
commit b68cb7c
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 24 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/actions/jlinkTargetActions.ts b/src/actions/jlinkTargetActions.ts
@@ -10,7 +10,6 @@ import {
     describeError,
     Device,
     logger,
-    setWaitForDevice,
 } from '@nordicsemiconductor/pc-nrfconnect-shared';
 import {
     BatchCallbacks,
@@ -411,33 +410,21 @@ export const recover =
 
 export const updateOBFirmware =
     (device: Device): AppThunk<RootState, Promise<void>> =>
-    async dispatch => {
-        dispatch(
-            setWaitForDevice({
-                timeout: 30000,
-                when: 'always',
-                once: false,
-            })
-        );
-        logger.info(`Updating OB Firmware`);
-        await NrfutilDeviceLib.updateDebugProbeFirmware(device).then(result => {
+    dispatch => {
+        logger.info(`Updating J-Link OB firmware.`);
+        return dispatch(
+            NrfutilDeviceLib.updateOBFirmwareWithWaitForDevice(device)
+        ).then(result => {
             if (result.versionAfterUpdate === result.versionBeforeUpdate) {
                 logger.info(
-                    `No OB version update was required. OB version is at ${result.versionAfterUpdate}.`
+                    `No J-Link OB firmware update was required. Version is at ${result.versionAfterUpdate}.`
                 );
             } else {
                 logger.info(
-                    `OB version was updated to ${result.versionAfterUpdate}.`
+                    `J-Link OB firmware version was updated to ${result.versionAfterUpdate}.`
                 );
             }
         });
-        dispatch(
-            setWaitForDevice({
-                timeout: 30000,
-                when: 'always',
-                once: true,
-            })
-        );
     };
 
 export const recoverAndWrite =

diff --git a/src/components/ControlPanel.tsx b/src/components/ControlPanel.tsx
@@ -312,7 +312,7 @@ Are you sure you want to continue?`,
                     disabled={isMcuboot || !isJLink || !targetIsReady}
                 >
                     <span className="mdi mdi-update" />
-                    Update OB Firmware
+                    Update J-Link OB Firmware
                 </Button>
                 <Button
                     variant="secondary"

diff --git a/src/reducers/settingsReducer.ts b/src/reducers/settingsReducer.ts
@@ -29,6 +29,7 @@ const settingsSlice = createSlice({
         settingsLoad(state, action: PayloadAction<SettingsState>) {
             state.autoRead = action.payload.autoRead;
             state.autoReset = action.payload.autoReset;
+            state.autoUpdateOBFirmware = action.payload.autoUpdateOBFirmware;
         },
         toggleAutoRead(state) {
             state.autoRead = !state.autoRead;