refactor: Added Grid prefix for Export Surplus

davidrapan · Jul 18, 2024 · 709df97 · 709df97
1 parent 0549e54
commit 709df97
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 6 deletions.
diff --git a/custom_components/solarman/inverter_definitions/deye_sg01hp3.yaml b/custom_components/solarman/inverter_definitions/deye_sg01hp3.yaml
@@ -207,7 +207,7 @@ parameters:
           step: 0.1
         icon: "mdi:battery"
 
-      - name: "Zero Export power"
+      - name: "Grid Zero Export power"
         class: "power"
         state_class: "measurement"
         uom: "W"
@@ -389,7 +389,8 @@ parameters:
 
   - group: Work Mode
     items:
-      - name: Export Surplus
+      - name: Grid Export Surplus
+        alt: Solar Sell
         update_interval: 30
         class: "switch"
         state_class: ""
@@ -1363,6 +1364,7 @@ parameters:
 
       # Grid - The power is S16bit (low 16 bits) + S16bit (high 16 bits)
       - name: "Grid Power"
+        desciption: Combined power of all three phases
         realtime:
         class: "measurement"
         state_class: "measurement"
@@ -1610,6 +1612,7 @@ parameters:
 
       # Load - The Power is S16bit (low 16 bits) + S16bit (high 16 bits)
       - name: "Load Power"
+        desciption: Combined power of all three phases
         realtime:
         class: "power"
         state_class: "measurement"
@@ -1679,6 +1682,7 @@ parameters:
 
       # SmartLoad/Generator - The Power is S16bit (low 16 bits) + S16bit (high 16 bits)
       - name: "SmartLoad Power"
+        desciption: Combined power of all three phases
         realtime:
         class: "power"
         state_class: "measurement"
@@ -1691,6 +1695,7 @@ parameters:
     items:
       # PV - The combined power of Input 1 & 2 & 3 & 4 (L:1W, H:10W)
       - name: "PV Power"
+        desciption: Combined power of all inputs
         realtime:
         class: "power"
         state_class: "measurement"

diff --git a/custom_components/solarman/inverter_definitions/deye_sg04lp3.yaml b/custom_components/solarman/inverter_definitions/deye_sg04lp3.yaml
@@ -213,7 +213,7 @@ parameters:
           step: 0.1
         icon: "mdi:battery"
 
-      - name: "Zero Export power"
+      - name: "Grid Zero Export power"
         class: "power"
         state_class: "measurement"
         uom: "W"
@@ -395,7 +395,8 @@ parameters:
 
   - group: Work Mode
     items:
-      - name: Export Surplus
+      - name: Grid Export Surplus
+        alt: Solar Sell
         update_interval: 30
         class: "switch"
         state_class: ""
@@ -1369,6 +1370,7 @@ parameters:
 
       # Grid - The power is S16bit (low 16 bits) + S16bit (high 16 bits)
       - name: "Grid Power"
+        desciption: Combined power of all three phases
         realtime:
         class: "measurement"
         state_class: "measurement"
@@ -1611,6 +1613,7 @@ parameters:
 
       # Load - The Power is S16bit (low 16 bits) + S16bit (high 16 bits)
       - name: "Load Power"
+        desciption: Combined power of all three phases
         realtime:
         class: "power"
         state_class: "measurement"
@@ -1680,6 +1683,7 @@ parameters:
 
       # SmartLoad/Generator - The Power is S16bit (low 16 bits) + S16bit (high 16 bits)
       - name: "SmartLoad Power"
+        desciption: Combined power of all three phases
         realtime:
         class: "power"
         state_class: "measurement"
@@ -1692,6 +1696,7 @@ parameters:
     items:
       # PV - The combined power of Input 1 & 2 & 3 & 4 (L:1W, H:10W)
       - name: "PV Power"
+        desciption: Combined power of all inputs
         realtime:
         class: "power"
         state_class: "measurement"

diff --git a/custom_components/solarman/inverter_definitions/deye_sun-12k-sg04lp3.yaml b/custom_components/solarman/inverter_definitions/deye_sun-12k-sg04lp3.yaml
@@ -215,7 +215,7 @@ parameters:
           step: 0.1
         icon: "mdi:battery"
 
-      - name: "Zero Export power"
+      - name: "Grid Zero Export power"
         class: "power"
         state_class: "measurement"
         uom: "W"
@@ -397,7 +397,8 @@ parameters:
 
   - group: Work Mode
     items:
-      - name: Export Surplus
+      - name: Grid Export Surplus
+        alt: Solar Sell
         update_interval: 30
         class: "switch"
         state_class: ""
@@ -1381,6 +1382,7 @@ parameters:
 
       # Grid - The power is S16bit (low 16 bits) + S16bit (high 16 bits)
       - name: "Grid Power"
+        desciption: Combined power of all three phases
         realtime:
         class: "measurement"
         state_class: "measurement"
@@ -1392,6 +1394,7 @@ parameters:
 
       # Grid - The inverted power is S16bit (low 16 bits) + S16bit (high 16 bits)
       - name: "Grid Power ∇"
+        desciption: Combined power of all three phases
         entity_id: "grid_power_inverted"
         realtime:
         class: "measurement"
@@ -1636,6 +1639,7 @@ parameters:
 
       # Load - The Power is S16bit (low 16 bits) + S16bit (high 16 bits)
       - name: "Load Power"
+        desciption: Combined power of all three phases
         realtime:
         class: "power"
         state_class: "measurement"
@@ -1705,6 +1709,7 @@ parameters:
 
       # SmartLoad/Generator - The Power is S16bit (low 16 bits) + S16bit (high 16 bits)
       - name: "SmartLoad Power"
+        desciption: Combined power of all three phases
         realtime:
         class: "power"
         state_class: "measurement"
@@ -1717,6 +1722,7 @@ parameters:
     items:
       # PV - The combined power of Input 1 & 2 & 3 & 4 (L:1W, H:10W)
       - name: "PV Power"
+        desciption: Combined power of all inputs
         realtime:
         class: "power"
         state_class: "measurement"

diff --git a/custom_components/solarman/sensor.py b/custom_components/solarman/sensor.py
@@ -112,6 +112,12 @@ def __init__(self, coordinator, sensor, battery_nominal_voltage, battery_life_cy
         if "unit_of_measurement" in sensor and (unit_of_measurement := sensor["unit_of_measurement"]):
             self._attr_unit_of_measurement = unit_of_measurement
 
+        if "alt" in sensor and (alt := sensor["alt"]):
+            self._attr_extra_state_attributes = self._attr_extra_state_attributes | { "Alt Name": alt }
+
+        if "description" in sensor and (description := sensor["description"]):
+            self._attr_extra_state_attributes = self._attr_extra_state_attributes | { "description": description }
+
         if "options" in sensor and (options := sensor["options"]):
             self._attr_options = options
             self._attr_extra_state_attributes = self._attr_extra_state_attributes | { "options": options }