feat: add decimal_places_energy attribute and SMA Solar support

slipx06 · Apr 20, 2024 · 3d6e99f · 3d6e99f
1 parent 56b2c9e
commit 3d6e99f
Show file tree

Hide file tree

Showing 24 changed files with 59 additions and 35 deletions.
diff --git a/dist/sunsynk-power-flow-card.js b/dist/sunsynk-power-flow-card.js
diff --git a/docs/configuration.md b/docs/configuration.md
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sunsynk-power-flow-card",
-  "version": "4.31.0",
+  "version": "4.32.0",
   "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": {
@@ -17,7 +17,7 @@
     "type": "git",
     "url": "git+https://github.com/slipx06/sunsynk-power-flow-card.git"
   },
-  "author": "marksie1988 <marksie1988@users.noreply.github.com>",
+  "author": "slipx06 <slipx06@users.noreply.github.com>",
   "license": "MIT",
   "bugs": {
     "url": "https://github.com/slipx06/sunsynk-power-flow-card/issues"

diff --git a/src/cards/compact-card.ts b/src/cards/compact-card.ts
@@ -779,36 +779,36 @@ export const compactCard = (config: sunsynkPowerFlowCardConfig, inverterImg: str
                               class="st10 left-align"
                               display="${data.batteryShowDaily !== true || !config.show_battery || !data.stateDayBatteryCharge.isValid() ? 'none' : ''}"
                               fill="${data.batteryColour}">
-                            ${data.stateDayBatteryCharge?.toPowerString(true, 1)}
+                            ${data.stateDayBatteryCharge?.toPowerString(true, data.decimalPlacesEnergy)}
                         </text>
                     </a>
                     <a href="#" @click=${(e) => Utils.handlePopup(e, config.entities.day_pv_energy_108)}>
                         <text id="daily_solar_value" x="200" y="26" class="st10 left-align"
                               display="${config.solar.display_mode === 1 && data.stateDayPVEnergy.isValid() ? '' : 'none'}"
                               fill="${!data.solarShowDaily || !config.show_solar ? 'transparent' : `${data.solarColour}`}">
-                            ${data.stateDayPVEnergy?.toPowerString(true, 1)}
+                            ${data.stateDayPVEnergy?.toPowerString(true, data.decimalPlacesEnergy)}
                         </text>
                     </a>
                     <a href="#" @click=${(e) => Utils.handlePopup(e, config.entities.day_pv_energy_108)}>
                         <text id="remaining_solar_value" x="200" y="26" class="st10 left-align"
                               display="${config.solar.display_mode === 2 && data.stateDayPVEnergy.isValid() ? '' : 'none'}"
                               fill="${!data.solarShowDaily || !config.show_solar ? 'transparent' : `${data.solarColour}`}">
-                            ${data.stateDayPVEnergy?.toPowerString(true, 1) + ' / ' + data.remainingSolar}
+                            ${data.stateDayPVEnergy?.toPowerString(true, data.decimalPlacesEnergy) + ' / ' + data.remainingSolar}
                         </text>
                     </a>
                     <a href="#" @click=${(e) => Utils.handlePopup(e, config.entities.day_pv_energy_108)}>
                         <text id="total_solar_value" x="200" y="26" class="st10 left-align"
                               display="${config.solar.display_mode === 3 && data.stateDayPVEnergy.isValid() ? '' : 'none'}"
                               fill="${!data.solarShowDaily || !config.show_solar ? 'transparent' : `${data.solarColour}`}">
-                            ${data.stateDayPVEnergy?.toPowerString(true, 1) + ' / ' + data.totalSolarGeneration}
+                            ${data.stateDayPVEnergy?.toPowerString(true, data.decimalPlacesEnergy) + ' / ' + data.totalSolarGeneration}
                         </text>
                     </a>
                     <a href="#" @click=${(e) => Utils.handlePopup(e, config.entities.day_battery_discharge_71)}>
                         <text id="daily_bat_discharge_value" x="${data.compactMode ? '132' : '77.2'}" y="380.1"
                               class="st10 left-align"
                               display="${data.batteryShowDaily !== true || !config.show_battery || !data.stateDayBatteryDischarge.isValid() ? 'none' : ''}"
                               fill="${data.batteryColour}">
-                            ${data.stateDayBatteryDischarge?.toPowerString(true, 1)}
+                            ${data.stateDayBatteryDischarge?.toPowerString(true, data.decimalPlacesEnergy)}
                         </text>
                     </a>
                     <a href="#" @click=${(e) => Utils.handlePopup(e, config.entities.day_load_energy_84)}>
@@ -817,21 +817,21 @@ export const compactCard = (config: sunsynkPowerFlowCardConfig, inverterImg: str
                               y="${[2, 3, 4].includes(data.additionalLoad) ? '175' : '267.9'}"
                               class="st10 left-align" display="${!data.loadShowDaily || !data.stateDayLoadEnergy.isValid() ? 'none' : ''}"
                               fill="${data.loadColour}">
-                            ${data.stateDayLoadEnergy?.toPowerString(true, 1)}
+                            ${data.stateDayLoadEnergy?.toPowerString(true, data.decimalPlacesEnergy)}
                         </text>
                     </a>
                     <a href="#" @click=${(e) => Utils.handlePopup(e, config.entities.day_grid_import_76)}>
                         <text id="daily_grid_buy_value" x="5" y="267.9" class="st10 left-align"
                               display="${!config.show_grid || data.gridShowDailyBuy !== true || !data.stateDayGridImport.isValid() ? 'none' : ''}"
                               fill="${data.gridColour}">
-                            ${data.stateDayGridImport?.toPowerString(true, 1)}
+                            ${data.stateDayGridImport?.toPowerString(true, data.decimalPlacesEnergy)}
                         </text>
                     </a>
                     <a href="#" @click=${(e) => Utils.handlePopup(e, config.entities.day_grid_export_77)}>
                         <text id="daily_grid_sell_value" x="5" y="165" class="st10 left-align"
                               display="${!config.show_grid || data.gridShowDailySell !== true || !data.stateDayGridExport.isValid() ? 'none' : ''}"
                               fill="${data.gridColour}">
-                            ${data.stateDayGridExport?.toPowerString(true, 1)}
+                            ${data.stateDayGridExport?.toPowerString(true, data.decimalPlacesEnergy)}
                         </text>
                     </a>
                     <a href="#" @click=${(e) => Utils.handlePopup(e, config.entities.max_sell_power)}>

diff --git a/src/cards/full-card.ts b/src/cards/full-card.ts
@@ -1407,21 +1407,21 @@ export const fullCard = (config: sunsynkPowerFlowCardConfig, inverterImg: string
                         <text id="daily_solar_value" x="43.5" y="15" class="st10 left-align"
                               display="${config.solar.display_mode === 1 && data.stateDayPVEnergy.isValid() ? '' : 'none'}"
                               fill="${!data.solarShowDaily || !config.show_solar ? 'transparent' : `${data.solarColour}`}">
-                            ${data.stateDayPVEnergy.toPowerString(true, 1)}
+                            ${data.stateDayPVEnergy.toPowerString(true, data.decimalPlacesEnergy)}
                         </text>
                     </a>
                     <a href="#" @click=${(e) => Utils.handlePopup(e, config.entities.day_pv_energy_108)}>
                         <text id="remaining_solar_value" x="43.5" y="15" class="st10 left-align"
                               display="${config.solar.display_mode === 2 && data.stateDayPVEnergy.isValid() ? '' : 'none'}"
                               fill="${!data.solarShowDaily || !config.show_solar ? 'transparent' : `${data.solarColour}`}">
-                            ${data.stateDayPVEnergy.toPowerString(true, 1)} / ${data.remainingSolar}
+                            ${data.stateDayPVEnergy.toPowerString(true, data.decimalPlacesEnergy)} / ${data.remainingSolar}
                         </text>
                     </a>
                     <a href="#" @click=${(e) => Utils.handlePopup(e, config.entities.day_pv_energy_108)}>
                         <text id="total_solar_value" x="43.5" y="15" class="st10 left-align"
                               display="${config.solar.display_mode === 3 && data.stateDayPVEnergy.isValid() ? '' : 'none'}"
                               fill="${!data.solarShowDaily || !config.show_solar ? 'transparent' : `${data.solarColour}`}">
-                            ${data.stateDayPVEnergy.toPowerString(true, 1)} /
+                            ${data.stateDayPVEnergy.toPowerString(true, data.decimalPlacesEnergy)} /
                             ${data.totalSolarGeneration}
                         </text>
                     </a>
@@ -1430,29 +1430,29 @@ export const fullCard = (config: sunsynkPowerFlowCardConfig, inverterImg: string
                               class="st10 left-align"
                               display="${!data.loadShowDaily || !data.showAux || !data.stateDayLoadEnergy.isValid() ? 'none' : ''}"
                               fill="${data.loadColour}">
-                            ${data.stateDayLoadEnergy.toPowerString(true, 1)}
+                            ${data.stateDayLoadEnergy.toPowerString(true, data.decimalPlacesEnergy)}
                         </text>
                     </a>
                     <a href="#" @click=${(e) => Utils.handlePopup(e, config.entities.day_load_energy_84)}>
                         <text id="daily_load_value" x="${data.additionalLoad === 0 ? '377' : '306'}"
                               y="${data.additionalLoad === 0 ? '57' : '80'}" class="st10 left-align"
                               display="${!data.loadShowDaily || data.showAux || !data.stateDayLoadEnergy.isValid() ? 'none' : ''}"
                               fill="${data.loadColour}">
-                            ${data.stateDayLoadEnergy.toPowerString(true, 1)}
+                            ${data.stateDayLoadEnergy.toPowerString(true, data.decimalPlacesEnergy)}
                         </text>
                     </a>
                     <a href="#" @click=${(e) => Utils.handlePopup(e, config.entities.day_battery_charge_70)}>
                         <text id="daily_bat_charge_value" x="4.5" y="237" class="st10 left-align"
                               display="${data.batteryShowDaily !== true || !config.show_battery || !data.stateDayBatteryCharge.isValid() ? 'none' : ''}"
                               fill="${data.batteryColour}">
-                            ${data.stateDayBatteryCharge.toPowerString(true, 1)}
+                            ${data.stateDayBatteryCharge.toPowerString(true, data.decimalPlacesEnergy)}
                         </text>
                     </a>
                     <a href="#" @click=${(e) => Utils.handlePopup(e, config.entities.day_battery_discharge_71)}>
                         <text id="daily_bat_discharge_value" x="4.5" y="271" class="st10 left-align"
                               display="${data.batteryShowDaily !== true || !config.show_battery || !data.stateDayBatteryDischarge.isValid()? 'none' : ''}"
                               fill="${data.batteryColour}">
-                            ${data.stateDayBatteryDischarge.toPowerString(true, 1)}
+                            ${data.stateDayBatteryDischarge.toPowerString(true, data.decimalPlacesEnergy)}
                         </text>
                     </a>
                     <a href="#" @click=${(e) => Utils.handlePopup(e, config.entities.day_grid_import_76)}>
@@ -1464,7 +1464,7 @@ export const fullCard = (config: sunsynkPowerFlowCardConfig, inverterImg: string
                               class="st10 left-align"
                               display="${!config.show_grid || data.gridShowDailyBuy !== true || !data.stateDayGridImport.isValid() ? 'none' : ''}"
                               fill="${data.gridColour}">
-                            ${data.stateDayGridImport.toPowerString(true, 1)}
+                            ${data.stateDayGridImport.toPowerString(true, data.decimalPlacesEnergy)}
                         </text>
                     </a>
                     <a href="#" @click=${(e) => Utils.handlePopup(e, config.entities.day_grid_export_77)}>
@@ -1476,7 +1476,7 @@ export const fullCard = (config: sunsynkPowerFlowCardConfig, inverterImg: string
                               class="st10 left-align"
                               display="${!config.show_grid || data.gridShowDailySell !== true || !data.stateDayGridExport.isValid() ? 'none' : ''}"
                               fill="${data.gridColour}">
-                            ${data.stateDayGridExport.toPowerString(true, 1)}
+                            ${data.stateDayGridExport.toPowerString(true, data.decimalPlacesEnergy)}
                         </text>
                     </a>
                     <a href="#" @click=${(e) => Utils.handlePopup(e, config.entities.max_sell_power)}>
@@ -1493,7 +1493,7 @@ export const fullCard = (config: sunsynkPowerFlowCardConfig, inverterImg: string
                               y="12" class="st10 left-align"
                               display="${!data.showAux || data.showDailyAux !== true || !data.stateDayAuxEnergy.isValid() ? 'none' : ''}"
                               fill="${data.auxDynamicColour}">
-                            ${data.stateDayAuxEnergy.toPowerString(true, 1)}
+                            ${data.stateDayAuxEnergy.toPowerString(true, data.decimalPlacesEnergy)}
                         </text>
                     </a>
                     <a href="#" @click=${(e) => Utils.handlePopup(e, config.entities.essential_load1_extra)}>

diff --git a/src/defaults.ts b/src/defaults.ts
@@ -12,6 +12,7 @@ export default {
     card_height: '396px',
     card_width: '100%',
     decimal_places: 2,
+    decimal_places_energy: 1,
     dynamic_line_width: true,
     max_line_width: 4,
     min_line_width: 1,

diff --git a/src/editor.ts b/src/editor.ts
@@ -62,6 +62,7 @@ export class SunSynkCardEditor extends ScopedRegistryHost(LitElement) implements
                                     {name: "show_battery", selector: {boolean: {}}},
                                     {name: "show_grid", selector: {boolean: {}}},
                                     {name: "decimal_places", selector: {number: {}}},
+                                    {name: "decimal_places_energy", selector: {number: {}}},
                                     {name: "dynamic_line_width", selector: {boolean: {}}},
                                     {name: "max_line_width", selector: {number: {}}},
                                     {name: "min_line_width", selector: {number: {}}},

diff --git a/src/index.ts b/src/index.ts
@@ -352,6 +352,7 @@ export class SunsynkPowerFlowCard extends LitElement {
         const iconNonessentialLoad3 = this.getEntity('grid.load3_icon', {state: config.grid?.load3_icon?.toString() ?? ''}).state;
 
         let decimalPlaces = config.decimal_places;
+        let decimalPlacesEnergy = config.decimal_places_energy;
         let remainingSolar = config.entities.remaining_solar ? Utils.convertValueNew(stateRemainingSolar.state, stateRemainingSolar.attributes?.unit_of_measurement, decimalPlaces) : false;
         let totalSolarGeneration = config.entities.total_pv_generation ? Utils.convertValueNew(stateTotalPVGeneration.state, stateTotalPVGeneration.attributes?.unit_of_measurement, 2) : false;
         let largeFont = config.large_font;
@@ -960,6 +961,7 @@ export class SunsynkPowerFlowCard extends LitElement {
             gridPowerL2,
             gridPowerL3,
             decimalPlaces,
+            decimalPlacesEnergy,
             stateEssentialLoad1Extra,
             stateEssentialLoad2Extra,
             stateNonEssentialLoad1Extra,

diff --git a/src/inverters/brands/sma.ts → src/inverters/brands/sma-solar.ts b/src/inverters/brands/sma.ts → src/inverters/brands/sma-solar.ts
@@ -2,8 +2,8 @@ import {InverterSettingsDto} from '../dto/inverter-settings.dto';
 import {InverterModel} from '../../types';
 import {localize} from '../../localize/localize';
 
-export class SMA extends InverterSettingsDto {
-    brand = InverterModel.SMA;
+export class SMASolar extends InverterSettingsDto {
+    brand = InverterModel.SMASolar;
     statusGroups = {
         standby: {states: ['0', 'standby', 'stand-by'], color: 'blue', message: localize('common.standby')},
         selftest: {states: ['1', 'selftest', 'self-checking'], color: 'yellow', message: localize('common.selftest')},

diff --git a/src/inverters/inverter-factory.ts b/src/inverters/inverter-factory.ts
@@ -18,6 +18,7 @@ import {SolarEdge} from './brands/solar-edge';
 import {Deye} from './brands/deye';
 import {Azzurro} from './brands/azzurro';
 import {MPPSolar} from './brands/mpp-solar';
+import {SMASolar} from './brands/sma-solar';
 
 
 
@@ -67,6 +68,8 @@ export class InverterFactory {
                 return new PowMr();
             case InverterModel.MPPSolar:
                 return new MPPSolar();
+            case InverterModel.SMASolar:
+                return new SMASolar();
             case InverterModel.Sunsynk:
             default:
                 return new Sunsynk()

diff --git a/src/localize/languages/ca.json b/src/localize/languages/ca.json
@@ -83,6 +83,7 @@
       "title_colour": "Title Colour",
       "title_size": "Title Size (px)",
       "decimal_places": "Decimal Places",
+      "decimal_places_energy": "Decimal Places (Daily Energy)",
       "card_height": "Card Height (px)",
       "card_width": "Card Width (px)",
       "model": "Model",

diff --git a/src/localize/languages/cs.json b/src/localize/languages/cs.json
@@ -85,6 +85,7 @@
       "card_height": "Card Height (px)",
       "card_width": "Card Width (px)",
       "decimal_places": "Decimal Places",
+      "decimal_places_energy": "Decimal Places (Daily Energy)",
       "model": "Model",
       "autarky": "Autarky",
       "cardstyle": "Card Style",

diff --git a/src/localize/languages/da.json b/src/localize/languages/da.json
@@ -85,6 +85,7 @@
       "card_height": "Card Højde (px)",
       "card_width": "Card Bredde (px)",
       "decimal_places": "Antal viste Decimaler",
+      "decimal_places_energy": "Decimal Places (Daily Energy)",
       "model": "Model",
       "autarky": "Autarky",
       "cardstyle": "Kortstil",

diff --git a/src/localize/languages/de.json b/src/localize/languages/de.json
@@ -85,6 +85,7 @@
       "card_height": "Card Height (px)",
       "card_width": "Card Width (px)",
       "decimal_places": "Decimal Places",
+      "decimal_places_energy": "Decimal Places (Daily Energy)",
       "model": "Model",
       "autarky": "Autarky",
       "cardstyle": "Card Style",

diff --git a/src/localize/languages/en.json b/src/localize/languages/en.json
@@ -83,6 +83,7 @@
     "card_height": "Card Height (px)",
     "card_width": "Card Width (px)",
     "decimal_places": "Decimal Places",
+    "decimal_places_energy": "Decimal Places (Daily Energy)",
     "model": "Model",
     "autarky": "Autarky",
     "cardstyle": "Card Style",

diff --git a/src/localize/languages/es.json b/src/localize/languages/es.json
@@ -85,6 +85,7 @@
       "card_height": "Card Height (px)",
       "card_width": "Card Width (px)",
       "decimal_places": "Decimal Places",
+      "decimal_places_energy": "Decimal Places (Daily Energy)",
       "model": "Model",
       "autarky": "Autarky",
       "cardstyle": "Card Style",

diff --git a/src/localize/languages/et.json b/src/localize/languages/et.json
@@ -85,6 +85,7 @@
       "card_height": "Card Height (px)",
       "card_width": "Card Width (px)",
       "decimal_places": "Decimal Places",
+      "decimal_places_energy": "Decimal Places (Daily Energy)",
       "model": "Model",
       "autarky": "Autarky",
       "cardstyle": "Card Style",

diff --git a/src/localize/languages/fr.json b/src/localize/languages/fr.json
@@ -86,6 +86,7 @@
       "card_height": "Card Height (px)",
       "card_width": "Card Width (px)",
       "decimal_places": "Decimal Places",
+      "decimal_places_energy": "Decimal Places (Daily Energy)",
       "model": "Model",
       "autarky": "Autarky",
       "cardstyle": "Card Style",

diff --git a/src/localize/languages/it.json b/src/localize/languages/it.json
@@ -85,6 +85,7 @@
       "card_height": "Card Height (px)",
       "card_width": "Card Width (px)",
       "decimal_places": "Decimal Places",
+      "decimal_places_energy": "Decimal Places (Daily Energy)",
       "model": "Model",
       "autarky": "Autarky",
       "cardstyle": "Card Style",

diff --git a/src/localize/languages/nl.json b/src/localize/languages/nl.json
@@ -85,6 +85,7 @@
       "card_height": "Card Height (px)",
       "card_width": "Card Width (px)",
       "decimal_places": "Decimal Places",
+      "decimal_places_energy": "Decimal Places (Daily Energy)",
       "model": "Model",
       "autarky": "Autarky",
       "cardstyle": "Card Style",

diff --git a/src/localize/languages/pt-br.json b/src/localize/languages/pt-br.json
@@ -83,6 +83,7 @@
       "card_height": "Card Height (px)",
       "card_width": "Card Width (px)",
       "decimal_places": "Casas decimais",
+      "decimal_places_energy": "Decimal Places (Daily Energy)",
       "model": "Modelo",
       "autarky": "Autoconsumo",
       "cardstyle": "Estilo do Cartão",

diff --git a/src/localize/languages/ru.json b/src/localize/languages/ru.json
@@ -85,6 +85,7 @@
       "card_height": "Card Height (px)",
       "card_width": "Card Width (px)",
       "decimal_places": "Decimal Places",
+      "decimal_places_energy": "Decimal Places (Daily Energy)",
       "model": "Model",
       "autarky": "Autarky",
       "cardstyle": "Card Style",