Merge pull request #324 from Pho3niX90/issue/322

Refine custom entity validations and improve unit conversions
slipx06 · Mar 24, 2024 · fac12f0 · fac12f0
2 parents 00b6e16 + 7cda98c
commit fac12f0
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 6 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.5",
+  "version": "4.24.6",
   "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/helpers/utils.ts b/src/helpers/utils.ts
@@ -38,12 +38,20 @@ export class Utils {
             return `${Math.round(numberValue)} ${unit}`;
         };
 
+        if (unit === UnitOfPower.KILO_WATT && Math.abs(numberValue) < 1) {
+            return `${Math.round(numberValue * 1000)} W`;
+        };
+
+        if (unit === UnitOfPower.MEGA_WATT && Math.abs(numberValue) < 1) {
+            return `${(numberValue * 1000).toFixed(decimal)} kW`;
+        };
+
         for (const rule of rules) {
             if (Math.abs(numberValue) >= rule.threshold) {
                 const convertedValue = (numberValue / rule.divisor).toFixed(rule.decimal || decimal);
                 return `${convertedValue} ${rule.targetUnit}`;
             }
-        }
+        };
 
         return `${numberValue.toFixed(decimal)} ${unit}`;
     }

diff --git a/src/index.ts b/src/index.ts
@@ -637,7 +637,7 @@ export class SunsynkPowerFlowCard extends LitElement {
          * Status can be returned as decimals "3.0", so this is just to change it to an int
          */
         if (inverterModel == InverterModel.Solis) {
-            inverterState = !stateInverterStatus.isNaN() ? stateInverterStatus.toNum(0) : stateInverterStatus.toString();
+            inverterState = !stateInverterStatus.isNaN() ? stateInverterStatus.toNum(0).toString() : stateInverterStatus.toString();
         }
 
         let typeStatusGroups = inverterSettings.statusGroups;

diff --git a/src/inverters/dto/custom-entity.ts b/src/inverters/dto/custom-entity.ts
@@ -53,8 +53,8 @@ export function convertToCustomEntity(entity: any): CustomEntity {
         ...entity,
         toNum: (decimals?: number, invert?: boolean) => Utils.toNum(entity?.state, decimals, invert),
         isValid: () => entity?.state !== null && entity.state !== undefined && entity.state !== 'unknown' || false,
-        notEmpty: () => entity?.state !== '' || false,
-        isNaN: () => Number.isNaN(entity?.state) || true,
+        notEmpty: () => (entity?.state !== '' && entity?.state !== null && entity?.state !== 'unknown' && entity.state !== undefined)  || false,
+        isNaN: () => entity?.state === null || Number.isNaN(entity?.state),
         toPower: (invert?: boolean) => {
             const unit = (entity.attributes?.unit_of_measurement || '').toLowerCase();
             if (unit === 'kw') {