Patch Update

Author: lunDreame

custom_components/kocom_wallpad/binary_sensor.py

@@ -15,13 +15,7 @@
 
 from .pywallpad.const import STATE, CODE, TIME
 from .pywallpad.enums import DeviceType
-from .pywallpad.packet import (
-    KocomPacket,
-    ThermostatPacket,
-    FanPacket,
-    MotionPacket,
-    DoorPhonePacket,
-)
+from .pywallpad.packet import KocomPacket
 
 from .gateway import KocomGateway
 from .entity import KocomEntity
@@ -39,8 +33,7 @@ async def async_setup_entry(
     @callback
     def async_add_binary_sensor(packet: KocomPacket) -> None:
         """Add new binary sensor entity."""
-        if isinstance(packet, (ThermostatPacket, FanPacket, MotionPacket, DoorPhonePacket)):
-            async_add_entities([KocomBinarySensorEntity(gateway, packet)])
+        async_add_entities([KocomBinarySensorEntity(gateway, packet)])
 
     for entity in gateway.get_entities(Platform.BINARY_SENSOR):
         async_add_binary_sensor(entity)

custom_components/kocom_wallpad/const.py

@@ -27,7 +27,7 @@
 BRAND_NAME = "Kocom"
 MANUFACTURER = "KOCOM Co., Ltd"
 MODEL = "Smart Wallpad"
-SW_VERSION = "1.1.0"
+SW_VERSION = "1.1.1"
 
 DEVICE_TYPE = "device_type"
 ROOM_ID = "room_id"
@@ -48,3 +48,10 @@
     EVPacket: Platform.SWITCH,
     DoorPhonePacket: Platform.SWITCH,
 }
+
+PLATFORM_PACKET_TYPE: tuple[type[KocomPacket], ...] = (
+    ThermostatPacket,
+    FanPacket,
+    EVPacket,
+    DoorPhonePacket,
+)

custom_components/kocom_wallpad/entity.py

@@ -2,7 +2,6 @@
 
 from __future__ import annotations
 
-from homeassistant.const import CONF_UNIQUE_ID
 from homeassistant.core import callback
 from homeassistant.helpers.entity import DeviceInfo
 from homeassistant.helpers.restore_state import RestoreEntity, RestoredExtraData
@@ -49,8 +48,15 @@ def __init__(
             DEVICE_TYPE: self.packet._device.device_type,
             ROOM_ID: self.packet._device.room_id,
             SUB_ID: self.packet._device.sub_id,
-            CONF_UNIQUE_ID: self.unique_id,
         }
+        self._attr_device_info = DeviceInfo(
+            identifiers={(DOMAIN, f"{BRAND_NAME}_{self.packet._device.device_type}_{self.gateway.host}".lower())},
+            manufacturer=MANUFACTURER,
+            model=MODEL,
+            name=f"{BRAND_NAME} {process_string(self.packet._device.device_type)}",
+            sw_version=SW_VERSION,
+            via_device=(DOMAIN, self.gateway.host),
+        )
 
     @property
     def device_id(self) -> str:
@@ -59,27 +65,13 @@ def device_id(self) -> str:
             self.packet._device.device_type,
             self.packet._device.room_id,
             self.packet._device.sub_id
-        )
+        ).lower()
 
     @property
     def device_name(self) -> str:
         """Return the device name."""
         return process_string(self.device_id.replace("_", " "))
 
-    @property
-    def device_info(self) -> DeviceInfo:
-        """Return the device information."""
-        return DeviceInfo(
-            identifiers={
-                (DOMAIN, f"{BRAND_NAME}_{self.packet._device.device_type}_{self.gateway.entry.unique_id}".lower())
-            },
-            manufacturer=MANUFACTURER,
-            model=MODEL,
-            name=f"{BRAND_NAME} {process_string(self.packet._device.device_type)}",
-            sw_version=SW_VERSION,
-            via_device=(DOMAIN, self.gateway.entry.unique_id),
-        )
-        
     @property
     def available(self) -> bool:
         """Return True if entity is available."""
@@ -88,7 +80,7 @@ def available(self) -> bool:
     @callback
     def async_handle_packet_update(self, packet: KocomPacket) -> None:
         """Handle packet update."""
-        if self.packet.packet != packet.packet:
+        if self.packet._device.state != packet._device.state:
             self.packet = packet
             self.async_write_ha_state()
 
@@ -116,4 +108,6 @@ async def send_packet(
         self, packet: bytearray | list[tuple[bytearray, float | None]]
     ) -> None:
         """Send a packet to the gateway."""
+        if not packet:
+            return
         return await self.gateway.client.send_packet(packet)

custom_components/kocom_wallpad/gateway.py

@@ -8,11 +8,10 @@
 from homeassistant.helpers.dispatcher import async_dispatcher_send
 from homeassistant.helpers import entity_registry as er, restore_state
 
-from dataclasses import dataclass
-
 from .pywallpad.client import KocomClient, verify_crc
 from .pywallpad.const import (
     ERROR,
+    HOTWATER,
     CO2,
     TEMPERATURE,
     DIRECTION,
@@ -21,17 +20,20 @@
 )
 from .pywallpad.packet import (
     KocomPacket,
-    ThermostatPacket,
-    FanPacket,
-    EVPacket,
-    DoorPhonePacket,
     PacketParser,
     DoorPhoneParser,
 )
 
 from .connection import RS485Connection
 from .util import create_dev_id, decode_base64_to_bytes
-from .const import LOGGER, DOMAIN, PACKET_DATA, LAST_DATA, PLATFORM_MAPPING
+from .const import (
+    LOGGER,
+    DOMAIN,
+    PACKET_DATA,
+    LAST_DATA, 
+    PLATFORM_MAPPING,
+    PLATFORM_PACKET_TYPE,
+)
 
 
 class KocomGateway:
@@ -137,17 +139,18 @@ def parse_platform(self, packet: KocomPacket) -> Platform | None:
             LOGGER.warning(f"Unrecognized platform type: {type(packet).__name__}")
             return None
 
-        platform_packet_types = (ThermostatPacket, FanPacket, EVPacket, DoorPhonePacket)
-        if isinstance(packet, platform_packet_types) and (sub_id := packet._device.sub_id):
+        if (isinstance(packet, PLATFORM_PACKET_TYPE) and (sub_id := packet._device.sub_id)):
             if ERROR in sub_id:
                 platform = Platform.BINARY_SENSOR
+            elif HOTWATER == sub_id:
+                platform = Platform.SWITCH
             elif CO2 in sub_id:
                 platform = Platform.SENSOR
             elif TEMPERATURE in sub_id:
                 platform = Platform.SENSOR
             elif sub_id in {DIRECTION, FLOOR}:  # EV
                 platform = Platform.SENSOR
-            elif sub_id in RING:  # DoorPhone
+            elif sub_id in RING:                # Door Phone
                 platform = Platform.BINARY_SENSOR
 
         return platform

custom_components/kocom_wallpad/manifest.json

@@ -9,5 +9,5 @@
     "iot_class": "local_push",
     "issue_tracker": "https://github.com/lunDreame/kocom-wallpad/issues",
     "requirements": [],
-    "version": "1.1.0"
+    "version": "1.1.1"
 }

custom_components/kocom_wallpad/pywallpad/const.py

@@ -33,3 +33,5 @@
 FLOOR = "floor"
 RING = "ring"
 SHUTDOWN = "shutdown"
+ONCE = "once"
+ALWAYS = "always"

custom_components/kocom_wallpad/pywallpad/enums.py

@@ -34,10 +34,10 @@ class DoorPhoneCommand(IntEnum):
     INVOKE = 0x09
     CONTROL = 0x0B
 
-class DoorPhoneEntrance(IntEnum):
+class DoorPhoneEntrance(StrEnum):
     """Door phone entrance types."""
-    PRIVATE = 0x02
-    PUBLIC = 0x08
+    PRIVATE = "private"
+    PUBLIC = "public"
 
 class DoorPhoneEventType(IntEnum):
     """Door phone event types."""