Fixed control error entity (reading from trouble codes now), maybe fi…

…xed an error with reading trouble codes from the API, setting manufacturer info from the brand on entities

.pre-commit-config.yaml

@@ -62,7 +62,7 @@ repos:
           - aioresponses
           - pytest
           - types-requests
-          - myPyllant==0.5.7
+          - myPyllant==0.5.8
           - polyfactory
   - repo: local
     hooks:

custom_components/mypyllant/binary_sensor.py

@@ -1,6 +1,8 @@
 from __future__ import annotations
 
 import logging
+from collections.abc import Mapping
+from typing import Any
 
 from homeassistant.components.binary_sensor import (
     BinarySensorDeviceClass,
@@ -33,6 +35,7 @@ async def async_setup_entry(
 
     sensors: list[BinarySensorEntity] = []
     for index, system in enumerate(coordinator.data):
+        sensors.append(ClaimEntity(index, coordinator))
         sensors.append(ControlError(index, coordinator))
         sensors.append(ControlOnline(index, coordinator))
         sensors.append(FirmwareUpdateRequired(index, coordinator))
@@ -42,6 +45,45 @@ async def async_setup_entry(
     async_add_entities(sensors)
 
 
+class ClaimEntity(CoordinatorEntity, BinarySensorEntity):
+    def __init__(
+        self,
+        system_index: int,
+        coordinator: SystemCoordinator,
+    ):
+        super().__init__(coordinator)
+        self.system_index = system_index
+
+    @property
+    def system(self) -> System:
+        return self.coordinator.data[self.system_index]
+
+    @property
+    def entity_category(self) -> EntityCategory | None:
+        return EntityCategory.DIAGNOSTIC
+
+    @property
+    def extra_state_attributes(self) -> Mapping[str, Any] | None:
+        attr = {
+            "firmware": self.system.claim.firmware,
+        }
+        return attr
+
+    @property
+    def device_info(self):
+        return DeviceInfo(
+            identifiers={(DOMAIN, f"claim{self.system.id}")},
+            name=self.system.claim.nomenclature,
+            manufacturer=self.system.brand_name,
+            model=self.system.claim.nomenclature,
+            sw_version=self.system.claim.firmware_version,
+        )
+
+    @property
+    def name(self) -> str:
+        return self.system.claim.name
+
+
 class SystemControlEntity(CoordinatorEntity, BinarySensorEntity):
     def __init__(
         self,
@@ -96,7 +138,7 @@ def device_info(self) -> DeviceInfo | None:
         return DeviceInfo(
             identifiers={(DOMAIN, f"circuit{self.circuit.index}")},
             name=self.circuit_name,
-            manufacturer="Vaillant",
+            manufacturer=self.system.brand_name,
         )
 
 
@@ -109,14 +151,20 @@ def __init__(
         super().__init__(system_index, coordinator)
         self.entity_id = f"{DOMAIN}.control_error_{system_index}"
 
+    @property
+    def extra_state_attributes(self) -> Mapping[str, Any] | None:
+        attr = {
+            "diagnostic_trouble_codes": self.system.diagnostic_trouble_codes,
+        }
+        return attr
+
     @property
     def is_on(self) -> bool | None:
-        # TODO: Find replacement
-        return False
+        return self.system.has_diagnostic_trouble_codes
 
     @property
     def name(self) -> str:
-        return f"Error {self.system.system_name}"
+        return f"Trouble Codes on {self.system.system_name}"
 
     @property
     def unique_id(self) -> str:

custom_components/mypyllant/climate.py

@@ -183,7 +183,7 @@ def device_info(self) -> DeviceInfo:
         return DeviceInfo(
             identifiers={(DOMAIN, f"zone{self.zone.index}")},
             name=self.name,
-            manufacturer="Vaillant",
+            manufacturer=self.system.brand_name,
         )
 
     @property

custom_components/mypyllant/manifest.json

@@ -7,6 +7,6 @@
   "integration_type": "hub",
   "iot_class": "cloud_polling",
   "issue_tracker": "https://github.com/signalkraft/issues",
-  "requirements": ["myPyllant==0.5.7"],
-  "version": "0.5.1"
+  "requirements": ["myPyllant==0.5.8"],
+  "version": "0.5.2b0"
 }

custom_components/mypyllant/sensor.py

@@ -644,7 +644,7 @@ def device_info(self):
         return DeviceInfo(
             identifiers={(DOMAIN, f"device{self.device.device_uuid}")},
             name=self.device.name_display,
-            manufacturer="Vaillant",
+            manufacturer=self.device.brand_name,
             model=self.device.product_name_display,
         )
 

custom_components/mypyllant/water_heater.py

@@ -73,7 +73,7 @@ def device_info(self) -> DeviceInfo:
                 (DOMAIN, f"domestic_hot_water{self.domestic_hot_water.index}")
             },
             name=self.name,
-            manufacturer="Vaillant",
+            manufacturer=self.system.brand_name,
         )
 
     @property

requirements.test.txt

@@ -1,4 +1,4 @@
-myPyllant==0.5.7
+myPyllant==0.5.8
 aioresponses==0.7.4
 coverage>=6.3.1
 croniter>=1.3.8

tests/test_binary_sensor.py

@@ -6,6 +6,7 @@
 from custom_components.mypyllant.binary_sensor import (
     CircuitEntity,
     CircuitIsCoolingAllowed,
+    ClaimEntity,
     ControlError,
     ControlOnline,
     SystemControlEntity,
@@ -23,6 +24,13 @@ async def test_system_binary_sensors(
         system = SystemControlEntity(0, system_coordinator_mock)
         assert isinstance(system.device_info, dict)
 
+        system = ClaimEntity(0, system_coordinator_mock)
+        assert isinstance(system.device_info, dict)
+        assert (
+            system.extra_state_attributes
+            and "firmware" in system.extra_state_attributes
+        )
+
         circuit = CircuitEntity(0, 0, system_coordinator_mock)
         assert isinstance(circuit.device_info, dict)
         assert isinstance(circuit.system, System)