aiocomfoconnect 0.2.1__tar.gz → 0.3.1__tar.gz

{aiocomfoconnect-0.2.1 → aiocomfoconnect-0.3.1}/PKG-INFO

@@ -1,17 +1,15 @@
 Metadata-Version: 2.4
 Name: aiocomfoconnect
-Version: 0.2.1
+Version: 0.3.1
 Summary: aiocomfoconnect is an asyncio Python 3 library for communicating with a Zehnder ComfoAir Q350/450/600 ventilation system
 License-File: LICENSE
 Author: Michaël Arnauts
 Author-email: michael.arnauts@gmail.com
-Requires-Python: >=3.10,<4.0
+Requires-Python: >=3.13,<4.0
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
+Classifier: Programming Language :: Python :: 3.15
 Requires-Dist: aiohttp (>=3.8.0,<4.0.0)
 Requires-Dist: protobuf (>=6.31,<8)
 Project-URL: Homepage, https://github.com/michaelarnauts/aiocomfoconnect
@@ -24,7 +22,7 @@ Description-Content-Type: text/markdown
 
 The [home-assistant-comfoconnect](https://github.com/michaelarnauts/home-assistant-comfoconnect) is using this library.
 
-It's compatible with Python 3.10 and higher.
+It's compatible with Python 3.13 and higher.
 
 ## Installation
 
@@ -65,7 +63,7 @@ $ python -m aiocomfoconnect get-property --host 192.168.1.213 1 1 8 9  # Unit 0x
 - `async register_sensor(sensor)`: Register a sensor.
 - `async deregister_sensor(sensor)`: Deregister a sensor.
 - `async get_mode()`: Get the ventilation mode.
-- `async set_mode(mode)`: Set the ventilation mode. (auto / manual)
+- `async set_mode(mode)`: Set the ventilation mode. (auto / manual) Selecting `auto` also cancels the temporary fan-speed override and returns control to the unit's schedule.
 - `async get_comfocool_mode()`: Get Comfocool mode
 - `async set_comfocool_mode()`: Set Comfocool mode. (auto / off)
 - `async get_speed()`: Get the ventilation speed.

{aiocomfoconnect-0.2.1 → aiocomfoconnect-0.3.1}/README.md

@@ -5,7 +5,7 @@
 
 The [home-assistant-comfoconnect](https://github.com/michaelarnauts/home-assistant-comfoconnect) is using this library.
 
-It's compatible with Python 3.10 and higher.
+It's compatible with Python 3.13 and higher.
 
 ## Installation
 
@@ -46,7 +46,7 @@ $ python -m aiocomfoconnect get-property --host 192.168.1.213 1 1 8 9  # Unit 0x
 - `async register_sensor(sensor)`: Register a sensor.
 - `async deregister_sensor(sensor)`: Deregister a sensor.
 - `async get_mode()`: Get the ventilation mode.
-- `async set_mode(mode)`: Set the ventilation mode. (auto / manual)
+- `async set_mode(mode)`: Set the ventilation mode. (auto / manual) Selecting `auto` also cancels the temporary fan-speed override and returns control to the unit's schedule.
 - `async get_comfocool_mode()`: Get Comfocool mode
 - `async set_comfocool_mode()`: Set Comfocool mode. (auto / off)
 - `async get_speed()`: Get the ventilation speed.

{aiocomfoconnect-0.2.1 → aiocomfoconnect-0.3.1}/aiocomfoconnect/__main__.py

@@ -11,6 +11,7 @@ from typing import Literal, Optional
 
 from aiocomfoconnect import DEFAULT_NAME, DEFAULT_PIN, DEFAULT_UUID
 from aiocomfoconnect.comfoconnect import ComfoConnect
+from aiocomfoconnect.const import ProductId
 from aiocomfoconnect.discovery import discover_bridges
 from aiocomfoconnect.exceptions import (
     AioComfoConnectNotConnected,
@@ -24,6 +25,8 @@ from aiocomfoconnect.sensors import SENSORS
 
 _LOGGER = logging.getLogger(__name__)
 
+PRODUCT_NAMES = {value: name.lower() for name, value in vars(ProductId).items() if not name.startswith("_")}
+
 
 async def main(args):
     """Main function."""
@@ -57,6 +60,12 @@ async def main(args):
     elif args.action == "get-property":
         await run_get_property(args.host, args.uuid, args.node_id, args.unit, args.subunit, args.property_id, args.property_type)
 
+    elif args.action == "set-property":
+        await run_set_property(args.host, args.uuid, args.node_id, args.unit, args.subunit, args.property_id, args.property_type, args.value)
+
+    elif args.action == "list-nodes":
+        await run_list_nodes(args.host, args.uuid)
+
     elif args.action == "get-flow-for-speed":
         await run_get_flow_for_speed(args.host, args.uuid, args.speed)
 
@@ -341,6 +350,54 @@ async def run_get_property(host: str, uuid: str, node_id: Optional[int], unit: i
     await comfoconnect.disconnect()
 
 
+async def run_set_property(host: str, uuid: str, node_id: Optional[int], unit: int, subunit: int, property_id: int, property_type: int, value: int):
+    """Set a property and print the value that is read back."""
+    # Discover bridge so we know the UUID
+    bridges = await discover_bridges(host)
+    if not bridges:
+        raise BridgeNotFoundException("No bridge found")
+
+    # Connect to the bridge
+    comfoconnect = ComfoConnect(bridges[0].host, bridges[0].uuid)
+    try:
+        await comfoconnect.connect(uuid)
+    except ComfoConnectNotAllowed:
+        print("Could not connect to bridge. Please register first.")
+        sys.exit(1)
+
+    await comfoconnect.set_property_typed(unit, subunit, property_id, value, property_type, node_id=node_id)
+    print(await comfoconnect.get_property(Property(unit, subunit, property_id, property_type), node_id))
+
+    await comfoconnect.disconnect()
+
+
+async def run_list_nodes(host: str, uuid: str):
+    """List the nodes that the bridge sees on the ComfoNet bus."""
+    # Discover bridge so we know the UUID
+    bridges = await discover_bridges(host)
+    if not bridges:
+        raise BridgeNotFoundException("No bridge found")
+
+    # Connect to the bridge
+    comfoconnect = ComfoConnect(bridges[0].host, bridges[0].uuid)
+    try:
+        await comfoconnect.connect(uuid)
+    except ComfoConnectNotAllowed:
+        print("Could not connect to bridge. Please register first.")
+        sys.exit(1)
+
+    await comfoconnect.cmd_node_request()
+    # Nodes arrive as unsolicited notifications, so give the bridge a moment to report them all.
+    await asyncio.sleep(2)
+
+    print("Nodes on the ComfoNet bus:")
+    for node in sorted(comfoconnect.nodes.values(), key=lambda n: n.node_id):
+        product = PRODUCT_NAMES.get(node.product_id, "unknown")
+        print(f"* node {node.node_id}: product {node.product_id} ({product}), zone {node.zone_id}, mode {node.mode}")
+
+    await comfoconnect.disconnect()
+
+
 async def run_get_flow_for_speed(host: str, uuid: str, speed: Literal["away", "low", "medium", "high"]):
     """Get the configured airflow for the specified speed."""
     # Discover bridge so we know the UUID
@@ -444,6 +501,20 @@ def main_cli():
     p_sensor.add_argument("--host", help="Host address of the bridge")
     p_sensor.add_argument("--uuid", help="UUID of this app", default=DEFAULT_UUID)
 
+    p_set_property = subparsers.add_parser("set-property", help="set a property value")
+    p_set_property.add_argument("unit", help="The Unit of the property", type=int)
+    p_set_property.add_argument("subunit", help="The Subunit of the property", type=int)
+    p_set_property.add_argument("property_id", help="The id of the property", type=int)
+    p_set_property.add_argument("property_type", help="The type of the property", type=int)
+    p_set_property.add_argument("value", help="The raw value to write", type=int)
+    p_set_property.add_argument("--node_id", help="The Node ID to write to (defaults to the discovered ventilation unit)", type=int, default=None)
+    p_set_property.add_argument("--host", help="Host address of the bridge")
+    p_set_property.add_argument("--uuid", help="UUID of this app", default=DEFAULT_UUID)
+
+    p_list_nodes = subparsers.add_parser("list-nodes", help="list the nodes on the ComfoNet bus")
+    p_list_nodes.add_argument("--host", help="Host address of the bridge")
+    p_list_nodes.add_argument("--uuid", help="UUID of this app", default=DEFAULT_UUID)
+
     p_get_flow_speed = subparsers.add_parser("get-flow-for-speed", help="Get m³/h for given speed")
     p_get_flow_speed.add_argument("speed", help="Fan speed", choices=["low", "medium", "high", "away"])
     p_get_flow_speed.add_argument("--host", help="Host address of the bridge")

{aiocomfoconnect-0.2.1 → aiocomfoconnect-0.3.1}/aiocomfoconnect/bridge.py

@@ -13,7 +13,7 @@ from typing import Awaitable, Callable, Dict, Iterator, Optional, Set
 from google.protobuf.message import DecodeError
 from google.protobuf.message import Message as ProtobufMessage
 
-from .const import VENTILATION_UNIT_PRODUCT_IDS
+from .const import VENTILATION_UNIT_PRODUCT_IDS, ProductId, PdoType
 from .exceptions import (
     AioComfoConnectNotConnected,
     AioComfoConnectNotReachable,
@@ -67,6 +67,11 @@ class Node:
         """Returns True if this node is the ventilation unit that handles RMI commands."""
         return self.product_id in VENTILATION_UNIT_PRODUCT_IDS
 
+    @property
+    def is_comfoclime(self) -> bool:
+        """Returns True if this node is a ComfoClime heat pump module."""
+        return self.product_id == ProductId.COMFOCLIME
+
 
 class EventBus:
     """An event bus for async replies."""
@@ -134,6 +139,7 @@ class Bridge:
         self._ventilation_node_found: Optional[asyncio.Event] = None
 
         self.__sensor_callback_fn: Optional[Callable[[int, int], None]] = None
+        self._sensor_pdo_types: Dict[int, int] = {}
         self.__alarm_callback_fn: Optional[Callable[[int, ProtobufMessage], None]] = None
 
         self._loop: Optional[asyncio.AbstractEventLoop] = loop
@@ -253,6 +259,18 @@ class Bridge:
         candidates = [node.node_id for node in self._nodes.values() if node.is_ventilation_unit]
         return min(candidates) if candidates else None
 
+    @property
+    def comfoclime_node_id(self) -> Optional[int]:
+        """The node id of the ComfoClime, or None when the bridge hasn't announced one."""
+        candidates = [node.node_id for node in self._nodes.values() if node.is_comfoclime]
+        return min(candidates) if candidates else None
+
+    @property
+    def comfoclime_zone_id(self) -> Optional[int]:
+        """The zone id of the ComfoClime, or None when the bridge hasn't announced one."""
+        candidates = [node for node in self._nodes.values() if node.is_comfoclime]
+        return min(candidates, key=lambda node: node.node_id).zone_id if candidates else None
+
     async def wait_for_ventilation_node(self, timeout: float = None) -> int:
         """Wait until the bridge has announced the ventilation unit and return its node id.
 
@@ -424,7 +442,9 @@ class Bridge:
             # pylint: disable=no-member
             if message.cmd.type == zehnder_pb2.GatewayOperation.CnRpdoNotificationType:
                 if self.__sensor_callback_fn:
-                    self.__sensor_callback_fn(message.msg.pdid, int.from_bytes(message.msg.data, byteorder="little", signed=True))
+                    pdo_type = self._sensor_pdo_types.get(message.msg.pdid)
+                    signed = pdo_type not in (PdoType.TYPE_CN_UINT8, PdoType.TYPE_CN_UINT16, PdoType.TYPE_CN_UINT32)
+                    self.__sensor_callback_fn(message.msg.pdid, int.from_bytes(message.msg.data, byteorder="little", signed=signed))
                 else:
                     _LOGGER.info("Unhandled CnRpdoNotificationType since no callback is registered.")
 
@@ -572,6 +592,8 @@ class Bridge:
     def cmd_rpdo_request(self, pdid: int, pdo_type: int = 1, zone: int = 1, timeout=None) -> Awaitable[Message]:
         """Register a RPDO request."""
         _LOGGER.debug("CnRpdoRequest")
+        # Notifications can arrive before the subscription acknowledgement.
+        self._sensor_pdo_types[pdid] = pdo_type
         # pylint: disable=no-member
         return self._send(
             zehnder_pb2.CnRpdoRequest,

{aiocomfoconnect-0.2.1 → aiocomfoconnect-0.3.1}/aiocomfoconnect/comfoconnect.py

@@ -33,6 +33,7 @@ from aiocomfoconnect.exceptions import (
     AioComfoConnectNotConnected,
     AioComfoConnectNotReachable,
     AioComfoConnectTimeout,
+    ComfoClimeNotFoundException,
     ComfoConnectNotAllowed,
     VentilationUnitNotFoundException,
 )
@@ -289,6 +290,28 @@ class ComfoConnect(Bridge):
 
         return result.message
 
+    def _require_comfoclime_node_id(self) -> int:
+        """Return the node id of the ComfoClime, or raise when it isn't on the bus."""
+        node_id = self.comfoclime_node_id
+        if node_id is None:
+            raise ComfoClimeNotFoundException("The bridge has not announced a ComfoClime")
+        return node_id
+
+    async def get_comfoclime_property(self, prop: Property) -> Any:
+        """Get a property from the ComfoClime node."""
+        return await self.get_property(prop, node_id=self._require_comfoclime_node_id())
+
+    async def set_comfoclime_property(self, prop: Property, value: int) -> Any:
+        """Set a property on the ComfoClime node."""
+        return await self.set_property_typed(
+            prop.unit,
+            prop.subunit,
+            prop.property_id,
+            value,
+            prop.property_type,
+            node_id=self._require_comfoclime_node_id(),
+        )
+
     def _sensor_callback(self, sensor_id, sensor_value):
         """Callback function for sensor updates."""
         if self._sensor_callback_fn is None:
@@ -301,9 +324,14 @@ class ComfoConnect(Bridge):
 
         self._sensors_values[sensor_id] = sensor_value
 
-        # Don't emit sensor values until we have received all the initial values.
+        # The bridge sends invalid (zero) values right after we subscribe to a sensor, so we hold them back.
+        # A non-zero value is a real value, so we can release the hold and emit it right away.
         if sensor_id in self._sensor_holds:
-            return
+            if not sensor_value:
+                return
+
+            _LOGGER.debug("Got a valid value for sensor %s, releasing the hold", sensor_id)
+            self._sensor_holds.pop(sensor_id).cancel()
 
         if sensor.value_fn:
             val = sensor.value_fn(sensor_value)
@@ -335,9 +363,10 @@ class ComfoConnect(Bridge):
         return VentilationMode.MANUAL if mode == 1 else VentilationMode.AUTO
 
     async def set_mode(self, mode: Literal["auto", "manual"]):
-        """Set the ventilation mode (auto / manual)."""
+        """Set ventilation mode, cancelling the temporary speed override for auto."""
         if mode == VentilationMode.AUTO:
             await self.cmd_rmi_request(bytes([0x85, UNIT_SCHEDULE, SUBUNIT_08, 0x01]))
+            await self.cmd_rmi_request(bytes([0x85, UNIT_SCHEDULE, SUBUNIT_01, 0x01]))
         elif mode == VentilationMode.MANUAL:
             await self.cmd_rmi_request(bytes([0x84, UNIT_SCHEDULE, SUBUNIT_08, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01]))
         else:

{aiocomfoconnect-0.2.1 → aiocomfoconnect-0.3.1}/aiocomfoconnect/const.py

@@ -72,6 +72,11 @@ UNIT_POSTHEATER = 0x27
 UNIT_COMFOFOND = 0x28
 UNIT_CO2SENSOR = 0x2B
 UNIT_SERVICEPRINT = 0x2C
+
+# Units that only exist on a ComfoClime node. Unit numbers are reused across product types,
+# so 0x16 / 0x17 mean UNIT_VALVE / UNIT_FAN on a ComfoAir node.
+UNIT_CLIME_TEMPCONFIG = 0x16
+UNIT_CLIME_HEATPUMP = 0x17
 # UNIT_COOLER(21) = 0x15
 # UNIT_CC_TEMPERATURESENSOR(22) = 0x16
 # UNIT_IOSENSOR(21) = 0x15
@@ -245,3 +250,46 @@ class ComfoCoolMode:
 
     AUTO = "auto"
     OFF = "off"
+
+
+class ComfoClimeSeason:
+    """Enum for ComfoClime seasons."""
+
+    TRANSITION = "transition"
+    HEATING = "heating"
+    COOLING = "cooling"
+
+
+class ComfoClimeTemperatureProfile:
+    """Enum for ComfoClime temperature profiles."""
+
+    COMFORT = "comfort"
+    POWER = "power"
+    ECO = "eco"
+
+
+class ComfoClimeDeviceMode:
+    """Enum for the ComfoClime device mode."""
+
+    OFF = "off"
+    HEATING = "heating"
+    COOLING = "cooling"
+
+
+COMFOCLIME_SEASONS = {
+    0: ComfoClimeSeason.TRANSITION,
+    1: ComfoClimeSeason.HEATING,
+    2: ComfoClimeSeason.COOLING,
+}
+
+COMFOCLIME_TEMPERATURE_PROFILES = {
+    0: ComfoClimeTemperatureProfile.COMFORT,
+    1: ComfoClimeTemperatureProfile.POWER,
+    2: ComfoClimeTemperatureProfile.ECO,
+}
+
+COMFOCLIME_DEVICE_MODES = {
+    0: ComfoClimeDeviceMode.OFF,
+    1: ComfoClimeDeviceMode.HEATING,
+    2: ComfoClimeDeviceMode.COOLING,
+}

{aiocomfoconnect-0.2.1 → aiocomfoconnect-0.3.1}/aiocomfoconnect/exceptions.py

@@ -62,5 +62,9 @@ class VentilationUnitNotFoundException(Exception):
     """Exception raised when the bridge didn't announce a ventilation unit on the ComfoNet bus."""
 
 
+class ComfoClimeNotFoundException(Exception):
+    """Exception raised when the bridge didn't announce a ComfoClime on the ComfoNet bus."""
+
+
 class UnknownActionException(Exception):
     """Exception raised when an unknown action is provided."""

aiocomfoconnect-0.3.1/aiocomfoconnect/properties.py

@@ -0,0 +1,57 @@
+""" Property definitions """
+
+from __future__ import annotations
+
+from dataclasses import dataclass
+
+from .const import (
+    UNIT_CLIME_HEATPUMP,
+    UNIT_CLIME_TEMPCONFIG,
+    UNIT_NODE,
+    UNIT_NODECONFIGURATION,
+    UNIT_TEMPHUMCONTROL,
+    PdoType,
+)
+
+
+@dataclass
+class Property:
+    """Dataclass for a Property"""
+
+    unit: int
+    subunit: int
+    property_id: int
+    property_type: int
+
+
+PROPERTY_SERIAL_NUMBER = Property(UNIT_NODE, 0x01, 0x04, PdoType.TYPE_CN_STRING)
+PROPERTY_FIRMWARE_VERSION = Property(UNIT_NODE, 0x01, 0x06, PdoType.TYPE_CN_UINT32)
+PROPERTY_MODEL = Property(UNIT_NODE, 0x01, 0x08, PdoType.TYPE_CN_STRING)
+PROPERTY_ARTICLE = Property(UNIT_NODE, 0x01, 0x0B, PdoType.TYPE_CN_STRING)
+PROPERTY_COUNTRY = Property(UNIT_NODE, 0x01, 0x0D, PdoType.TYPE_CN_STRING)
+PROPERTY_NAME = Property(UNIT_NODE, 0x01, 0x14, PdoType.TYPE_CN_STRING)
+
+PROPERTY_MAINTAINER_PASSWORD = Property(UNIT_NODECONFIGURATION, 0x01, 0x03, PdoType.TYPE_CN_STRING)
+
+PROPERTY_SENSOR_VENTILATION_TEMP_PASSIVE = Property(UNIT_TEMPHUMCONTROL, 0x01, 0x04, PdoType.TYPE_CN_UINT32)
+PROPERTY_SENSOR_VENTILATION_HUMIDITY_COMFORT = Property(UNIT_TEMPHUMCONTROL, 0x01, 0x06, PdoType.TYPE_CN_UINT32)
+PROPERTY_SENSOR_VENTILATION_HUMIDITY_PROTECTION = Property(UNIT_TEMPHUMCONTROL, 0x01, 0x07, PdoType.TYPE_CN_UINT32)
+
+# Temperatures are stored in tenths of a degree.
+PROPERTY_RMOT_HEATING_THRESHOLD = Property(UNIT_TEMPHUMCONTROL, 0x01, 0x02, PdoType.TYPE_CN_INT16)
+PROPERTY_RMOT_COOLING_THRESHOLD = Property(UNIT_TEMPHUMCONTROL, 0x01, 0x03, PdoType.TYPE_CN_INT16)
+
+# ComfoClime properties. These live on the ComfoClime node, not on the ventilation unit.
+PROPERTY_CLIME_AUTO_SEASON = Property(UNIT_CLIME_TEMPCONFIG, 0x01, 0x02, PdoType.TYPE_CN_UINT8)
+PROPERTY_CLIME_SEASON = Property(UNIT_CLIME_TEMPCONFIG, 0x01, 0x03, PdoType.TYPE_CN_UINT8)
+PROPERTY_CLIME_HEATING_KNEE_POINT = Property(UNIT_CLIME_TEMPCONFIG, 0x01, 0x04, PdoType.TYPE_CN_INT16)
+PROPERTY_CLIME_COOLING_KNEE_POINT = Property(UNIT_CLIME_TEMPCONFIG, 0x01, 0x05, PdoType.TYPE_CN_INT16)
+PROPERTY_CLIME_HEATING_COMFORT_TEMP = Property(UNIT_CLIME_TEMPCONFIG, 0x01, 0x09, PdoType.TYPE_CN_INT16)
+PROPERTY_CLIME_COOLING_COMFORT_TEMP = Property(UNIT_CLIME_TEMPCONFIG, 0x01, 0x0A, PdoType.TYPE_CN_INT16)
+PROPERTY_CLIME_COOLING_TEMP_LIMIT = Property(UNIT_CLIME_TEMPCONFIG, 0x01, 0x0B, PdoType.TYPE_CN_INT16)
+PROPERTY_CLIME_HEATING_DELTA = Property(UNIT_CLIME_TEMPCONFIG, 0x01, 0x0C, PdoType.TYPE_CN_INT16)
+PROPERTY_CLIME_MANUAL_TARGET_TEMP = Property(UNIT_CLIME_TEMPCONFIG, 0x01, 0x0D, PdoType.TYPE_CN_INT16)
+PROPERTY_CLIME_TEMPERATURE_PROFILE = Property(UNIT_CLIME_TEMPCONFIG, 0x01, 0x1D, PdoType.TYPE_CN_UINT8)
+PROPERTY_CLIME_HEATPUMP_STANDBY = Property(UNIT_CLIME_TEMPCONFIG, 0x01, 0x15, PdoType.TYPE_CN_UINT8)
+PROPERTY_CLIME_HEATPUMP_MAX_TEMP = Property(UNIT_CLIME_HEATPUMP, 0x01, 0x03, PdoType.TYPE_CN_INT16)
+PROPERTY_CLIME_HEATPUMP_MIN_TEMP = Property(UNIT_CLIME_HEATPUMP, 0x01, 0x04, PdoType.TYPE_CN_INT16)

{aiocomfoconnect-0.2.1 → aiocomfoconnect-0.3.1}/aiocomfoconnect/sensors.py

@@ -78,6 +78,20 @@ SENSOR_UNIT_TEMPERATURE = 208
 SENSOR_COMFOCOOL_STATE = 784
 SENSOR_COMFOCOOL_CONDENSOR_TEMP = 802
 
+# ComfoClime sensors. These are only reported when a ComfoClime is present on the ComfoNet bus.
+SENSOR_COMFOCLIME_TPMA_TEMPERATURE = 4145
+SENSOR_COMFOCLIME_TARGET_TEMPERATURE = 4148
+SENSOR_COMFOCLIME_DEVICE_MODE = 4149
+SENSOR_COMFOCLIME_COMFORT_TEMPERATURE = 4151
+SENSOR_COMFOCLIME_INDOOR_TEMPERATURE = 4154
+SENSOR_COMFOCLIME_TEMPERATURE_SUPPLY = 4193
+SENSOR_COMFOCLIME_TEMPERATURE_EXHAUST = 4194
+SENSOR_COMFOCLIME_TEMPERATURE_SUPPLY_COIL = 4195
+SENSOR_COMFOCLIME_TEMPERATURE_EXHAUST_COIL = 4196
+SENSOR_COMFOCLIME_TEMPERATURE_COMPRESSOR = 4197
+SENSOR_COMFOCLIME_HEATPUMP_DUTY = 4198
+SENSOR_COMFOCLIME_POWER_USAGE = 4201
+
 UNIT_WATT = "W"
 UNIT_KWH = "kWh"
 UNIT_VOLT = "V"
@@ -133,7 +147,7 @@ SENSORS: Dict[int, Sensor] = {
     SENSOR_PREHEATER_POWER: Sensor("Preheater Power Usage", UNIT_WATT, 146, PdoType.TYPE_CN_UINT16),
     SENSOR_RF_PAIRING_MODE: Sensor("RF Pairing Mode", None, 176, PdoType.TYPE_CN_UINT8),
     SENSOR_DAYS_TO_REPLACE_FILTER: Sensor("Days remaining to replace the filter", None, 192, PdoType.TYPE_CN_UINT16),
-    SENSOR_UNIT_TEMPERATURE: Sensor("Device Temperature Unit", None, 208, PdoType.TYPE_CN_UINT8, lambda x: "celcius" if x == 0 else "farenheit"),
+    SENSOR_UNIT_TEMPERATURE: Sensor("Device Temperature Unit", None, 208, PdoType.TYPE_CN_UINT8, lambda x: {0: "celsius", 1: "fahrenheit"}.get(x, x)),
     SENSOR_RMOT: Sensor("Running Mean Outdoor Temperature (RMOT)", UNIT_CELCIUS, 209, PdoType.TYPE_CN_INT16, lambda x: x / 10),
     SENSOR_SEASON_HEATING_ACTIVE: Sensor("Heating Season is active", None, 210, PdoType.TYPE_CN_BOOL, bool),
     SENSOR_SEASON_COOLING_ACTIVE: Sensor("Cooling Season is active", None, 211, PdoType.TYPE_CN_BOOL, bool),
@@ -147,7 +161,7 @@ SENSORS: Dict[int, Sensor] = {
     219: Sensor("sensor_219", None, 219, PdoType.TYPE_CN_UINT16),
     220: Sensor("Outdoor Air Temperature (?)", None, 220, PdoType.TYPE_CN_INT16, lambda x: x / 10),
     SENSOR_TEMPERATURE_SUPPLY: Sensor("Supply Air Temperature", UNIT_CELCIUS, 221, PdoType.TYPE_CN_INT16, lambda x: x / 10),
-    SENSOR_UNIT_AIRFLOW: Sensor("Device Airflow Unit", None, 224, PdoType.TYPE_CN_UINT8, lambda x: "m3ph" if x == 3 else "lps"),
+    SENSOR_UNIT_AIRFLOW: Sensor("Device Airflow Unit", None, 224, PdoType.TYPE_CN_UINT8, lambda x: {1: "kgph", 2: "lps", 3: "m3ph"}.get(x, x)),
     SENSOR_COMFORTCONTROL_MODE: Sensor("Sensor based ventilation mode", None, 225, PdoType.TYPE_CN_UINT8),
     SENSOR_FAN_SPEED_MODE_MODULATED: Sensor("Fan Speed (modulated)", None, 226, PdoType.TYPE_CN_UINT16),
     SENSOR_BYPASS_STATE: Sensor("Bypass State", UNIT_PERCENT, 227, PdoType.TYPE_CN_UINT8),
@@ -186,4 +200,23 @@ SENSORS: Dict[int, Sensor] = {
     SENSOR_COMFOCOOL_STATE: Sensor("ComfoCool State", None, 784, PdoType.TYPE_CN_UINT8),
     785: Sensor("sensor_785", None, 785, PdoType.TYPE_CN_BOOL),
     SENSOR_COMFOCOOL_CONDENSOR_TEMP: Sensor("ComfoCool Condensor Temperature", None, 802, PdoType.TYPE_CN_INT16, lambda x: x / 10),
+    SENSOR_COMFOCLIME_TPMA_TEMPERATURE: Sensor("ComfoClime TPMA Temperature", UNIT_CELCIUS, 4145, PdoType.TYPE_CN_INT16, lambda x: x / 10),
+    SENSOR_COMFOCLIME_TARGET_TEMPERATURE: Sensor("ComfoClime Target Temperature", UNIT_CELCIUS, 4148, PdoType.TYPE_CN_INT16, lambda x: x / 10),
+    SENSOR_COMFOCLIME_DEVICE_MODE: Sensor("ComfoClime Device Mode", None, 4149, PdoType.TYPE_CN_UINT8),
+    SENSOR_COMFOCLIME_COMFORT_TEMPERATURE: Sensor("ComfoClime Comfort Temperature", UNIT_CELCIUS, 4151, PdoType.TYPE_CN_INT16, lambda x: x / 10),
+    SENSOR_COMFOCLIME_INDOOR_TEMPERATURE: Sensor("ComfoClime Indoor Temperature", UNIT_CELCIUS, 4154, PdoType.TYPE_CN_INT16, lambda x: x / 10),
+    SENSOR_COMFOCLIME_TEMPERATURE_SUPPLY: Sensor("ComfoClime Supply Air Temperature", UNIT_CELCIUS, 4193, PdoType.TYPE_CN_INT16, lambda x: x / 10),
+    SENSOR_COMFOCLIME_TEMPERATURE_EXHAUST: Sensor("ComfoClime Exhaust Air Temperature", UNIT_CELCIUS, 4194, PdoType.TYPE_CN_INT16, lambda x: x / 10),
+    SENSOR_COMFOCLIME_TEMPERATURE_SUPPLY_COIL: Sensor("ComfoClime Supply Coil Temperature", UNIT_CELCIUS, 4195, PdoType.TYPE_CN_INT16, lambda x: x / 10),
+    SENSOR_COMFOCLIME_TEMPERATURE_EXHAUST_COIL: Sensor("ComfoClime Exhaust Coil Temperature", UNIT_CELCIUS, 4196, PdoType.TYPE_CN_INT16, lambda x: x / 10),
+    SENSOR_COMFOCLIME_TEMPERATURE_COMPRESSOR: Sensor("ComfoClime Compressor Temperature", UNIT_CELCIUS, 4197, PdoType.TYPE_CN_INT16, lambda x: x / 10),
+    SENSOR_COMFOCLIME_HEATPUMP_DUTY: Sensor("ComfoClime Heat Pump Duty", UNIT_PERCENT, 4198, PdoType.TYPE_CN_UINT8),
+    SENSOR_COMFOCLIME_POWER_USAGE: Sensor("ComfoClime Power Usage", UNIT_WATT, 4201, PdoType.TYPE_CN_UINT16),
+    4202: Sensor("sensor_4202", None, 4202, PdoType.TYPE_CN_UINT16),
+    4203: Sensor("sensor_4203", None, 4203, PdoType.TYPE_CN_UINT16),
+    4204: Sensor("sensor_4204", None, 4204, PdoType.TYPE_CN_UINT16),
+    4205: Sensor("sensor_4205", None, 4205, PdoType.TYPE_CN_UINT16),
+    4206: Sensor("sensor_4206", None, 4206, PdoType.TYPE_CN_UINT16),
+    4207: Sensor("sensor_4207", None, 4207, PdoType.TYPE_CN_UINT16),
+    4208: Sensor("sensor_4208", None, 4208, PdoType.TYPE_CN_UINT16),
 }

{aiocomfoconnect-0.2.1 → aiocomfoconnect-0.3.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "aiocomfoconnect"
-version = "0.2.1"
+version = "0.3.1"
 description = "aiocomfoconnect is an asyncio Python 3 library for communicating with a Zehnder ComfoAir Q350/450/600 ventilation system"
 authors = ["Michaël Arnauts <michael.arnauts@gmail.com>"]
 readme = "README.md"
@@ -10,7 +10,7 @@ homepage = "https://github.com/michaelarnauts/aiocomfoconnect"
 aiocomfoconnect = "aiocomfoconnect.__main__:main_cli"
 
 [tool.poetry.dependencies]
-python = "^3.10"
+python = "^3.13"
 aiohttp = "^3.8.0"
 protobuf = ">=6.31,<8"
 
@@ -20,8 +20,8 @@ dpkt = "^1.9.8"
 black = "^24.4.0"
 isort = "^5.10.1"
 pylint = "^3.2"
-pytest = "^8.2.0"
-pytest-asyncio = "^0.23.0"
+pytest = "^8.4"
+pytest-asyncio = "^1.4.0"
 
 [build-system]
 requires = ["poetry-core"]
@@ -31,7 +31,7 @@ build-backend = "poetry.core.masonry.api"
 profile = "black"
 
 [tool.black]
-target-version = ["py310"]
+target-version = ["py313"]
 line-length = 180
 
 [tool.pylint.MAIN]

aiocomfoconnect-0.2.1/aiocomfoconnect/properties.py

@@ -1,31 +0,0 @@
-""" Property definitions """
-
-from __future__ import annotations
-
-from dataclasses import dataclass
-
-from .const import UNIT_NODE, UNIT_NODECONFIGURATION, UNIT_TEMPHUMCONTROL, PdoType
-
-
-@dataclass
-class Property:
-    """Dataclass for a Property"""
-
-    unit: int
-    subunit: int
-    property_id: int
-    property_type: int
-
-
-PROPERTY_SERIAL_NUMBER = Property(UNIT_NODE, 0x01, 0x04, PdoType.TYPE_CN_STRING)
-PROPERTY_FIRMWARE_VERSION = Property(UNIT_NODE, 0x01, 0x06, PdoType.TYPE_CN_UINT32)
-PROPERTY_MODEL = Property(UNIT_NODE, 0x01, 0x08, PdoType.TYPE_CN_STRING)
-PROPERTY_ARTICLE = Property(UNIT_NODE, 0x01, 0x0B, PdoType.TYPE_CN_STRING)
-PROPERTY_COUNTRY = Property(UNIT_NODE, 0x01, 0x0D, PdoType.TYPE_CN_STRING)
-PROPERTY_NAME = Property(UNIT_NODE, 0x01, 0x14, PdoType.TYPE_CN_STRING)
-
-PROPERTY_MAINTAINER_PASSWORD = Property(UNIT_NODECONFIGURATION, 0x01, 0x03, PdoType.TYPE_CN_STRING)
-
-PROPERTY_SENSOR_VENTILATION_TEMP_PASSIVE = Property(UNIT_TEMPHUMCONTROL, 0x01, 0x04, PdoType.TYPE_CN_UINT32)
-PROPERTY_SENSOR_VENTILATION_HUMIDITY_COMFORT = Property(UNIT_TEMPHUMCONTROL, 0x01, 0x06, PdoType.TYPE_CN_UINT32)
-PROPERTY_SENSOR_VENTILATION_HUMIDITY_PROTECTION = Property(UNIT_TEMPHUMCONTROL, 0x01, 0x07, PdoType.TYPE_CN_UINT32)