fix: autoscale when pv sensor data is in kW. Changes to Solis battery…

… direction
slipx06 · Mar 23, 2024 · 00b6e16 · 00b6e16
1 parent cccbc7d
commit 00b6e16
Show file tree

Hide file tree

Showing 7 changed files with 42 additions and 17 deletions.
diff --git a/dist/sunsynk-power-flow-card.js b/dist/sunsynk-power-flow-card.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sunsynk-power-flow-card",
-  "version": "4.24.4",
+  "version": "4.24.5",
   "description": "A customizable Home Assistant card to emulate the Sunsynk System flow that's displayed on the Inverter screen.",
   "main": "sunsynk-power-flow-card.js",
   "scripts": {

diff --git a/src/cards/compact-card.ts b/src/cards/compact-card.ts
@@ -1135,28 +1135,36 @@ export const compactCard = (config: sunsynkPowerFlowCardConfig, inverterImg: str
                               class="${data.largeFont !== true ? 'st14' : 'st4'} st8" 
                               display="${!config.show_solar || !data.statePV1Power.isValid() ? 'none' : ''}" 
                               fill="${data.solarColour}">
-                            ${data.statePV1Power?.toPowerString(config.solar.auto_scale, data.decimalPlaces)}
+                              ${config.solar.auto_scale 
+                                   ? Utils.convertValue(data.pv1PowerWatts, data.decimalPlaces) || 0 
+                                   : `${Utils.toNum(data.pv1PowerWatts || 0, 0)} ${UnitOfPower.WATT}`}
                         </text>
                     </a>
                     <a href="#" @click=${(e) => Utils.handlePopup(e, config.entities.pv2_power_187)}>
                         <text id="pv2_power_187" x="289.5" y="71" class="${data.largeFont !== true ? 'st14' : 'st4'} st8" 
                               display="${!config.show_solar || config.solar.mppts === 1 || !data.statePV2Power.isValid() ? 'none' : ''}" 
                               fill="${data.solarColour}">
-                            ${data.statePV2Power?.toPowerString(config.solar.auto_scale, data.decimalPlaces)}
+                              ${config.solar.auto_scale 
+                                   ? Utils.convertValue(data.pv2PowerWatts, data.decimalPlaces) || 0 
+                                   : `${Utils.toNum(data.pv2PowerWatts || 0, 0)} ${UnitOfPower.WATT}`}
                         </text>
                     </a>
                     <a href="#" @click=${(e) => Utils.handlePopup(e, config.entities.pv3_power_188)}>
                         <text id="pv3_power_188" x="113" y="71" class="${data.largeFont !== true ? 'st14' : 'st4'} st8" 
                               display="${!config.show_solar || [1, 2].includes(config.solar.mppts) || !data.statePV3Power.isValid() ? 'none' : ''}" 
                               fill="${data.solarColour}">
-                            ${data.statePV3Power?.toPowerString(config.solar.auto_scale, data.decimalPlaces)}
+                              ${config.solar.auto_scale 
+                                   ? Utils.convertValue(data.pv3PowerWatts, data.decimalPlaces) || 0 
+                                   : `${Utils.toNum(data.pv3PowerWatts || 0, 0)} ${UnitOfPower.WATT}`}
                         </text>
                     </a>
                     <a href="#" @click=${(e) => Utils.handlePopup(e, config.entities.pv4_power_189)}>
                         <text id="pv4_power_189" x="366" y="71" class="${data.largeFont !== true ? 'st14' : 'st4'} st8" 
                               display="${!config.show_solar || [1, 2, 3].includes(config.solar.mppts) || !data.statePV4Power.isValid() ? 'none' : ''}" 
                               fill="${data.solarColour}">
-                            ${data.statePV4Power?.toPowerString(config.solar.auto_scale, data.decimalPlaces)}
+                              ${config.solar.auto_scale 
+                                   ? Utils.convertValue(data.pv4PowerWatts, data.decimalPlaces) || 0 
+                                   : `${Utils.toNum(data.pv4PowerWatts || 0, 0)} ${UnitOfPower.WATT}`}
                         </text>
                     </a>
                     ${config.entities?.essential_power && config.entities.essential_power !== 'none'

diff --git a/src/cards/full-card.ts b/src/cards/full-card.ts
@@ -1605,28 +1605,36 @@ export const fullCard = (config: sunsynkPowerFlowCardConfig, inverterImg: string
                         <text id="pv1_power_186" x="36.5" y="56.5" class="${data.largeFont !== true ? 'st14' : 'st4'} st8" 
                               display="${!config.show_solar || !data.statePV1Power.isValid() ? 'none' : ''}" 
                               fill="${data.solarColour}" >
-                            ${data.statePV1Power.toPowerString(config.solar.auto_scale, data.decimalPlaces)}
+                              ${config.solar.auto_scale 
+                                   ? Utils.convertValue(data.pv1PowerWatts, data.decimalPlaces) || 0 
+                                   : `${Utils.toNum(data.pv1PowerWatts || 0, 0)} ${UnitOfPower.WATT}`}
                         </text>
                     </a>
                     <a href="#" @click=${(e) => Utils.handlePopup(e, config.entities.pv2_power_187)}>
                         <text id="pv2_power_187" x="137" y="56.5" class="${data.largeFont !== true ? 'st14' : 'st4'} st8" 
                               display="${!config.show_solar || config.solar.mppts === 1 || !data.statePV2Power.isValid() ? 'none' : ''}" 
                               fill="${data.solarColour}">
-                            ${data.statePV2Power.toPowerString(config.solar.auto_scale, data.decimalPlaces)}
+                              ${config.solar.auto_scale 
+                                   ? Utils.convertValue(data.pv2PowerWatts, data.decimalPlaces) || 0 
+                                   : `${Utils.toNum(data.pv2PowerWatts || 0, 0)} ${UnitOfPower.WATT}`}
                         </text>
                     </a>
                     <a href="#" @click=${(e) => Utils.handlePopup(e, config.entities.pv3_power_188)}>
                         <text id="pv3_power_188" x="36.5" y="117" class="${data.largeFont !== true ? 'st14' : 'st4'} st8" 
                               display="${!config.show_solar || [1, 2].includes(config.solar.mppts) || !data.statePV3Power.isValid() ? 'none' : ''}" 
                               fill="${data.solarColour}">
-                            ${data.statePV3Power.toPowerString(config.solar.auto_scale, data.decimalPlaces)}
+                              ${config.solar.auto_scale 
+                                   ? Utils.convertValue(data.pv3PowerWatts, data.decimalPlaces) || 0 
+                                   : `${Utils.toNum(data.pv3PowerWatts || 0, 0)} ${UnitOfPower.WATT}`}
                         </text>
                     </a>
                     <a href="#" @click=${(e) => Utils.handlePopup(e, config.entities.pv4_power_189)}>
                         <text id="pv4_power_189" x="137" y="117" class="${data.largeFont !== true ? 'st14' : 'st4'} st8" 
                               display="${!config.show_solar || [1, 2, 3].includes(config.solar.mppts) || !data.statePV3Power.isValid() ? 'none' : ''}" 
                               fill="${data.solarColour}">
-                            ${data.statePV4Power.toPowerString(config.solar.auto_scale, data.decimalPlaces)}
+                              ${config.solar.auto_scale 
+                                   ? Utils.convertValue(data.pv4PowerWatts, data.decimalPlaces) || 0 
+                                   : `${Utils.toNum(data.pv4PowerWatts || 0, 0)} ${UnitOfPower.WATT}`}
                         </text>
                     </a>
                     <a href="#" @click=${(e) => Utils.handlePopup(e, config.entities.aux_load1)}>

diff --git a/src/helpers/utils.ts b/src/helpers/utils.ts
@@ -17,7 +17,9 @@ export class Utils {
 
     static convertValue(value, decimal = 2) {
         decimal = Number.isNaN(decimal) ? 2 : decimal;
-        if (Math.abs(value) > 999) {
+        if (Math.abs(value) >= 1000000) {
+            return `${(value / 1000000).toFixed(decimal)} MW`;
+        } else if (Math.abs(value) >= 1000) {
             return `${(value / 1000).toFixed(decimal)} kW`;
         } else {
             return `${Math.round(value)} W`;

diff --git a/src/index.ts b/src/index.ts
@@ -221,8 +221,8 @@ export class SunsynkPowerFlowCard extends LitElement {
 
         let totalGridPower = config.inverter.three_phase ? gridPowerTotal : gridPower;
 
-        let gridVoltage = !stateGridVoltage.isNaN() ? Utils.toNum(stateGridVoltage.state) : null;
-        let batteryCurrentDirection = !stateBatteryCurrentDirection.isNaN() ? parseInt(stateBatteryCurrentDirection.state) : null;
+        let gridVoltage = !stateGridVoltage.isNaN() ? stateGridVoltage.toNum(0) : null;
+        let batteryCurrentDirection = !stateBatteryCurrentDirection.isNaN() ? stateBatteryCurrentDirection.toNum(0) : null;
         let genericInverterImage = config.inverter?.modern;
 
         let loadColour = this.colourConvert(config.load?.colour);
@@ -535,7 +535,7 @@ export class SunsynkPowerFlowCard extends LitElement {
             gridStatus = gridVoltage > 50 ? 'on' : 'off';
         }
 
-        if (batteryCurrentDirection != null && !Number.isNaN(batteryCurrentDirection)) {
+        if (batteryCurrentDirection != null) {
             if (inverterModel == InverterModel.Solis && batteryCurrentDirection === 0) {
                 batteryPower = -batteryPower;
             }

diff --git a/src/inverters/dto/custom-entity.ts b/src/inverters/dto/custom-entity.ts
@@ -55,9 +55,16 @@ export function convertToCustomEntity(entity: any): CustomEntity {
         isValid: () => entity?.state !== null && entity.state !== undefined && entity.state !== 'unknown' || false,
         notEmpty: () => entity?.state !== '' || false,
         isNaN: () => Number.isNaN(entity?.state) || true,
-        toPower: (invert?: boolean) => (entity.attributes?.unit_of_measurement || '').toLowerCase() === 'kw'
-            ? Utils.toNum(((entity?.state || '0') * 1000), 0, invert)
-            : Utils.toNum((entity?.state || '0'), 0, invert) || 0,
+        toPower: (invert?: boolean) => {
+            const unit = (entity.attributes?.unit_of_measurement || '').toLowerCase();
+            if (unit === 'kw') {
+                return Utils.toNum(((entity?.state || '0') * 1000), 0, invert);
+            } else if (unit === 'mw') {
+                return Utils.toNum(((entity?.state || '0') * 1000000), 0, invert);
+            } else {
+                return Utils.toNum((entity?.state || '0'), 0, invert) || 0;
+            }
+        },
         toPowerString: (scale?: boolean, decimals?: number, invert?: boolean) =>
             scale ?
                 Utils.convertValueNew(entity?.state, entity?.attributes?.unit_of_measurement, decimals || 0) :