Merge pull request #289 from NordicSemiconductor/feat/update-v-lower-cut-off

Update vLowerCutOff to 3.6

Author: kylebonnici

Changelog.md

@@ -13,6 +13,8 @@
 -   nPM2100: Setting the Boost regulator to the forced pass-through mode will
     now first set the output voltage VOUT to the minimum setting (1.8 V), in
     accordance with the datasheet.
+-   nPM1300 and nPM1304: Discharge cut-off voltage maximum value has been
+    increased to 3.6 V (previously 3.1 V).
 
 ### Fixed
 

src/components/Profiling/Dialog/ConfigurationDialog.tsx

@@ -65,6 +65,8 @@ export default ({
         return null;
     }
 
+    const vTerm = Math.max(...npmDevice.chargerModule.ranges.voltage);
+
     const [iTerm, setITerm] = useState<ITerm>(
         charger?.iTerm ?? npmDevice.chargerModule.values.iTerm[0].value
     );
@@ -89,7 +91,8 @@ export default ({
                 npmDevice.batteryProfiler?.loadProfile(
                     capacity,
                     vUpperCutOff,
-                    vLowerCutOff
+                    vLowerCutOff,
+                    vTerm
                 ) ?? [];
 
             const profile: Profile = {

src/features/pmicControl/npm/npm1300/batteryProfiler.ts

@@ -301,7 +301,8 @@ export class BatteryProfiler implements BatteryProfilerBase {
     loadProfile(
         capacity: number,
         vUpperCutOff: number,
-        vLowerCutOff: number
+        vLowerCutOff: number,
+        vTerm: number
     ): CCProfile[] {
         return [
             {
@@ -323,7 +324,7 @@ export class BatteryProfiler implements BatteryProfilerBase {
                 tRest: 1800000, // 30Min // 1304 45min
                 iLoad: capacity / 5 / 1000, // A  // 1304 apacity / 6 / 1000
                 iRest: 0,
-                vCutoff: vLowerCutOff + 0.5,
+                vCutoff: Math.min(vLowerCutOff + 0.5, vTerm),
             },
             {
                 tLoad: 300000, // 5Min

src/features/pmicControl/npm/npm1300/charger/index.ts

@@ -112,7 +112,7 @@ export default class Module implements ChargerModuleBase {
             iBatLim: Module.iBatRange(),
             vLowerCutOff: {
                 min: 2.7,
-                max: 3.1,
+                max: 3.6,
                 step: 0.05,
                 decimals: 2,
             },

src/features/pmicControl/npm/npm1304/batteryProfiler.ts

@@ -86,8 +86,9 @@ export class BatteryProfiler extends nPM1300BatteryProfiler {
     // eslint-disable-next-line class-methods-use-this
     loadProfile(
         capacity: number,
-        vUpperCutOff: number,
-        vLowerCutOff: number
+        _vUpperCutOff: number,
+        vLowerCutOff: number,
+        vTerm: number
     ): CCProfile[] {
         return [
             {
@@ -102,14 +103,14 @@ export class BatteryProfiler extends nPM1300BatteryProfiler {
                 tRest: 2400000, // 40Min
                 iLoad: capacity / 6 / 1000, // A
                 iRest: 0,
-                vCutoff: vLowerCutOff + 0.8,
+                vCutoff: Math.min(vLowerCutOff + 0.8, vTerm),
             },
             {
                 tLoad: 300000, // 5Min
                 tRest: 2400000, // 40Min
                 iLoad: capacity / 6 / 1000, // A
                 iRest: 0,
-                vCutoff: vLowerCutOff + 0.5,
+                vCutoff: Math.min(vLowerCutOff + 0.5, vTerm),
             },
             {
                 tLoad: 300000, // 5Min

src/features/pmicControl/npm/npm1304/charger/index.ts

@@ -84,7 +84,7 @@ export default class Module extends nPM1300Charger {
             },
             vLowerCutOff: {
                 min: 2.7,
-                max: 3.1,
+                max: 3.6,
                 step: 0.05,
                 decimals: 2,
             },

src/features/pmicControl/npm/types.ts

@@ -1029,7 +1029,8 @@ export type BatteryProfiler = {
     loadProfile(
         capacity: number,
         vUpperCutOff: number,
-        vLowerCutOff: number
+        vLowerCutOff: number,
+        vTerm: number
     ): CCProfile[];
 };