Merge pull request #135 from NordicSemiconductor/feat/update-shared-a…

…nd-nrfutil Feat: update dependancies
NordicSemiconductor · Feb 14, 2024 · 92cef3e · 92cef3e
2 parents 8558a60 + 549d3bc
commit 92cef3e
Show file tree

Hide file tree

Showing 6 changed files with 63 additions and 45 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -11,13 +11,13 @@
     "author": "Nordic Semiconductor ASA",
     "license": "SEE LICENSE IN LICENSE",
     "engines": {
-        "nrfconnect": ">=4.3.0"
+        "nrfconnect": ">=4.4.1"
     },
     "main": "dist/bundle.js",
     "nrfConnectForDesktop": {
         "nrfutil": {
             "device": [
-                "2.0.3"
+                "2.1.1"
             ],
             "npm": [
                 "0.3.0"
@@ -49,7 +49,7 @@
         "prepare": "husky install"
     },
     "devDependencies": {
-        "@nordicsemiconductor/pc-nrfconnect-shared": "^150.0.0",
+        "@nordicsemiconductor/pc-nrfconnect-shared": "^157.0.0",
         "chart.js": "^4.0.1",
         "chartjs-adapter-date-fns": "^2.0.1",
         "react-chartjs-2": "^5.0.1",

diff --git a/src/actions/fileActions.ts b/src/actions/fileActions.ts
@@ -5,8 +5,7 @@
  */
 
 import { dialog, getCurrentWindow } from '@electron/remote';
-import { AppThunk } from '@nordicsemiconductor/pc-nrfconnect-shared';
-import usageData from '@nordicsemiconductor/pc-nrfconnect-shared/src/utils/usageData';
+import { AppThunk, telemetry } from '@nordicsemiconductor/pc-nrfconnect-shared';
 import {
     OpenDialogOptions,
     OpenDialogReturnValue,
@@ -45,7 +44,7 @@ const saveSettings =
             usbPower: currentState.usbPower,
         };
 
-        usageData.sendUsageData('Export Configuartion', {
+        telemetry.sendEvent('Export Configuration', {
             config: out,
         });
 

diff --git a/src/components/SidePanel/OpenSerialTerminal.tsx b/src/components/SidePanel/OpenSerialTerminal.tsx
@@ -12,7 +12,7 @@ import {
     Device,
     openWindow,
     selectedDevice,
-    usageData,
+    telemetry,
 } from '@nordicsemiconductor/pc-nrfconnect-shared';
 
 import { getPmicState } from '../../features/pmicControl/pmicControlSlice';
@@ -58,7 +58,7 @@ export default () => {
 };
 
 const openSerialTerminal = (device: Device, serialPortPath: string) => {
-    usageData.sendUsageData(EventAction.OPEN_SERIAL_TERMINAL);
+    telemetry.sendEvent(EventAction.OPEN_SERIAL_TERMINAL);
     openWindow.openApp(
         { name: 'pc-nrfconnect-serial-terminal', source: 'official' },
         {

diff --git a/src/features/pmicControl/npm/deviceSetups.tsx b/src/features/pmicControl/npm/deviceSetups.tsx
@@ -95,11 +95,18 @@ export const npm1300DeviceSetup = (firmware: NpmFirmware): DeviceSetup => ({
                             progress.stepProgressPercentage,
                             progress.message
                         );
-                    }).catch(err => {
-                        if (err && !success) {
-                            reject(err.message);
-                        }
-                    });
+                    })
+                        .then(() => {
+                            onProgress(
+                                100,
+                                'Programming upload complete. Waiting for device to apply firmware and reboot. This take around a minute.'
+                            );
+                        })
+                        .catch(err => {
+                            if (err && !success) {
+                                reject(err.message);
+                            }
+                        });
                     logger.debug('firmware updated finished');
                 }),
         },

diff --git a/src/index.tsx b/src/index.tsx
@@ -5,8 +5,11 @@
  */
 
 import React from 'react';
-import { App, render } from '@nordicsemiconductor/pc-nrfconnect-shared';
-import usageData from '@nordicsemiconductor/pc-nrfconnect-shared/src/utils/usageData';
+import {
+    App,
+    render,
+    telemetry,
+} from '@nordicsemiconductor/pc-nrfconnect-shared';
 
 import appReducer from './appReducer';
 import Charger from './components/Charger/Charger';
@@ -24,7 +27,7 @@ import NpmGenericDialog from './features/pmicControl/npm/NpmGenericDialog';
 
 import './index.scss';
 
-usageData.enableTelemetry();
+telemetry.enableTelemetry();
 
 render(
     <App