feat: allow customisation of the DAILY AUX label

slipx06 · May 12, 2024 · ba99db9 · ba99db9
1 parent 52554ad
commit ba99db9
Show file tree

Hide file tree

Showing 20 changed files with 22 additions and 5 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
@@ -109,6 +109,7 @@ These attributes are only needed if `show_solar` is set to `true`
 | animation_speed:   | Optional    | `8`               | Set slowest animation speed in seconds, depending on Power draw                                                                                                            |
 | max_power:         | Optional    | `8000`            | Maximum power draw to calculate animation speed                                                                                                                            |
 | aux_name:          | Optional    | `Auxilary`        | Set the display name for the AUX Load                                                                                                                                      
+| aux_daily_name:    | Optional    | `DAILY AUX`       | Set the display name for the DAILY AUX label                                                                                                                                      
 | 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.                                                                                                                            |

diff --git a/src/cards/compact-card.ts b/src/cards/compact-card.ts
@@ -772,9 +772,9 @@ export const compactCard = (config: sunsynkPowerFlowCardConfig, inverterImg: str
                                 <stop offset="${data.batteryPercentage < 2 ? 0 : data.batteryPercentage}%"
                                       stop-color="${Number(data.batteryPercentage) > 0 ? data.batteryColour : (Number(data.pvPercentage) > 0 ? (Number(data.pvPercentage) === 100 ? data.solarColour : data.gridColour) : data.gridColour)}"/>
                                 <stop offset="${data.batteryPercentage < 2 ? 0 : data.batteryPercentage}%"
-                                      stop-color="${Number(data.pvPercentage) > 0 ? (Number(data.pvPercentage) === 100 ? data.solarColour : data.gridColour) : data.gridColour}"/>
+                                      stop-color="${Number(data.pvPercentage) > 0 ? (Number(data.pvPercentage) + Number(data.batteryPercentage) === 100 ? data.solarColour : data.gridColour) : data.gridColour}"/>
                                 <stop offset="${(Number(data.pvPercentage) + Number(data.batteryPercentage) === 100 ? 100 : 100 - (Number(data.batteryPercentage < 2 ? 0 : data.batteryPercentage) + Number(data.pvPercentage < 2 ? 0 : data.pvPercentage)))}%"
-                                      stop-color="${Number(data.pvPercentage) > 0 ? (Number(data.pvPercentage) === 100 ? data.solarColour : data.gridColour) : data.gridColour}"/>
+                                      stop-color="${Number(data.pvPercentage) > 0 ? (Number(data.pvPercentage) + Number(data.batteryPercentage) === 100 ? data.solarColour : data.gridColour) : data.gridColour}"/>
                                 <stop offset="${(Number(data.pvPercentage) + Number(data.batteryPercentage) === 100 ? 100 : 100 - (Number(data.batteryPercentage < 2 ? 0 : data.batteryPercentage) + Number(data.pvPercentage < 2 ? 0 : data.pvPercentage)))}%"
                                       stop-color="${Number(data.batteryPercentage) === 100 ? data.batteryColour : (Number(data.pvPercentage) > 0 ? data.solarColour : data.gridColour)}"/>
                                 <stop offset="100%"

diff --git a/src/cards/full-card.ts b/src/cards/full-card.ts
@@ -440,7 +440,7 @@ export const fullCard = (config: sunsynkPowerFlowCardConfig, inverterImg: string
                           x="${[1, 2].includes(data.additionalAuxLoad) ? '238' : '306'}" y="24"
                           class="st3 left-align"
                           display="${!data.showAux || data.showDailyAux !== true ? 'none' : ''}"
-                          fill="${data.auxDynamicColour}">${localize('common.daily_aux')}
+                          fill="${data.auxDynamicColour}">${config.load.aux_daily_name}
                     </text>
                     <text id="load-power-3P" x="237" y="142"
                           display="${config.inverter.three_phase && config.entities?.load_power_L1 ? '' : 'none'}"

diff --git a/src/defaults.ts b/src/defaults.ts
@@ -69,6 +69,7 @@ export default {
         animation_speed: 4,
         max_power: 8000,
         aux_name: localize('common.aux_name'),
+        aux_daily_name: localize('common.daily_aux'),
         aux_type: 'default',
         additional_loads: 0,
         aux_loads: 0,

diff --git a/src/editor.ts b/src/editor.ts
@@ -192,6 +192,7 @@ export class SunSynkCardEditor extends ScopedRegistryHost(LitElement) implements
                                     schema: [
                                         {name: 'show_aux', selector: {boolean: {}}},
                                         {name: 'aux_name', selector: {text: {}}},
+                                        {name: 'aux_daily_name', selector: {text: {}}},
                                         {name: 'aux_type', selector: {icon: {}}},
                                         {name: 'invert_aux', selector: {boolean: {}}},
                                         {name: 'show_absolute_aux', selector: {boolean: {}}},

diff --git a/src/localize/languages/ca.json b/src/localize/languages/ca.json
@@ -153,6 +153,7 @@
       "show_absolute_aux": "Show Absolute",
       "show_nonessential": "Show Non Essential",
       "aux_name": "Aux Name",
+      "aux_daily_name": "Daily Aux Name",
       "aux_type": "Aux Icon",
       "aux_loads": "Aux Loads",
       "essential_name": "Essential Name",

diff --git a/src/localize/languages/cs.json b/src/localize/languages/cs.json
@@ -153,6 +153,7 @@
       "show_absolute_aux": "Show Absolute",
       "show_nonessential": "Show Non Essential",
       "aux_name": "Aux Name",
+      "aux_daily_name": "Daily Aux Name",
       "aux_type": "Aux Icon",
       "aux_loads": "Aux Loads",
       "essential_name": "Essential Name",

diff --git a/src/localize/languages/da.json b/src/localize/languages/da.json
@@ -153,6 +153,7 @@
       "show_absolute_aux": "Vis Absolut",
       "show_nonessential": "Vis ikke Essentiel",
       "aux_name": "Aux Navn",
+      "aux_daily_name": "Daglig Aux Navn",
       "aux_type": "Aux Ikon",
       "aux_loads": "Aux belastning",
       "essential_name": "Essentielt Navn",

diff --git a/src/localize/languages/de.json b/src/localize/languages/de.json
@@ -153,6 +153,7 @@
       "show_absolute_aux": "Show Absolute",
       "show_nonessential": "Show Non Essential",
       "aux_name": "Aux Name",
+      "aux_daily_name": "Daily Aux Name",
       "aux_type": "Aux Icon",
       "aux_loads": "Aux Loads",
       "essential_name": "Essential Name",

diff --git a/src/localize/languages/en.json b/src/localize/languages/en.json
@@ -153,6 +153,7 @@
     "show_absolute_aux": "Show Absolute",
     "show_nonessential": "Show Non Essential",
     "aux_name": "Aux Name",
+    "aux_daily_name": "Daily Aux Name",
     "aux_type": "Aux Icon",
     "aux_loads": "Aux Loads",
     "essential_name": "Essential Name",

diff --git a/src/localize/languages/es.json b/src/localize/languages/es.json
@@ -153,6 +153,7 @@
       "show_absolute_aux": "Show Absolute",
       "show_nonessential": "Show Non Essential",
       "aux_name": "Aux Name",
+      "aux_daily_name": "Daily Aux Name",
       "aux_type": "Aux Icon",
       "aux_loads": "Aux Loads",
       "essential_name": "Essential Name",

diff --git a/src/localize/languages/et.json b/src/localize/languages/et.json
@@ -153,6 +153,7 @@
       "show_absolute_aux": "Show Absolute",
       "show_nonessential": "Show Non Essential",
       "aux_name": "Aux Name",
+      "aux_daily_name": "Daily Aux Name",
       "aux_type": "Aux Icon",
       "aux_loads": "Aux Loads",
       "essential_name": "Essential Name",

diff --git a/src/localize/languages/fr.json b/src/localize/languages/fr.json
@@ -153,6 +153,7 @@
       "show_absolute_aux": "Show Absolute",
       "show_nonessential": "Show Non Essential",
       "aux_name": "Aux Name",
+      "aux_daily_name": "Daily Aux Name",
       "aux_type": "Aux Icon",
       "aux_loads": "Aux Loads",
       "essential_name": "Essential Name Name",

diff --git a/src/localize/languages/it.json b/src/localize/languages/it.json
@@ -153,6 +153,7 @@
       "show_absolute_aux": "Show Absolute",
       "show_nonessential": "Show Non Essential",
       "aux_name": "Aux Name",
+      "aux_daily_name": "Daily Aux Name",
       "aux_type": "Aux Icon",
       "aux_loads": "Aux Loads",
       "essential_name": "Essential Name",

diff --git a/src/localize/languages/nl.json b/src/localize/languages/nl.json
@@ -153,6 +153,7 @@
       "show_absolute_aux": "Show Absolute",
       "show_nonessential": "Show Non Essential",
       "aux_name": "Aux Name",
+      "aux_daily_name": "Daily Aux Name",
       "aux_type": "Aux Icon",
       "aux_loads": "Aux Loads",
       "essential_name": "Essential Name",

diff --git a/src/localize/languages/pt-br.json b/src/localize/languages/pt-br.json
@@ -153,6 +153,7 @@
       "show_absolute_aux": "Exibir absoluto_aux",
       "show_nonessential": "Exibir Desnecessário",
       "aux_name": "Nome Aux",
+      "aux_daily_name": "Daily Aux Name",
       "aux_type": "Icone Aux",
       "aux_loads": "Aux Loads",
       "essential_name": "Nome Essencial",

diff --git a/src/localize/languages/ru.json b/src/localize/languages/ru.json
@@ -153,6 +153,7 @@
       "show_absolute_aux": "Show Absolute",
       "show_nonessential": "Show Non Essential",
       "aux_name": "Aux Name",
+      "aux_daily_name": "Daily Aux Name",
       "aux_type": "Aux Icon",
       "aux_loads": "Aux Loads",
       "essential_name": "Essential Name",

diff --git a/src/localize/languages/sk.json b/src/localize/languages/sk.json
@@ -153,6 +153,7 @@
       "show_absolute_aux": "Show Absolute",
       "show_nonessential": "Show Non Essential",
       "aux_name": "Aux Name",
+      "aux_daily_name": "Daily Aux Name",
       "aux_type": "Aux Icon",
       "aux_loads": "Aux Loads",
       "essential_name": "Essential Name",

diff --git a/src/types.ts b/src/types.ts
@@ -117,6 +117,7 @@ export interface sunsynkPowerFlowCardConfig extends LovelaceCardConfig {
         animation_speed: number;
         max_power: number;
         aux_name: string;
+        aux_daily_name: string;
         aux_type: string;
         aux_colour: string;
         aux_off_colour: string;