clevertouch 0.4.2b2__tar.gz → 0.4.2b4__tar.gz

{clevertouch-0.4.2b2 → clevertouch-0.4.2b4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: clevertouch
-Version: 0.4.2b2
+Version: 0.4.2b4
 Summary: A Python API for interacting with LVI/Purmo Touch E3-connected radiators
 License: MIT
 Keywords: LVI,home automation,heating

{clevertouch-0.4.2b2 → clevertouch-0.4.2b4}/pyproject.toml

@@ -13,7 +13,7 @@ log_cli_level = "DEBUG"
 
 [project]
 name = "clevertouch"
-version = "0.4.2b2"
+version = "0.4.2b4"
 description = "A Python API for interacting with LVI/Purmo Touch E3-connected radiators"
 keywords = [
     "LVI",

{clevertouch-0.4.2b2 → clevertouch-0.4.2b4}/src/clevertouch/devices/const.py

@@ -18,3 +18,11 @@ class DeviceTypeId(IntEnum):
     LIGHT = 1
     OUTLET = 12
     UNDEFINED = -1
+
+class DeviceTypeChar(StrEnum):
+    """Recognized device type ids"""
+
+    RADIATOR = "C"
+    LIGHT = "E"
+    OUTLET = "O"
+    UNDEFINED = "U"

{clevertouch-0.4.2b2 → clevertouch-0.4.2b4}/src/clevertouch/devices/device.py

@@ -15,7 +15,7 @@ class Device:
         home: HomeInfo,
         data: dict[str, Any],
         device_type: str,
-        device_type_id: int,
+        device_type_id: str,
         *,
         do_update: bool = True
     ) -> None:
@@ -23,7 +23,7 @@ class Device:
         self._session: ApiSession = session
         self.home: HomeInfo = home
         self.device_id: str = Device.get_id(data)
-        self.device_type_id: int = device_type_id
+        self.device_type_id: str = device_type_id
         if do_update:
             self.update(data)
 

{clevertouch-0.4.2b2 → clevertouch-0.4.2b4}/src/clevertouch/devices/factory.py

@@ -5,19 +5,20 @@ from typing import Any
 from ..api import ApiSession
 from ..info import HomeInfo
 from .device import Device
-from .const import DeviceType, DeviceTypeId
+from .const import DeviceType, DeviceTypeId, DeviceTypeChar
 from .onoff import Light, Outlet
 from .radiator import Radiator
 
 
 def create_device(session: ApiSession, home: HomeInfo, data: dict[str, Any]) -> Device:
     """Create a device of of specific types based on the provided data."""
-    device_type_id = int(data["nv_mode"] or DeviceTypeId.UNDEFINED)
-    if device_type_id == DeviceTypeId.RADIATOR:
+    # device_type_id = int(data["nv_mode"] or DeviceTypeId.UNDEFINED)
+    device_type_char = str(data.get("id_device", "U")[0])
+    if device_type_char == DeviceTypeChar.RADIATOR:
         return Radiator(session, home, data)
-    elif device_type_id == DeviceTypeId.LIGHT:
+    elif device_type_char == DeviceTypeChar.LIGHT:
         return Light(session, home, data)
-    elif device_type_id == DeviceTypeId.OUTLET:
+    elif device_type_char == DeviceTypeChar.OUTLET:
         return Outlet(session, home, data)
     else:
-        return Device(session, home, data, DeviceType.UNKNOWN, device_type_id)
+        return Device(session, home, data, DeviceType.UNKNOWN, device_type_char)

{clevertouch-0.4.2b2 → clevertouch-0.4.2b4}/src/clevertouch/devices/onoff.py

@@ -37,8 +37,8 @@ class OnOffDevice(Device):
         query_params = {}
         query_params["id_device"] = self.id_local
         query_params["on_off"] = "1" if turn_on else "0"
-        query_params["nv_mode"] = self.device_type_id
-        query_params["gv_mode"] = self.device_type_id
+        #query_params["nv_mode"] = self.device_type_id
+        #query_params["gv_mode"] = self.device_type_id
 
         await self._session.write_query(self.home.home_id, query_params)
 

{clevertouch-0.4.2b2 → clevertouch-0.4.2b4}/src/clevertouch/devices/radiator.py

@@ -45,7 +45,7 @@ class Radiator(Device):
     _DEVICE_TO_MODE_TYPE: dict[str, _ModeInfo] = {
         "0": _ModeInfo(HeatMode.COMFORT, TempType.COMFORT),
         "1": _ModeInfo(HeatMode.OFF, TempType.NONE),
-        "2": _ModeInfo(HeatMode.COMFORT, TempType.COMFORT),
+        "2": _ModeInfo(HeatMode.FROST, TempType.FROST),
         "3": _ModeInfo(HeatMode.ECO, TempType.ECO),
         "4": _ModeInfo(HeatMode.BOOST, TempType.BOOST),
         # "5": ModeInfo("fan", None),