support for energy per card #28

marq24 · marq24 · commit 43faff49c326 · 2024-11-26T10:57:13.000+01:00
diff --git a/custom_components/goecharger_api2/const.py b/custom_components/goecharger_api2/const.py
@@ -36,41 +36,35 @@
 WAN: Final = "wan"
 LAN: Final = "lan"
 
-@dataclass
-class ExtBinarySensorEntityDescription(BinarySensorEntityDescription):
+class ExtBinarySensorEntityDescription(BinarySensorEntityDescription, frozen_or_thawed=True):
     idx: int | None = None
     icon_off: str | None = None
 
 
-@dataclass
-class ExtButtonEntityDescription(ButtonEntityDescription):
+class ExtButtonEntityDescription(ButtonEntityDescription, frozen_or_thawed=True):
     payload: str | None = None
 
 
-@dataclass
-class ExtNumberEntityDescription(NumberEntityDescription):
+class ExtNumberEntityDescription(NumberEntityDescription, frozen_or_thawed=True):
     write_zero_as_null: bool | None = None
     handle_as_float: bool | None = None
     factor: int | None = None
     idx: int | str | None = None
     check_16a_limit: bool | None = None
 
-@dataclass
-class ExtSelectEntityDescription(SelectEntityDescription):
+class ExtSelectEntityDescription(SelectEntityDescription, frozen_or_thawed=True):
     idx: int | str | None = None
 
 
-@dataclass
-class ExtSensorEntityDescription(SensorEntityDescription):
+class ExtSensorEntityDescription(SensorEntityDescription, frozen_or_thawed=True):
     idx: int | str | None = None
     tuple_idx: list | None = None
     factor: int | None = None
     lookup: bool | None = None
     differential_base_key: str | None = None
 
 
-@dataclass
-class ExtSwitchEntityDescription(SwitchEntityDescription):
+class ExtSwitchEntityDescription(SwitchEntityDescription, frozen_or_thawed=True):
     is_zero_or_one: bool | None = None
     icon_off: str | None = None
     idx: int | str | None = None
@@ -1681,7 +1675,140 @@ class ExtSwitchEntityDescription(SwitchEntityDescription):
     # wsc -> later (if at all)
     # wsm -> later (if at all)
 
+    ExtSensorEntityDescription(
+        key=Tag.CARDS.key,
+        tuple_idx=[0, "energy"],
+        entity_category=EntityCategory.DIAGNOSTIC,
+        native_unit_of_measurement=UnitOfEnergy.WATT_HOUR,
+        suggested_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
+        suggested_display_precision=2,
+        state_class=SensorStateClass.TOTAL_INCREASING,
+        icon="mdi:lightning-bolt",
+        device_class=SensorDeviceClass.ENERGY,
+        entity_registry_enabled_default=True
+    ),
+    ExtSensorEntityDescription(
+        key=Tag.CARDS.key,
+        tuple_idx=[1, "energy"],
+        entity_category=EntityCategory.DIAGNOSTIC,
+        native_unit_of_measurement=UnitOfEnergy.WATT_HOUR,
+        suggested_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
+        suggested_display_precision=2,
+        state_class=SensorStateClass.TOTAL_INCREASING,
+        icon="mdi:lightning-bolt",
+        device_class=SensorDeviceClass.ENERGY,
+        entity_registry_enabled_default=False
+    ),
+    ExtSensorEntityDescription(
+        key=Tag.CARDS.key,
+        tuple_idx=[2, "energy"],
+        entity_category=EntityCategory.DIAGNOSTIC,
+        native_unit_of_measurement=UnitOfEnergy.WATT_HOUR,
+        suggested_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
+        suggested_display_precision=2,
+        state_class=SensorStateClass.TOTAL_INCREASING,
+        icon="mdi:lightning-bolt",
+        device_class=SensorDeviceClass.ENERGY,
+        entity_registry_enabled_default=False
+    ),
+    ExtSensorEntityDescription(
+        key=Tag.CARDS.key,
+        tuple_idx=[3, "energy"],
+        entity_category=EntityCategory.DIAGNOSTIC,
+        native_unit_of_measurement=UnitOfEnergy.WATT_HOUR,
+        suggested_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
+        suggested_display_precision=2,
+        state_class=SensorStateClass.TOTAL_INCREASING,
+        icon="mdi:lightning-bolt",
+        device_class=SensorDeviceClass.ENERGY,
+        entity_registry_enabled_default=False
+    ),
+    ExtSensorEntityDescription(
+        key=Tag.CARDS.key,
+        tuple_idx=[4, "energy"],
+        entity_category=EntityCategory.DIAGNOSTIC,
+        native_unit_of_measurement=UnitOfEnergy.WATT_HOUR,
+        suggested_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
+        suggested_display_precision=2,
+        state_class=SensorStateClass.TOTAL_INCREASING,
+        icon="mdi:lightning-bolt",
+        device_class=SensorDeviceClass.ENERGY,
+        entity_registry_enabled_default=False
+    ),
+    ExtSensorEntityDescription(
+        key=Tag.CARDS.key,
+        tuple_idx=[5, "energy"],
+        entity_category=EntityCategory.DIAGNOSTIC,
+        native_unit_of_measurement=UnitOfEnergy.WATT_HOUR,
+        suggested_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
+        suggested_display_precision=2,
+        state_class=SensorStateClass.TOTAL_INCREASING,
+        icon="mdi:lightning-bolt",
+        device_class=SensorDeviceClass.ENERGY,
+        entity_registry_enabled_default=False
+    ),
+    ExtSensorEntityDescription(
+        key=Tag.CARDS.key,
+        tuple_idx=[6, "energy"],
+        entity_category=EntityCategory.DIAGNOSTIC,
+        native_unit_of_measurement=UnitOfEnergy.WATT_HOUR,
+        suggested_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
+        suggested_display_precision=2,
+        state_class=SensorStateClass.TOTAL_INCREASING,
+        icon="mdi:lightning-bolt",
+        device_class=SensorDeviceClass.ENERGY,
+        entity_registry_enabled_default=False
+    ),
+    ExtSensorEntityDescription(
+        key=Tag.CARDS.key,
+        tuple_idx=[7, "energy"],
+        entity_category=EntityCategory.DIAGNOSTIC,
+        native_unit_of_measurement=UnitOfEnergy.WATT_HOUR,
+        suggested_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
+        suggested_display_precision=2,
+        state_class=SensorStateClass.TOTAL_INCREASING,
+        icon="mdi:lightning-bolt",
+        device_class=SensorDeviceClass.ENERGY,
+        entity_registry_enabled_default=False
+    ),
+    ExtSensorEntityDescription(
+        key=Tag.CARDS.key,
+        tuple_idx=[8, "energy"],
+        entity_category=EntityCategory.DIAGNOSTIC,
+        native_unit_of_measurement=UnitOfEnergy.WATT_HOUR,
+        suggested_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
+        suggested_display_precision=2,
+        state_class=SensorStateClass.TOTAL_INCREASING,
+        icon="mdi:lightning-bolt",
+        device_class=SensorDeviceClass.ENERGY,
+        entity_registry_enabled_default=False
+    ),
+    ExtSensorEntityDescription(
+        key=Tag.CARDS.key,
+        tuple_idx=[9, "energy"],
+        entity_category=EntityCategory.DIAGNOSTIC,
+        native_unit_of_measurement=UnitOfEnergy.WATT_HOUR,
+        suggested_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
+        suggested_display_precision=2,
+        state_class=SensorStateClass.TOTAL_INCREASING,
+        icon="mdi:lightning-bolt",
+        device_class=SensorDeviceClass.ENERGY,
+        entity_registry_enabled_default=False
+    ),
+    ExtSensorEntityDescription(
+        key=Tag.CARDS.key,
+        tuple_idx=[10, "energy"],
+        entity_category=EntityCategory.DIAGNOSTIC,
+        native_unit_of_measurement=UnitOfEnergy.WATT_HOUR,
+        suggested_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
+        suggested_display_precision=2,
+        state_class=SensorStateClass.TOTAL_INCREASING,
+        icon="mdi:lightning-bolt",
+        device_class=SensorDeviceClass.ENERGY,
+        entity_registry_enabled_default=False
+    ),
 ]
+
 SWITCH_SENSORS = [
     ExtSwitchEntityDescription(
         key=Tag.ACP.key,
diff --git a/custom_components/goecharger_api2/manifest.json b/custom_components/goecharger_api2/manifest.json
@@ -11,5 +11,5 @@
   "iot_class": "local_polling",
   "issue_tracker": "https://github.com/marq24/ha-goecharger-api2/issues",
   "requirements": [],
-  "version": "2024.11.0"
+  "version": "2024.11.1"
 }
diff --git a/custom_components/goecharger_api2/pygoecharger_ha/__init__.py b/custom_components/goecharger_api2/pygoecharger_ha/__init__.py
@@ -145,6 +145,7 @@ async def read_all_states(self):
 
     async def force_config_update(self):
         self._LAST_CONFIG_UPDATE_TS = 0
+        self._LAST_FULL_STATE_UPDATE_TS = 0
         await self.read_all_config()
 
     async def read_all_config(self):
diff --git a/custom_components/goecharger_api2/pygoecharger_ha/const.py b/custom_components/goecharger_api2/pygoecharger_ha/const.py
@@ -12,8 +12,8 @@
 # rbt: is the reboot time - and "looks like", that all other timestamps use the rbt "as" start point
 FILTER_TIMES_ADDON: Final = ",rbt,fsptws,inva,lbp,lccfc,lccfi,lcctc,lfspt,lmsc,lpsc,lcs"
 
-FILTER_ALL_STATES: Final = "acu,adi,amt,atp,awcp,car,cbl,ccu,ccw,cdi,cll,cus,deltaa,deltap,err,eto,ffb,fhz,fsp,fsptws,inva,lbp,lccfc,lccfi,lcctc,lck,lfspt,lmsc,loa,lpsc,mcpea,mmp,modelStatus,nif,nrg,pakku,pgrid,pha,pnp,ppv,pvopt_averagePAkku,pvopt_averagePGrid,pvopt_averagePPv,pwm,rbc,rbt,rfb,rssi,rst,tlf,tls,tma,tpa,trx,wh,wsms,wst"
-FILTER_ALL_CONFIG: Final = "acp,acs,ama,amp,ara,ate,att,awc,awe,awp,bac,cch,cco,cfi,cid,clp,cmse,cwc,cwe,dwo,esk,fmt,fna,frc,frm,fst,fup,fzf,hsa,lbr,lmo,loe,lof,log,lop,lot,loty,lse,map,mca,mci,mcpd,mptwt,mpwst,nmo,pgt,po,psh,psm,psmd,rdbf,rdbs,rdef,rdes,rdre,rdpl,sch_satur,sch_sund,sch_week,sdp,sh,spl3,su,sua,sumd,tds,tof,upo,ust,zfo"
+FILTER_ALL_STATES: Final = "acu,adi,amt,atp,awcp,car,cards,cbl,ccu,ccw,cdi,cll,cus,deltaa,deltap,err,eto,ffb,fhz,fsp,fsptws,inva,lbp,lccfc,lccfi,lcctc,lck,lfspt,lmsc,loa,lpsc,mcpea,mmp,modelStatus,nif,nrg,pakku,pgrid,pha,pnp,ppv,pvopt_averagePAkku,pvopt_averagePGrid,pvopt_averagePPv,pwm,rbc,rbt,rfb,rssi,rst,tlf,tls,tma,tpa,trx,wh,wsms,wst"
+FILTER_ALL_CONFIG: Final = "acp,acs,ama,amp,ara,ate,att,awc,awe,awp,bac,cards,cch,cco,cfi,cid,clp,cmse,cwc,cwe,dwo,esk,fmt,fna,frc,frm,fst,fup,fzf,hsa,lbr,lmo,loe,lof,log,lop,lot,loty,lse,map,mca,mci,mcpd,mptwt,mpwst,nmo,pgt,po,psh,psm,psmd,rdbf,rdbs,rdef,rdes,rdre,rdpl,sch_satur,sch_sund,sch_week,sdp,sh,spl3,su,sua,sumd,tds,tof,upo,ust,zfo"
 
 FILTER_NOT_USED: Final = "mcc,mcca,mce,mcr,mcs,mcu,men,mlr,mlra,mqcn,mqg,mqss,msb,msp,msr,mtp,ocppai,ocppi,rdbfe,rdbse,rdefe,rdese,rdree,rdple"
 
diff --git a/custom_components/goecharger_api2/select.py b/custom_components/goecharger_api2/select.py
@@ -32,8 +32,25 @@ async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry, add_
 class GoeChargerSelect(GoeChargerBaseEntity, SelectEntity):
     def __init__(self, coordinator: GoeChargerDataUpdateCoordinator, description: ExtSelectEntityDescription):
         if description.key == Tag.TRX.key:
-            options = ["null", "0"]
-            description.options = options + coordinator.available_cards_idx
+            new_options = ["null", "0"] + coordinator.available_cards_idx
+            # ok we need to create a new entity description with the new options...
+            # [since ExtSelectEntityDescription is frozen]
+            description = ExtSelectEntityDescription (
+                key = description.key,
+                device_class = description.device_class,
+                entity_category = description.entity_category,
+                entity_registry_enabled_default = description.entity_registry_enabled_default,
+                entity_registry_visible_default = description.entity_registry_visible_default,
+                force_update = description.force_update,
+                icon = description.icon,
+                has_entity_name = description.has_entity_name,
+                name = description.name,
+                translation_key = description.translation_key,
+                translation_placeholders = description.translation_placeholders,
+                unit_of_measurement = description.unit_of_measurement,
+                options = new_options,
+                idx = description.idx,
+            )
         super().__init__(coordinator=coordinator, description=description)
 
     @property
diff --git a/custom_components/goecharger_api2/translations/de.json b/custom_components/goecharger_api2/translations/de.json
@@ -94,7 +94,7 @@
       "esk": {"name": "Gesetzte Lademenge kWh (Anzeige)"},
       "fsp": {"name": "1-phasiges Laden erzwingen"},
       "tlf": {"name": "Test-Ladung abgeschlossen"},
-      "tls": {"name": "Test-Ladung gestartet"}        
+      "tls": {"name": "Test-Ladung gestartet"}
     },
     "button": {
       "rst": {"name":  "go-e Neustarten"},
@@ -384,23 +384,23 @@
 
       "isv_0_i": {"name": "Strom Internal 1"},
       "isv_0_p": {"name": "Leistung Internal 1"},
-      "isv_0_f": {"name": "Leistungsfaktor Internal 1"},      
+      "isv_0_f": {"name": "Leistungsfaktor Internal 1"},
       "isv_1_i": {"name": "Strom Internal 2"},
       "isv_1_p": {"name": "Leistung Internal 2"},
-      "isv_1_f": {"name": "Leistungsfaktor Internal 2"},        
+      "isv_1_f": {"name": "Leistungsfaktor Internal 2"},
       "isv_2_i": {"name": "Strom Internal 3"},
       "isv_2_p": {"name": "Leistung Internal 3"},
-      "isv_2_f": {"name": "Leistungsfaktor Internal 3"},        
+      "isv_2_f": {"name": "Leistungsfaktor Internal 3"},
       "isv_3_i": {"name": "Strom Internal 4"},
       "isv_3_p": {"name": "Leistung Internal 4"},
-      "isv_3_f": {"name": "Leistungsfaktor Internal 4"},        
+      "isv_3_f": {"name": "Leistungsfaktor Internal 4"},
       "isv_4_i": {"name": "Strom Internal 5"},
       "isv_4_p": {"name": "Leistung Internal 5"},
-      "isv_4_f": {"name": "Leistungsfaktor Internal 5"},        
+      "isv_4_f": {"name": "Leistungsfaktor Internal 5"},
       "isv_5_i": {"name": "Strom Internal 6"},
       "isv_5_p": {"name": "Leistung Internal 6"},
       "isv_5_f": {"name": "Leistungsfaktor Internal 6"},
-      
+
       "cec_0_0": {"name": "Kategorie 1 Zähler Verbrauch"},
       "cec_0_1": {"name": "Kategorie 1 Zähler Überschuss"},
       "cec_1_0": {"name": "Kategorie 2 Zähler Verbrauch"},
@@ -452,7 +452,19 @@
       "ccp_15": {"name": "Kategorie 16 Leistung"},
 
       "mecu": {"name": "MEC Meter Url"},
-      "mmh": {"name": "Modbus Master Host"}
+      "mmh": {"name": "Modbus Master Host"},
+
+      "cards_0_energy": {"name": "Lademenge Karte"},
+      "cards_1_energy": {"name": "Lademenge Karte 1"},
+      "cards_2_energy": {"name": "Lademenge Karte 2"},
+      "cards_3_energy": {"name": "Lademenge Karte 3"},
+      "cards_4_energy": {"name": "Lademenge Karte 4"},
+      "cards_5_energy": {"name": "Lademenge Karte 5"},
+      "cards_6_energy": {"name": "Lademenge Karte 6"},
+      "cards_7_energy": {"name": "Lademenge Karte 7"},
+      "cards_8_energy": {"name": "Lademenge Karte 8"},
+      "cards_9_energy": {"name": "Lademenge Karte 9"},
+      "cards_10_energy": {"name": "Lademenge Karte 10"}
     },
     "switch": {
       "acp": {"name": "Ladepausen zulassen (Fahrzeug Kompatibilität)"},
diff --git a/custom_components/goecharger_api2/translations/en.json b/custom_components/goecharger_api2/translations/en.json
@@ -94,7 +94,7 @@
       "esk": {"name": "energy set kwh (only stored for app)"},
       "fsp": {"name": "Force single phase"},
       "tlf": {"name": "Test charging finished"},
-      "tls": {"name": "Test charging started"}    
+      "tls": {"name": "Test charging started"}
     },
     "button": {
       "rst": {"name":  "Restart go-e device"},
@@ -387,16 +387,16 @@
       "isv_0_f": {"name": "Power factor Internal 1"},
       "isv_1_i": {"name": "Ampere Internal 2"},
       "isv_1_p": {"name": "Power Internal 2"},
-      "isv_1_f": {"name": "Power factor Internal 2"},   
+      "isv_1_f": {"name": "Power factor Internal 2"},
       "isv_2_i": {"name": "Ampere Internal 3"},
       "isv_2_p": {"name": "Power Internal 3"},
-      "isv_2_f": {"name": "Power factor Internal 3"},    
+      "isv_2_f": {"name": "Power factor Internal 3"},
       "isv_3_i": {"name": "Ampere Internal 4"},
       "isv_3_p": {"name": "Power Internal 4"},
-      "isv_3_f": {"name": "Power factor Internal 4"},    
+      "isv_3_f": {"name": "Power factor Internal 4"},
       "isv_4_i": {"name": "Ampere Internal 5"},
       "isv_4_p": {"name": "Power Internal 5"},
-      "isv_4_f": {"name": "Power factor Internal 5"},     
+      "isv_4_f": {"name": "Power factor Internal 5"},
       "isv_5_i": {"name": "Ampere Internal 6"},
       "isv_5_p": {"name": "Power Internal 6"},
       "isv_5_f": {"name": "Power factor Internal 6"},
@@ -452,7 +452,19 @@
       "ccp_15": {"name": "Category 16 Power"},
 
       "mecu": {"name": "MEC meter url"},
-      "mmh": {"name": "Modbus master host"}
+      "mmh": {"name": "Modbus master host"},
+
+      "cards_0_energy": {"name": "Energy Card"},
+      "cards_1_energy": {"name": "Energy Card 1"},
+      "cards_2_energy": {"name": "Energy Card 2"},
+      "cards_3_energy": {"name": "Energy Card 3"},
+      "cards_4_energy": {"name": "Energy Card 4"},
+      "cards_5_energy": {"name": "Energy Card 5"},
+      "cards_6_energy": {"name": "Energy Card 6"},
+      "cards_7_energy": {"name": "Energy Card 7"},
+      "cards_8_energy": {"name": "Energy Card 8"},
+      "cards_9_energy": {"name": "Energy Card 9"},
+      "cards_10_energy": {"name": "Energy Card 10"}
     },
     "switch": {
       "acp": {"name": "Allow Charge Pause (car compatibility)"},

Original file line number	Diff line number	Diff line change
`@@ -11,5 +11,5 @@`
`11`	`11`	`"iot_class": "local_polling",`
`12`	`12`	`"issue_tracker": "https://github.com/marq24/ha-goecharger-api2/issues",`
`13`	`13`	`"requirements": [],`
`14`		`- "version": "2024.11.0"`
	`14`	`+ "version": "2024.11.1"`
`15`	`15`	`}`