Merge pull request #39 from DanteWinters/develop

Bugfix
DanteWinters · Oct 2, 2023 · 1de3da2 · 1de3da2
2 parents bdefccd + cbed74c
commit 1de3da2
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/config-entity-functions.js b/config-entity-functions.js
@@ -169,13 +169,15 @@ export function getEntitiesState(config, hass, config_entity, index) {
   }
 }
 
-export function getEntitiesNumState(config, hass, config_entity, index, is_int = true) {
+export function getEntitiesNumState(config, hass, config_entity, index, is_int = true, is_avg = false) {
   let value = 0;
   if (index == -1) {
     for (let i = 0; i < config.inverter_count; i++) {
       value += parseFloat(getEntitiesState(config, hass, config_entity, i));
     }
-    value = value / config.inverter_count;
+    if (is_avg) {
+      value = value / config.inverter_count;
+    }
   } else {
     value = parseFloat(getEntitiesState(config, hass, config_entity, index));
   }

diff --git a/lux-power-distribution-card.js b/lux-power-distribution-card.js
@@ -1,8 +1,10 @@
+import { LitElement } from "https://unpkg.com/lit?module";
+
 import * as cef from "./config-entity-functions.js";
 import * as hf from "./html-functions.js";
 import * as constants from "./constants.js";
 
-class LuxPowerDistributionCard extends HTMLElement {
+class LuxPowerDistributionCard extends LitElement {
   set hass(hass) {
     this._hass = hass;
 
@@ -250,7 +252,7 @@ class LuxPowerDistributionCard extends HTMLElement {
   }
 
   updateBattery(index) {
-    let battery_soc = cef.getEntitiesNumState(this.config, this._hass, "battery_soc", index);
+    let battery_soc = cef.getEntitiesNumState(this.config, this._hass, "battery_soc", index, true, true);
     let battery_flow = cef.getEntitiesNumState(this.config, this._hass, "battery_flow", index);
     const battery_arrow_element = this.card.querySelector("#battery-arrows");
     // Image
@@ -291,7 +293,8 @@ class LuxPowerDistributionCard extends HTMLElement {
         this._hass,
         "battery_voltage",
         index,
-        false
+        false,
+        true
       )} Vdc (avg)`;
     }
     const battery_soc_info_element = this.card.querySelector("#battery-soc-info");
@@ -353,7 +356,9 @@ class LuxPowerDistributionCard extends HTMLElement {
             this.config,
             this._hass,
             "grid_voltage",
-            index
+            index,
+            false,
+            true
           )} Vac (avg)${grid_emoji}`;
         }
       }