Merge pull request #988 from plugwise/follow-core

Implement recent Core updates, fix logger

Author: bouwew

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 Versions from 0.40 and up
 
+## Ongoing
+
+- Implement Core PR's [#158901](https://github.com/home-assistant/core/pull/158901) and [#158094](https://github.com/home-assistant/core/pull/158094)
+
 ## v0.62.0
 
 - Improve automatic deletion of device(s) removed from the backend output, via PR [$982](https://github.com/plugwise/plugwise-beta/pull/982)

custom_components/plugwise/binary_sensor.py

@@ -139,7 +139,7 @@ def _add_entities() -> None:
                     continue
                 entities.append(PlugwiseBinarySensorEntity(coordinator, device_id, description))
                 LOGGER.debug(
-                    "Add %s %s binary sensor", device["name"], description.translation_key
+                    "Add %s %s binary sensor", device["name"], description.translation_key or description.key
                 )
         async_add_entities(entities)
 

custom_components/plugwise/entity.py

@@ -42,40 +42,43 @@ def __init__(
         super().__init__(coordinator)
         self._dev_id = device_id
 
-        configuration_url: str | None = None
-        if (
-            device_id == coordinator.api.gateway_id
-            and (entry := self.coordinator.config_entry)
-        ):
-            configuration_url = f"http://{entry.data[CONF_HOST]}"
-
-        data = coordinator.data[device_id]
+        api = coordinator.api
+        gateway_id = api.gateway_id
+        entry = coordinator.config_entry
+
+        # Link configuration-URL for the gateway device
+        configuration_url = (
+            f"http://{entry.data[CONF_HOST]}"
+            if device_id == gateway_id and entry
+            else None
+        )
+
+        # Build connections set
         connections = set()
-        if mac := data.get(MAC_ADDRESS):
+        if mac := self.device.get(MAC_ADDRESS):
             connections.add((CONNECTION_NETWORK_MAC, mac))
-        if mac := data.get(ZIGBEE_MAC_ADDRESS):
-            connections.add((CONNECTION_ZIGBEE, mac))
+        if zigbee_mac := self.device.get(ZIGBEE_MAC_ADDRESS):
+            connections.add((CONNECTION_ZIGBEE, zigbee_mac))
 
+        # Set base device info
         self._attr_device_info = DeviceInfo(
             configuration_url=configuration_url,
             identifiers={(DOMAIN, device_id)},
             connections=connections,
-            manufacturer=data.get(VENDOR),
-            model=data.get(MODEL),
-            model_id=data.get(MODEL_ID),
-            name=coordinator.api.smile.name,
-            sw_version=data.get(FIRMWARE),
-            hw_version=data.get(HARDWARE),
+            manufacturer=self.device.get(VENDOR),
+            model=self.device.get(MODEL),
+            model_id=self.device.get(MODEL_ID),
+            name=api.smile.name,
+            sw_version=self.device.get(FIRMWARE),
+            hw_version=self.device.get(HARDWARE),
         )
 
-        if device_id != coordinator.api.gateway_id:
+        # Add extra info if not the gateway device
+        if device_id != gateway_id:
             self._attr_device_info.update(
                 {
-                    ATTR_NAME: data.get(ATTR_NAME),
-                    ATTR_VIA_DEVICE: (
-                        DOMAIN,
-                        str(self.coordinator.api.gateway_id),
-                    ),
+                    ATTR_NAME: self.device.get(ATTR_NAME),
+                    ATTR_VIA_DEVICE: (DOMAIN, gateway_id),
                 }
             )
 

custom_components/plugwise/select.py

@@ -47,7 +47,6 @@ class PlugwiseSelectEntityDescription(SelectEntityDescription):
     PlugwiseSelectEntityDescription(
         key=SELECT_SCHEDULE,
         translation_key=SELECT_SCHEDULE,
-        entity_category=EntityCategory.CONFIG,
         options_key=AVAILABLE_SCHEDULES,
     ),
     PlugwiseSelectEntityDescription(