Merge pull request #386 from NordicSemiconductor/fix/window-avg-uint-…

…when-zoomed-out Fix: avg unit when zoomed out
NordicSemiconductor · Jan 5, 2024 · baadcc9 · baadcc9
2 parents 55f759a + 3e605ea
commit baadcc9
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 10 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -1,3 +1,10 @@
+## 4.0.0-beta5 - 2024-01-05
+
+## Fixed
+
+-   Window average was off by a factor of 1000 when zoomed out
+-   Duplicate Azure insights event
+
 ## 4.0.0-beta4 - 2024-01-04
 
 ## Fixed

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "pc-nrfconnect-ppk",
-    "version": "4.0.0-beta4",
+    "version": "4.0.0-beta5",
     "displayName": "Power Profiler",
     "description": "App for use with Nordic Power Profiler Kits",
     "homepage": "https://github.com/NordicSemiconductor/pc-nrfconnect-ppk",
@@ -47,7 +47,7 @@
         "nordic-publish": "node ./dist/nordic-publish.js"
     },
     "devDependencies": {
-        "@nordicsemiconductor/pc-nrfconnect-shared": "^142.0.0",
+        "@nordicsemiconductor/pc-nrfconnect-shared": "^145.0.0",
         "@types/redux-mock-store": "^1.0.3",
         "bson": "4.6.5",
         "chart.js": "^4.3.3",

diff --git a/src/components/Chart/data/dataAccumulator.ts b/src/components/Chart/data/dataAccumulator.ts
@@ -182,8 +182,9 @@ const accumulate = (
         }
 
         if (!Number.isNaN(v)) {
-            if (v * 1000 > max) max = v * 1000; // uA to nA
-            if (v * 1000 < min) min = v * 1000; // uA to nA
+            v *= 1000; // uA to nA
+            if (v > max) max = v;
+            if (v < min) min = v;
 
             if (data.bits && index < data.bits.length) {
                 bitAccumulator?.processBits(data.bits[index]);