aiocomfoconnect 0.3.2__tar.gz → 0.3.4__tar.gz

{aiocomfoconnect-0.3.2 → aiocomfoconnect-0.3.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aiocomfoconnect
-Version: 0.3.2
+Version: 0.3.4
 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
@@ -86,6 +86,7 @@ $ python -m aiocomfoconnect get-property --host 192.168.1.213 1 1 8 9  # Unit 0x
 - `async set_sensor_ventmode_humidity_protection(mode)`: Set the sensor based ventilation humidity protection setting. (auto / on / off)
 - `async get_property(prop)`: Get the value of a property, e.g. `PROPERTY_RMOT_HEATING_THRESHOLD`.
 - `async get_property_constraints(prop)`: Get the raw value of a numeric property, together with the range and step size the unit accepts.
+- `bridge_type`: The type of the bridge (`GatewayType.LANC`, `SEASON` or `PRO`). Discovery reports it, and a ComfoConnect Pro is also recognised once a session has started.
 
 ### Low-level API
 

{aiocomfoconnect-0.3.2 → aiocomfoconnect-0.3.4}/README.md

@@ -69,6 +69,7 @@ $ python -m aiocomfoconnect get-property --host 192.168.1.213 1 1 8 9  # Unit 0x
 - `async set_sensor_ventmode_humidity_protection(mode)`: Set the sensor based ventilation humidity protection setting. (auto / on / off)
 - `async get_property(prop)`: Get the value of a property, e.g. `PROPERTY_RMOT_HEATING_THRESHOLD`.
 - `async get_property_constraints(prop)`: Get the raw value of a numeric property, together with the range and step size the unit accepts.
+- `bridge_type`: The type of the bridge (`GatewayType.LANC`, `SEASON` or `PRO`). Discovery reports it, and a ComfoConnect Pro is also recognised once a session has started.
 
 ### Low-level API
 

{aiocomfoconnect-0.3.2 → aiocomfoconnect-0.3.4}/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, ProductId, PdoType
+from .const import VENTILATION_UNIT_PRODUCT_IDS, GatewayType, ProductId, PdoType
 from .exceptions import (
     AioComfoConnectNotConnected,
     AioComfoConnectNotReachable,
@@ -34,7 +34,7 @@ from .protobuf import zehnder_pb2
 _LOGGER = logging.getLogger(__name__)
 
 TIMEOUT = 5
-GATEWAY_TYPE_PRO = 2
+GATEWAY_TYPE_PRO = GatewayType.PRO
 
 # How long we wait for the bridge to announce the ventilation unit before we give up.
 NODE_DISCOVERY_TIMEOUT = 5
@@ -126,6 +126,7 @@ class Bridge:
     ):
         self.host: str = host
         self.uuid: str = uuid
+        # One of GatewayType. Discovery reports it, and a ComfoConnect Pro also identifies itself when a session starts.
         self.bridge_type: int = bridge_type
         self._local_uuid: Optional[str] = None
 
@@ -490,15 +491,20 @@ class Bridge:
         except DecodeError as exc:
             _LOGGER.error("Failed to decode message: %s", exc)
 
-    def cmd_start_session(self, take_over: bool = False) -> Awaitable[Message]:
+    async def cmd_start_session(self, take_over: bool = False) -> Message:
         """Starts the session on the device by logging in and optionally disconnecting an already existing session."""
         _LOGGER.debug("StartSessionRequest")
         # pylint: disable=no-member
-        return self._send(
+        reply = await self._send(
             zehnder_pb2.StartSessionRequest,
             zehnder_pb2.GatewayOperation.StartSessionRequestType,
             {"takeover": take_over},
         )
+        # A ComfoConnect Pro sets the devicename of a successful session to "ccpro", a LAN C leaves it empty. This also
+        # tells us the type of a bridge that was connected to by IP address, without discovery.
+        if getattr(reply, "devicename", None) == "ccpro":
+            self.bridge_type = GatewayType.PRO
+        return reply
 
     def cmd_close_session(self) -> Awaitable[Message]:
         """Stops the current session."""

{aiocomfoconnect-0.3.2 → aiocomfoconnect-0.3.4}/aiocomfoconnect/const.py

@@ -32,6 +32,14 @@ VENTILATION_UNIT_PRODUCT_IDS = (ProductId.COMFOAIRQ, ProductId.COMFOAIRFLEX)
 
 
 # PDO Types
+class GatewayType:
+    """Defines the type of a bridge, with the values of the GatewayType in the discovery response."""
+
+    LANC = 0  # ComfoConnect LAN C
+    SEASON = 1  # The built-in WiFi module of a ComfoAir Flex
+    PRO = 2  # ComfoConnect Pro
+
+
 class PdoType:
     """Defines a PDO type."""
 

{aiocomfoconnect-0.3.2 → aiocomfoconnect-0.3.4}/aiocomfoconnect/sensors.py

@@ -57,6 +57,9 @@ SENSOR_NEXT_CHANGE_FAN_EXHAUST = 87
 SENSOR_NEXT_CHANGE_FAN_SUPPLY = 86
 SENSOR_OPERATING_MODE = 56
 SENSOR_OPERATING_MODE_2 = 49
+SENSOR_POSTHEATER_PRESENT = 402
+SENSOR_POSTHEATER_STATE = 401
+SENSOR_POSTHEATER_TEMPERATURE_BEFORE = 278
 SENSOR_POWER_USAGE = 128
 SENSOR_POWER_USAGE_TOTAL = 130
 SENSOR_POWER_USAGE_TOTAL_YEAR = 129
@@ -171,7 +174,7 @@ SENSORS: Dict[int, Sensor] = {
     SENSOR_TEMPERATURE_EXHAUST: Sensor("Exhaust Air Temperature", UNIT_CELCIUS, 275, PdoType.TYPE_CN_INT16, lambda x: x / 10),
     SENSOR_TEMPERATURE_OUTDOOR: Sensor("Outdoor Air Temperature", UNIT_CELCIUS, 276, PdoType.TYPE_CN_INT16, lambda x: x / 10),
     277: Sensor("Outdoor Air Temperature (?)", UNIT_CELCIUS, 277, PdoType.TYPE_CN_INT16, lambda x: x / 10),
-    278: Sensor("Supply Air Temperature (?)", UNIT_CELCIUS, 278, PdoType.TYPE_CN_INT16, lambda x: x / 10),
+    SENSOR_POSTHEATER_TEMPERATURE_BEFORE: Sensor("Temperature before Postheater", UNIT_CELCIUS, 278, PdoType.TYPE_CN_INT16, lambda x: x / 10),
     SENSOR_HUMIDITY_EXTRACT: Sensor("Extract Air Humidity", UNIT_PERCENT, 290, PdoType.TYPE_CN_UINT8),
     SENSOR_HUMIDITY_EXHAUST: Sensor("Exhaust Air Humidity", UNIT_PERCENT, 291, PdoType.TYPE_CN_UINT8),
     SENSOR_HUMIDITY_OUTDOOR: Sensor("Outdoor Air Humidity", UNIT_PERCENT, 292, PdoType.TYPE_CN_UINT8),
@@ -191,8 +194,8 @@ SENSORS: Dict[int, Sensor] = {
     384: Sensor("sensor_384", None, 384, PdoType.TYPE_CN_INT16, lambda x: x / 10),
     386: Sensor("sensor_386", None, 386, PdoType.TYPE_CN_BOOL, bool),
     400: Sensor("sensor_400", None, 400, PdoType.TYPE_CN_INT16, lambda x: x / 10),
-    401: Sensor("sensor_401", None, 401, PdoType.TYPE_CN_UINT8),
-    402: Sensor("sensor_402", None, 402, PdoType.TYPE_CN_BOOL, bool),
+    SENSOR_POSTHEATER_STATE: Sensor("Postheater State", UNIT_PERCENT, 401, PdoType.TYPE_CN_UINT8),
+    SENSOR_POSTHEATER_PRESENT: Sensor("Postheater Present", None, 402, PdoType.TYPE_CN_BOOL, bool),
     SENSOR_COMFOFOND_TEMP_OUTDOOR: Sensor("ComfoFond Outdoor Air Temperature", None, 416, PdoType.TYPE_CN_INT16, lambda x: x / 10),
     SENSOR_COMFOFOND_TEMP_GROUND: Sensor("ComfoFond Ground Temperature", None, 417, PdoType.TYPE_CN_INT16, lambda x: x / 10),
     SENSOR_COMFOFOND_GHE_STATE: Sensor("ComfoFond GHE State Percentage", None, 418, PdoType.TYPE_CN_UINT8),

{aiocomfoconnect-0.3.2 → aiocomfoconnect-0.3.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "aiocomfoconnect"
-version = "0.3.2"
+version = "0.3.4"
 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"