feat: add aux_dynamic_colour: closes #357

slipx06 · Apr 4, 2024 · c313812 · c313812
1 parent c45e9bd
commit c313812
Show file tree

Hide file tree

Showing 21 changed files with 94 additions and 51 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
@@ -104,6 +104,7 @@ These attributes are only needed if `show_solar` is set to `true`
 | aux_name:          | Optional    | `Auxilary`        | Set the display name for the AUX Load                                                                                                                                      
 | aux_type:          | Optional    | `default`         | Sets the AUX image using preset or any mdi icon e.g. `mdi:ev-station`. Presets are: `gen`, `inverter` `default`, `oven`, `pump`, `aircon` and `boiler`.                 
 | aux_colour:        | Optional    | `the load colour` | Sets the colour of all the AUX card objects. Hex codes (`'#66ff00'` etc) or names (`red`, `green`, `blue` etc)                                                          |
+| aux_dynamic_colour:| Optional    | `true`            | The respective aux elements on the card will be greyed out if aux power = 0W.                                                                                                                            |
 | aux_off_colour:    | Optional    | `the load colour` | Sets the colour of the AUX icon and label when disconnected. Hex codes (`'#66ff00'` etc) or names (`red`, `green`, `blue` etc)                                          |
 | aux_loads:         | Optional    | `0`               | Display additional loads on the AUX side (`0/1/2`)                                                                                                                         
 | aux_load1_name:    | Optional    |                   | Set the display name for the AUX load 1                                                                                                                                    

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sunsynk-power-flow-card",
-  "version": "4.27.0",
+  "version": "4.28.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": {

diff --git a/src/cards/full-card.ts b/src/cards/full-card.ts
diff --git a/src/defaults.ts b/src/defaults.ts
@@ -56,6 +56,7 @@ export default {
         colour: '#5fb6ad',
         dynamic_colour: true,
         dynamic_icon: true,
+        aux_dynamic_colour: true,
         show_daily: false,
         show_aux: false,
         show_daily_aux: false,

diff --git a/src/editor.ts b/src/editor.ts
@@ -188,6 +188,7 @@ export class SunSynkCardEditor extends ScopedRegistryHost(LitElement) implements
                                         {name: 'aux_type', selector: {icon: {}}},
                                         {name: 'invert_aux', selector: {boolean: {}}},
                                         {name: 'show_absolute_aux', selector: {boolean: {}}},
+                                        {name: 'aux_dynamic_colour', selector: {boolean: {}}},
                                         {name: 'aux_colour', selector: {color_rgb: {}}},
                                         {name: 'aux_off_colour', selector: {color_rgb: {}}},
                                         {name: 'aux_loads', selector: {number: {mode: 'box', min: 0, max: 2,}}},

diff --git a/src/index.ts b/src/index.ts
@@ -228,8 +228,11 @@ export class SunsynkPowerFlowCard extends LitElement {
         let genericInverterImage = config.inverter?.modern;
 
         let loadColour = this.colourConvert(config.load?.colour);
-        let auxColour = this.colourConvert(config.load?.aux_colour || loadColour);
-        let auxOffColour = this.colourConvert(config.load?.aux_off_colour || auxColour);
+        //let auxColour = this.colourConvert(config.load?.aux_colour || loadColour);        
+        let auxDynamicColour = this.calculateAuxLoadColour(stateAuxPower, 0) || loadColour;
+        let auxOffColour = this.colourConvert(config.load?.aux_off_colour || auxDynamicColour);
+        let auxDynamicColourLoad1 = this.calculateAuxLoadColour(stateAuxLoad1, 0) || loadColour;
+        let auxDynamicColourLoad2 = this.calculateAuxLoadColour(stateAuxLoad2, 0) || loadColour;
 
         config.title_colour = this.colourConvert(config.title_colour);
 
@@ -927,7 +930,6 @@ export class SunsynkPowerFlowCard extends LitElement {
             isFloating,
             inverterColour,
             solarColour,
-            auxColour,
             auxOffColour,
             batteryEnergy,
             largeFont,
@@ -1074,7 +1076,10 @@ export class SunsynkPowerFlowCard extends LitElement {
             stateNonessentialLoad2,
             stateNonessentialLoad3,
             autoScaledInverterPower,
-            autoScaledGridPower
+            autoScaledGridPower,
+            auxDynamicColour,
+            auxDynamicColourLoad1,
+            auxDynamicColourLoad2
         };
 
         if (this.isFullCard) {
@@ -1153,6 +1158,14 @@ export class SunsynkPowerFlowCard extends LitElement {
         return lineWidth;
     }
 
+    calculateAuxLoadColour(state, threshold) {
+        return !this._config.load.aux_dynamic_colour
+            ? this.colourConvert(this._config.load?.aux_colour)
+            : Math.abs(state.toNum(0)) > threshold
+                ? this.colourConvert(this._config.load?.aux_colour)
+                : 'grey';
+    }
+
     setConfig(config) {
         if (config.show_battery && !config.battery) {
             throw Error(localize('errors.battery.bat'));

diff --git a/src/localize/languages/ca.json b/src/localize/languages/ca.json
@@ -138,6 +138,7 @@
       "auto_scale": "Auto Scale",
       "three_phase": "Three Phase",
       "dynamic_colour": "Dynamic Colour",
+      "aux_dynamic_colour": "Aux Dynamic Colour",
       "dynamic_icon": "Dynamic Icon",
       "invert_power": "Invert Power",
       "show_absolute": "Show Absolute",

diff --git a/src/localize/languages/cs.json b/src/localize/languages/cs.json
@@ -88,6 +88,7 @@
       "autarky": "Autarky",
       "cardstyle": "Card Style",
       "large_font": "Large Font",
+      "aux_dynamic_colour": "Aux Dynamic Colour",
       "modern": "Modern",
       "show_solar": "Show Solar",
       "show_battery": "Show Battery",

diff --git a/src/localize/languages/da.json b/src/localize/languages/da.json
@@ -129,6 +129,7 @@
       "charge_colour": "Charge Colour",
       "linear_gradient": "Linear Gradient",
       "aux_colour": "Colour",
+      "aux_dynamic_colour": "Aux Dynamic Colour",
       "aux_off_colour": "Off Colour",
       "panel_mode": "Panel Mode",
       "invert_grid": "Invert Values",

diff --git a/src/localize/languages/de.json b/src/localize/languages/de.json
@@ -135,6 +135,7 @@
       "invert_load": "Invert Values",
       "shutdown_soc": "Shutdown SOC",
       "energy": "Energy",
+      "aux_dynamic_colour": "Aux Dynamic Colour",
       "auto_scale": "Auto Scale",
       "three_phase": "Three Phase",
       "dynamic_colour": "Dynamic Colour",

diff --git a/src/localize/languages/en.json b/src/localize/languages/en.json
@@ -118,6 +118,7 @@
     "aux_load2_name": "Load 2 Name",
     "aux_load1_icon": "Load 1 Icon",
     "aux_load2_icon": "Load 2 Icon",
+    "aux_dynamic_colour": "Aux Dynamic Colour",
     "show_daily_buy": "Show Daily Buy",
     "show_daily_sell": "Show Daily Sell",
     "no_grid_colour": "No Grid Colour",

diff --git a/src/localize/languages/es.json b/src/localize/languages/es.json
@@ -120,6 +120,7 @@
       "aux_load2_name": "Load 2 Name",
       "aux_load1_icon": "Load 1 Icon",
       "aux_load2_icon": "Load 2 Icon",
+      "aux_dynamic_colour": "Aux Dynamic Colour",
       "show_daily_buy": "Show Daily Buy",
       "show_daily_sell": "Show Daily Sell",
       "no_grid_colour": "No Grid Colour",

diff --git a/src/localize/languages/et.json b/src/localize/languages/et.json
@@ -120,6 +120,7 @@
       "aux_load2_name": "Load 2 Name",
       "aux_load1_icon": "Load 1 Icon",
       "aux_load2_icon": "Load 2 Icon",
+      "aux_dynamic_colour": "Aux Dynamic Colour",
       "show_daily_buy": "Show Daily Buy",
       "show_daily_sell": "Show Daily Sell",
       "no_grid_colour": "No Grid Colour",

diff --git a/src/localize/languages/fr.json b/src/localize/languages/fr.json
@@ -121,6 +121,7 @@
       "aux_load2_name": "Load 2 Name",
       "aux_load1_icon": "Load 1 Icon",
       "aux_load2_icon": "Load 2 Icon",
+      "aux_dynamic_colour": "Aux Dynamic Colour",
       "show_daily_buy": "Show Daily Buy",
       "show_daily_sell": "Show Daily Sell",
       "no_grid_colour": "No Grid Colour",

diff --git a/src/localize/languages/it.json b/src/localize/languages/it.json
@@ -120,6 +120,7 @@
       "aux_load2_name": "Load 2 Name",
       "aux_load1_icon": "Load 1 Icon",
       "aux_load2_icon": "Load 2 Icon",
+      "aux_dynamic_colour": "Aux Dynamic Colour",
       "show_daily_buy": "Show Daily Buy",
       "show_daily_sell": "Show Daily Sell",
       "no_grid_colour": "No Grid Colour",

diff --git a/src/localize/languages/nl.json b/src/localize/languages/nl.json
@@ -120,6 +120,7 @@
       "aux_load2_name": "Load 2 Name",
       "aux_load1_icon": "Load 1 Icon",
       "aux_load2_icon": "Load 2 Icon",
+      "aux_dynamic_colour": "Aux Dynamic Colour",
       "show_daily_buy": "Show Daily Buy",
       "show_daily_sell": "Show Daily Sell",
       "no_grid_colour": "No Grid Colour",

diff --git a/src/localize/languages/pt-br.json b/src/localize/languages/pt-br.json
@@ -118,6 +118,7 @@
       "aux_load2_name": "Nome Aux_Uso2",
       "aux_load1_icon": "Nome Aux_Uso3",
       "aux_load2_icon": "Nome Aux_Uso4",
+      "aux_dynamic_colour": "Aux Dynamic Colour",
       "show_daily_buy": "Consumo Diário",
       "show_daily_sell": "Produção Diária",
       "no_grid_colour": "Cor No_Grid",

diff --git a/src/localize/languages/ru.json b/src/localize/languages/ru.json
@@ -120,6 +120,7 @@
       "aux_load2_name": "Load 2 Name",
       "aux_load1_icon": "Load 1 Icon",
       "aux_load2_icon": "Load 2 Icon",
+      "aux_dynamic_colour": "Aux Dynamic Colour",
       "show_daily_buy": "Show Daily Buy",
       "show_daily_sell": "Show Daily Sell",
       "no_grid_colour": "No Grid Colour",

diff --git a/src/localize/languages/sk.json b/src/localize/languages/sk.json
@@ -119,6 +119,7 @@
       "aux_load2_name": "Load 2 Name",
       "aux_load1_icon": "Load 1 Icon",
       "aux_load2_icon": "Load 2 Icon",
+      "aux_dynamic_colour": "Aux Dynamic Colour",
       "show_daily_buy": "Show Daily Buy",
       "show_daily_sell": "Show Daily Sell",
       "no_grid_colour": "No Grid Colour",

diff --git a/src/types.ts b/src/types.ts
@@ -98,6 +98,7 @@ export interface sunsynkPowerFlowCardConfig extends LovelaceCardConfig {
     load: {
         colour: string;
         dynamic_colour: boolean;
+        aux_dynamic_colour: boolean;
         dynamic_icon: boolean;
         show_daily: boolean;
         invert_aux: boolean;
@@ -273,7 +274,6 @@ export interface DataDto {
     isFloating,
     inverterColour,
     solarColour,
-    auxColour,
     auxOffColour,
     batteryEnergy,
     largeFont,
@@ -374,6 +374,9 @@ export interface DataDto {
     iconAuxLoad2,
     autoScaledInverterPower,
     autoScaledGridPower,
+    auxDynamicColour,
+    auxDynamicColourLoad1,
+    auxDynamicColourLoad2,
     stateDayLoadEnergy: CustomEntity,
     stateDayBatteryDischarge: CustomEntity,
     stateDayGridImport: CustomEntity,