ramses-rf 0.22.40__py3-none-any.whl → 0.51.1__py3-none-any.whl

{ramses_rf/protocol → ramses_tx}/ramses.py

@@ -1,42 +1,37 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-#
 """RAMSES RF - a RAMSES-II protocol decoder & analyser."""
+
+# TODO: code a lifespan for most packets
+
 from __future__ import annotations
 
-import logging
 from datetime import timedelta as td
+from typing import Any, Final
 
-from .const import DEV_TYPE, SZ_NAME, __dev_mode__
+from .const import SZ_NAME, DevType
 
-# skipcq: PY-W2000
 from .const import (  # noqa: F401, isort: skip, pylint: disable=unused-import
     I_,
     RP,
     RQ,
     W_,
     Code,
+    VerbT,
 )
 
-DEV_MODE = __dev_mode__ and False
 
-_LOGGER = logging.getLogger(__name__)
-if DEV_MODE:
-    _LOGGER.setLevel(logging.DEBUG)
+SZ_LIFESPAN: Final = "lifespan"  # WIP
 
-RQ_NULL = "rq_null"
-EXPIRES = "expires"
 
-EXPIRY = "expiry"
+#
+########################################################################################
+# CODES_SCHEMA - HEAT (CH/DHW, Honeywell/Resideo) vs HVAC (ventilation, Itho/Orcon/etc.)
 
 # The master list - all known codes are here, even if there's no corresponding parser
 # Anything with a zone-idx should start: ^0[0-9A-F], ^(0[0-9A-F], or ^((0[0-9A-F]
 
 #
-########################################################################################
-# CODES_SCHEMA - HEAT (CH/DHW, Honeywell/Resideo) vs HVAC (ventilation, Itho/Orcon/etc.)
-#
-CODES_SCHEMA: dict[Code, dict] = {  # rf_unknown
+CODES_SCHEMA: dict[Code, dict[str, Any]] = {  # rf_unknown
     Code._0001: {
         SZ_NAME: "rf_unknown",
         I_: r"^00FFFF02(00|FF)$",  # loopback
@@ -45,6 +40,9 @@ CODES_SCHEMA: dict[Code, dict] = {  # rf_unknown
         W_: r"^(0[0-9A-F]|FC|FF)000005(01|05)$",
     },  # TODO: there appears to be a dodgy? RQ/RP for UFC
     Code._0002: {  # WIP: outdoor_sensor - CODE_IDX_COMPLEX?
+        # is it CODE_IDX_COMPLEX:
+        #  - 02...... for outside temp?
+        #  - 03...... for other stuff?
         SZ_NAME: "outdoor_sensor",
         I_: r"^0[0-4][0-9A-F]{4}(00|01|02|05)$",  # Domoticz sends ^02!!
         RQ: r"^00$",  # NOTE: sent by an RFG100
@@ -53,15 +51,16 @@ CODES_SCHEMA: dict[Code, dict] = {  # rf_unknown
         SZ_NAME: "zone_name",
         I_: r"^0[0-9A-F]00([0-9A-F]){40}$",  # RP is same, null_rp: xxxx,7F*20
         RQ: r"^0[0-9A-F]00$",
-        EXPIRES: td(days=1),
+        W_: r"^0[0-9A-F]00([0-9A-F]){40}$",  # contrived
+        SZ_LIFESPAN: td(days=1),
     },
     Code._0005: {  # system_zones
         SZ_NAME: "system_zones",
         # .I --- 34:092243 --:------ 34:092243 0005 012 000A0000-000F0000-00100000
         I_: r"^(00[01][0-9A-F]{5}){1,3}$",
-        RQ: r"^00[01][0-9A-F]$",  # f"00{zone_type}", evohome wont respond to 00
+        RQ: r"^00[01][0-9A-F]$",  # f"00{zone_type}", evohome won't respond to 00
         RP: r"^00[01][0-9A-F]{3,5}$",
-        EXPIRES: False,
+        SZ_LIFESPAN: False,
     },
     Code._0006: {  # schedule_version  # TODO: what for DHW schedule?
         SZ_NAME: "schedule_version",
@@ -93,7 +92,7 @@ CODES_SCHEMA: dict[Code, dict] = {  # rf_unknown
         # 17:54:13.141 045 RP --- 01:145038 34:064023 --:------ 000A 006 031002260B86
         # 19:20:49.460 062 RQ --- 12:010740 01:145038 --:------ 000A 006 080001F40DAC
         # 19:20:49.476 045 RP --- 01:145038 12:010740 --:------ 000A 006 081001F40DAC
-        EXPIRES: td(days=1),
+        SZ_LIFESPAN: td(days=1),
     },
     Code._000C: {  # zone_devices
         SZ_NAME: "zone_devices",
@@ -101,11 +100,11 @@ CODES_SCHEMA: dict[Code, dict] = {  # rf_unknown
         # RP --- 01:145038 18:013393 --:------ 000C 016 05-08-00-109901    08-00-109902    08-00-109903
         I_: r"^0[0-9A-F][01][0-9A-F]|7F[0-9A-F]{6}([0-9A-F]{10}|[0-9A-F]{12}){1,7}$",
         RQ: r"^0[0-9A-F][01][0-9A-F]$",  # TODO: f"{zone_idx}{device_type}"
-        EXPIRES: False,
+        SZ_LIFESPAN: False,
     },
     Code._000E: {  # unknown_000e
         SZ_NAME: "message_000e",
-        I_: r"^000014$",
+        I_: r"^0000(14|28)$",
     },
     Code._0016: {  # rf_check
         SZ_NAME: "rf_check",
@@ -116,7 +115,7 @@ CODES_SCHEMA: dict[Code, dict] = {  # rf_unknown
         SZ_NAME: "language",
         RQ: r"^00([0-9A-F]{4}F{4})?$",  # NOTE: RQ/04/0100 has a payload
         RP: r"^00[0-9A-F]{4}F{4}$",
-        EXPIRES: td(days=1),  # TODO: make longer?
+        SZ_LIFESPAN: td(days=1),  # TODO: make longer?
     },
     Code._0150: {  # unknown_0150
         SZ_NAME: "message_0150",
@@ -137,13 +136,19 @@ CODES_SCHEMA: dict[Code, dict] = {  # rf_unknown
         # .W --- 04:000722 01:158182 --:------ 01E9 002 0003  # is a guess, the
         # .I --- 01:158182 04:000722 --:------ 01E9 002 0000  # TRV was in zone 00
     },
+    Code._01FF: {  # unknown_01ff, TODO: definitely a real code, Itho Spider
+        SZ_NAME: "message_01ff",
+        I_: r"^(00|01)[0-9A-F]{50}$",
+        RQ: r"^(00|01)[0-9A-F]{50}$",
+        W_: r"^00[0-9A-F]{50}$",
+    },
     Code._0404: {  # zone_schedule
         SZ_NAME: "zone_schedule",
         I_: r"^0[0-9A-F](20|23)[0-9A-F]{2}08[0-9A-F]{6}$",
         RQ: r"^0[0-9A-F](20|23)000800[0-9A-F]{4}$",
         RP: r"^0[0-9A-F](20|23)0008[0-9A-F]{6}[0-9A-F]{2,82}$",
         W_: r"^0[0-9A-F](20|23)[0-9A-F]{2}08[0-9A-F]{6}[0-9A-F]{2,82}$",  # as per RP
-        EXPIRES: None,
+        SZ_LIFESPAN: None,
     },
     Code._0418: {  # system_fault
         SZ_NAME: "system_fault",
@@ -167,11 +172,13 @@ CODES_SCHEMA: dict[Code, dict] = {  # rf_unknown
         SZ_NAME: "mixvalve_params",
         # .I --- --:------ --:------ 12:138834 1030 016 01C80137C9010FCA0196CB010FCC0101
         I_: r"^0[0-9A-F](C[89A-C]01[0-9A-F]{2}){5}$",
+        RP: r"^00((20|21)01[0-9A-F]{2}){2}$",  # rarely seen, HVAC
+        W_: r"^0[0-9A-F](C[89A-C]01[0-9A-F]{2}){5}$",  # contrived
     },
     Code._1060: {  # device_battery
         SZ_NAME: "device_battery",
         I_: r"^0[0-9A-F](FF|[0-9A-F]{2})0[01]$",  # HCW: r"^(FF|0[0-9A-F]...
-        EXPIRES: td(days=1),
+        SZ_LIFESPAN: td(days=1),
     },
     Code._1081: {  # max_ch_setpoint
         SZ_NAME: "max_ch_setpoint",
@@ -196,34 +203,34 @@ CODES_SCHEMA: dict[Code, dict] = {  # rf_unknown
         # NOTE: RFG100 uses a domain id! (00|01)
         # 19:14:24.662 051 RQ --- 30:185469 01:037519 --:------ 10A0 001 00
         # 19:14:31.463 053 RQ --- 30:185469 01:037519 --:------ 10A0 001 01
-        I_: r"^0[01][0-9A-F]{4}([0-9A-F]{6})?$",  # NOTE: RQ/07/10A0 has a payload
-        RQ: r"^0[01]([0-9A-F]{10})?$",  # NOTE: RQ/07/10A0 has a payload
-        W_: r"^0[01][0-9A-F]{4}([0-9A-F]{6})?$",  # TODO: needs checking
-        EXPIRES: td(hours=4),
+        I_: r"^(00|01)[0-9A-F]{4}([0-9A-F]{6})?$",  # NOTE: RQ/07/10A0 has a payload
+        RQ: r"^(00|01)([0-9A-F]{10})?$",  # NOTE: RQ/07/10A0 has a payload
+        W_: r"^(00|01)[0-9A-F]{4}([0-9A-F]{6})?$",  # TODO: needs checking
+        SZ_LIFESPAN: td(hours=4),
     },
     Code._10B0: {  # unknown_10b0
         SZ_NAME: "message_10b0",
         RQ: r"^00$",
         RP: r"^00[0-9A-F]{8}$",
     },
-    Code._10D0: {  # filter_change
+    Code._10D0: {  # filter_change - polling interval should be 1/day
         SZ_NAME: "filter_change",
-        I_: r"^00[0-9A-F]{6}(0000)?$",
+        I_: r"^00[0-9A-F]{6}(0000|FFFF)?$",
         RQ: r"^00(00)?$",
         W_: r"^00FF$",
     },
     Code._10E0: {  # device_info
         SZ_NAME: "device_info",
-        I_: r"^00[0-9A-F]{30,}$",  # r"^[0-9A-F]{32,}$" might be OK
-        RQ: r"^00$",  # NOTE: will accept [0-9A-F]{2}
+        I_: r"^(00|FF)([0-9A-F]{30,})?$",  # r"^[0-9A-F]{32,}$" might be OK
+        RQ: r"^00$",  # NOTE: 63 seen (no RP), some devices will accept [0-9A-F]{2}
         # RP: r"^[0-9A-F]{2}([0-9A-F]){30,}$",  # NOTE: indx same as RQ
-        EXPIRES: False,
+        SZ_LIFESPAN: False,
     },
     Code._10E1: {  # device_id
         SZ_NAME: "device_id",
         RP: r"^00[0-9A-F]{6}$",
         RQ: r"^00$",
-        EXPIRES: False,
+        SZ_LIFESPAN: False,
     },
     Code._10E2: {  # unknown_10e2, HVAC?
         SZ_NAME: "unknown_10e2",
@@ -231,14 +238,16 @@ CODES_SCHEMA: dict[Code, dict] = {  # rf_unknown
     },
     Code._1100: {  # tpi_params
         SZ_NAME: "tpi_params",
+        #  I --- 01:172368 --:------ 01:172368 1100 008 FC180400007FFF00
+        #  I --- 01:172368 13:040439 --:------ 1100 008 FC042814007FFF00
         # RQ --- 01:145038 13:163733 --:------ 1100 008 00180400007FFF01  # boiler relay
         # RP --- 13:163733 01:145038 --:------ 1100 008 00180400FF7FFF01
         # RQ --- 01:145038 13:035462 --:------ 1100 008 FC240428007FFF01  # not bolier relay
         # RP --- 13:035462 01:145038 --:------ 1100 008 00240428007FFF01
-        I_: r"^(00|FC)[0-9A-F]{6}(00|FF)([0-9A-F]{4}01)?$",
-        W_: r"^(00|FC)[0-9A-F]{6}(00|FF)([0-9A-F]{4}01)?$",  # TODO: is there no I?
-        RQ: r"^(00|FC)([0-9A-F]{6}(00|FF)([0-9A-F]{4}01)?)?$",  # RQ/13:/00, or RQ/01:/FC:
-        EXPIRES: td(days=1),
+        I_: r"^(00|FC)[0-9A-F]{6}(00|FF)([0-9A-F]{4}0[01])?$",
+        W_: r"^(00|FC)[0-9A-F]{6}(00|FF)([0-9A-F]{4}0[01])?$",  # TODO: is there no I?
+        RQ: r"^(00|FC)([0-9A-F]{6}(00|FF)([0-9A-F]{4}0[01])?)?$",  # RQ/13:/00, or RQ/01:/FC:
+        SZ_LIFESPAN: td(days=1),
     },
     Code._11F0: {  # unknown_11f0, from heatpump relay
         SZ_NAME: "message_11f0",
@@ -251,9 +260,9 @@ CODES_SCHEMA: dict[Code, dict] = {  # rf_unknown
         # RQ --- 18:200202 10:067219 --:------ 1260 002 0000
         # RP --- 10:067219 18:200202 --:------ 1260 003 007FFF
         # .I --- 07:045960 --:------ 07:045960 1260 003 0007A9
-        I_: r"^0[01][0-9A-F]{4}$",  # NOTE: RP is same
-        RQ: r"^0[01](00)?$",  # TODO: officially: r"^0[01]$"
-        EXPIRES: td(hours=1),
+        I_: r"^(00|01)[0-9A-F]{4}$",  # NOTE: RP is same
+        RQ: r"^(00|01)(00)?$",  # TODO: officially: r"^(00|01)$"
+        SZ_LIFESPAN: td(hours=1),
     },
     Code._1280: {  # outdoor_humidity
         SZ_NAME: "outdoor_humidity",
@@ -266,21 +275,20 @@ CODES_SCHEMA: dict[Code, dict] = {  # rf_unknown
     },
     Code._1298: {  # co2_level
         SZ_NAME: "co2_level",
-        I_: r"^00[0-9A-F]{4}$",
+        I_: r"^00[0-9A-F]{4}$",  # NOTE: RP is same
+        RQ: r"^00$",
     },
     Code._12A0: {  # indoor_humidity
-        # .I --- 32:168090 --:------ 32:168090 12A0 006 0030093504A8
-        # .I --- 32:132125 --:------ 32:132125 12A0 007 003107B67FFF00  # only dev_id with 007
-        # RP --- 20:008749 18:142609 --:------ 12A0 002 00EF
         SZ_NAME: "indoor_humidity",
-        I_: r"^00[0-9A-F]{2}([0-9A-F]{8}(00)?)?$",
-        EXPIRES: td(hours=1),
+        I_: r"^(0[0-9A-F]{3}([0-9A-F]{8}(00)?)?)+$",
+        RP: r"^0[0-9A-F]{3}([0-9A-F]{8}(00)?)?$",
+        SZ_LIFESPAN: td(hours=1),
     },
     Code._12B0: {  # window_state  (HVAC % window open)
         SZ_NAME: "window_state",
         I_: r"^0[0-9A-F](0000|C800|FFFF)$",  # NOTE: RP is same
         RQ: r"^0[0-9A-F](00)?$",
-        EXPIRES: td(hours=1),
+        SZ_LIFESPAN: td(hours=1),
     },
     Code._12C0: {  # displayed_temp (HVAC room temp)
         SZ_NAME: "displayed_temp",  # displayed room temp
@@ -321,10 +329,10 @@ CODES_SCHEMA: dict[Code, dict] = {  # rf_unknown
     },
     Code._1F41: {  # dhw_mode
         SZ_NAME: "dhw_mode",
-        I_: r"^0[01](00|01|FF)0[0-5]F{6}(([0-9A-F]){12})?$",
-        RQ: r"^0[01]$",  # will accept: r"^0[01](00)$"
-        W_: r"^0[01](00|01|FF)0[0-5]F{6}(([0-9A-F]){12})?$",
-        EXPIRES: td(hours=4),
+        I_: r"^(00|01)(00|01|FF)0[0-5]F{6}(([0-9A-F]){12})?$",
+        RQ: r"^(00|01)$",  # will accept: r"^(00|01)(00)$"
+        W_: r"^(00|01)(00|01|FF)0[0-5]F{6}(([0-9A-F]){12})?$",
+        SZ_LIFESPAN: td(hours=4),
     },
     Code._1F70: {  # programme_config, HVAC (1470, 1F70, 22B0)
         SZ_NAME: "programme_config",
@@ -333,14 +341,11 @@ CODES_SCHEMA: dict[Code, dict] = {  # rf_unknown
         W_: r"^00[0-9A-F]{30}$",
     },
     Code._1FC9: {  # rf_bind
-        # RP --- 13:035462 18:013393 --:------ 1FC9 018 00-3EF0-348A86 00-11F0-348A86 90-3FF1-956ABD  # noqa: E501
-        # RP --- 13:035462 18:013393 --:------ 1FC9 018 00-3EF0-348A86 00-11F0-348A86 90-7FE1-DD6ABD  # noqa: E501
-        # RP --- 01:145038 18:013393 --:------ 1FC9 012 FF-10E0-06368E FF-1FC9-06368E
         SZ_NAME: "rf_bind",  # idx-code-dev_id
         RQ: r"^00$",
-        RP: r"^((0[0-9A-F]|F[69ABCF]|90)([0-9A-F]{10}))+$",  # #     NOTE: idx can be 90 (HEAT)
-        I_: r"^((0[0-9A-F]|F[69ABCF]|63|67)([0-9A-F]{10}))+|00$",  # NOTE: idx can be 63|67 (HVAC), payload can be 00
-        W_: r"^((0[0-9A-F]|F[69ABCF])([0-9A-F]{10}))+$",
+        RP: r"^((0[0-9A-F]|F[69ABCF]|[0-9A-F]{2})([0-9A-F]{10}))+$",
+        I_: r"^((0[0-9A-F]|F[69ABCF]|[0-9A-F]{2})([0-9A-F]{10}))+|00|21$",  # NOTE: payload can be 00
+        W_: r"^((0[0-9A-F]|F[69ABCF]|[0-9A-F]{2})([0-9A-F]{10}))+$",
     },
     Code._1FCA: {  # unknown_1fca
         SZ_NAME: "message_1fca",
@@ -358,20 +363,19 @@ CODES_SCHEMA: dict[Code, dict] = {  # rf_unknown
         SZ_NAME: "opentherm_sync",
         I_: r"^00([0-9A-F]{4})$",
     },
-    Code._2210: {  # unknown_2210, HVAC, NB: no I
+    Code._2210: {  # unknown_2210, HVAC,
         SZ_NAME: "unknown_2210",
+        I_: r"^00[0-9A-F]{82}$",
         RQ: r"^00$",
-        RP: r"^00[0-9A-F]{82}$",
     },
     Code._2249: {  # setpoint_now?
         SZ_NAME: "setpoint_now",  # setpt_now_next
         I_: r"^(0[0-9A-F]{13}){1,2}$",
     },  # TODO: This could be an array
-    Code._22C9: {  # ufh_setpoint
-        SZ_NAME: "ufh_setpoint",
-        I_: r"^(0[0-9A-F][0-9A-F]{8}0[12]){1,4}(0203)?$",  # ~000A array, but max_len 24, not 48!
-        W_: r"^(0[0-9A-F][0-9A-F]{8}0[12])$",  # ~000A array, but max_len 24, not 48!
-        # RP: Appear wont get any?,
+    Code._22C9: {  # setpoint_bounds (was: ufh_setpoint)
+        SZ_NAME: "setpoint_bounds",
+        I_: r"^(0[0-9A-F][0-9A-F]{8}0[12]){1,4}(0[12]03)?$",  # (0[12]03)? only if len(array) == 1
+        W_: r"^(0[0-9A-F][0-9A-F]{8}0[12])$",  # never an array
     },
     Code._22D0: {  # unknown_22d0, HVAC system switch?
         SZ_NAME: "message_22d0",
@@ -401,6 +405,7 @@ CODES_SCHEMA: dict[Code, dict] = {  # rf_unknown
     Code._22F1: {  # fan_mode, HVAC
         SZ_NAME: "fan_mode",
         RQ: r"^00$",
+        RP: r"^00[0-9A-F]{4}$",
         I_: r"^(00|63)(0[0-9A-F]){1,2}$",
     },
     Code._22F2: {  # unknown_22f2, HVAC, NB: no I
@@ -410,12 +415,12 @@ CODES_SCHEMA: dict[Code, dict] = {  # rf_unknown
     },
     Code._22F3: {  # fan_boost, HVAC
         SZ_NAME: "fan_boost",
-        I_: r"^(00|63)[0-9A-F]{4}([0-9A-F]{8})?$",
-    },  # minutes
-    Code._22F4: {  # unknown_22f4, HVAC, NB: no I
+        I_: r"^(00|63)(021E)?[0-9A-F]{4}([0-9A-F]{8})?$",
+    },  # minutes only?
+    Code._22F4: {  # unknown_22f4, HVAC
         SZ_NAME: "unknown_22f4",
+        I_: r"^00[0-9A-F]{24}$",
         RQ: r"^00$",
-        RP: r"^00[0-9A-F]{24}$",
     },
     Code._22F7: {  # fan_bypass_mode (% open), HVAC
         SZ_NAME: "fan_bypass_mode",
@@ -439,7 +444,7 @@ CODES_SCHEMA: dict[Code, dict] = {  # rf_unknown
         W_: r"^0[0-9A-F]{5}$",
         # RQ --- 12:010740 01:145038 --:------ 2309 003 03073A # No RPs
         RQ: r"^0[0-9A-F]([0-9A-F]{4})?$",  # NOTE: 12 uses: r"^0[0-9A-F]$"
-        EXPIRES: td(minutes=30),
+        SZ_LIFESPAN: td(minutes=30),
     },
     Code._2349: {  # zone_mode
         SZ_NAME: "zone_mode",
@@ -449,7 +454,7 @@ CODES_SCHEMA: dict[Code, dict] = {  # rf_unknown
         # .W --- 18:141846 01:050858 --:------ 2349 007 02-08FC-01-FFFFFF
         RQ: r"^0[0-9A-F](00|[0-9A-F]{12})?$",
         # RQ --- 22:070483 01:063844 --:------ 2349 007 06-0708-03-000027
-        EXPIRES: td(hours=4),
+        SZ_LIFESPAN: td(hours=4),
     },
     Code._2389: {  # unknown_2389 - CODE_IDX_COMPLEX?
         # .I 024 03:052382 --:------ 03:052382 2389 003 02001B
@@ -473,9 +478,9 @@ CODES_SCHEMA: dict[Code, dict] = {  # rf_unknown
     },
     Code._2411: {  # fan_params, HVAC
         SZ_NAME: "fan_params",
-        I_: r"^0000[0-9A-F]{6}([0-9A-F]{8}){4}[0-9A-F]{4}$",
-        RQ: r"^0000[0-9A-F]{2}((00){19})?$",
-        W_: r"^0000[0-9A-F]{6}[0-9A-F]{8}(([0-9A-F]{8}){3}[0-9A-F]{4})?$",
+        I_: r"^(00|01|15|16|17|21)00[0-9A-F]{6}([0-9A-F]{8}){4}[0-9A-F]{4}$",
+        RQ: r"^(00|01|15|16|17|21)00[0-9A-F]{2}((00){19})?$",
+        W_: r"^(00|01|15|16|17|21)00[0-9A-F]{6}[0-9A-F]{8}(([0-9A-F]{8}){3}[0-9A-F]{4})?$",
     },
     Code._2420: {  # unknown_2420, from OTB
         SZ_NAME: "message_2420",
@@ -496,7 +501,7 @@ CODES_SCHEMA: dict[Code, dict] = {  # rf_unknown
         I_: r"^0[0-7][0-9A-F]{12}0[01]$",
         RQ: r"^FF$",
         W_: r"^0[0-7][0-9A-F]{12}0[01]$",
-        EXPIRES: td(hours=4),
+        SZ_LIFESPAN: td(hours=4),
     },
     Code._2E10: {  # presence_detect - HVAC
         SZ_NAME: "presence_detect",
@@ -507,11 +512,11 @@ CODES_SCHEMA: dict[Code, dict] = {  # rf_unknown
         I_: r"^(0[0-9A-F][0-9A-F]{4})+$",
         RQ: r"^0[0-9A-F](00)?$",  # TODO: officially: r"^0[0-9A-F]$"
         RP: r"^0[0-9A-F][0-9A-F]{4}$",  # Null: r"^0[0-9A-F]7FFF$"
-        EXPIRES: td(hours=1),
+        SZ_LIFESPAN: td(hours=1),
     },
-    Code._3110: {  # unknown_3110 - HVAC
-        SZ_NAME: "message_3110",
-        I_: r"^00",
+    Code._3110: {  # ufc_demand - HVAC
+        SZ_NAME: "ufc_demand",
+        I_: r"^(00|01)00[0-9A-F]{2}(00|10|20)",  # (00|10|20|FF)???
     },
     Code._3120: {  # unknown_3120 - Error Report?
         SZ_NAME: "message_3120",
@@ -529,24 +534,24 @@ CODES_SCHEMA: dict[Code, dict] = {  # rf_unknown
         I_: r"^00[0-9A-F]{16}$",  # NOTE: RP is same
         RQ: r"^00$",
         W_: r"^00[0-9A-F]{16}$",
-        EXPIRES: td(seconds=3),
+        SZ_LIFESPAN: td(seconds=3),
     },
-    Code._3150: {  # heat_demand
+    Code._3150: {  # heat_demand, also fans with preheat
         SZ_NAME: "heat_demand",
         I_: r"^((0[0-9A-F])[0-9A-F]{2}|FC[0-9A-F]{2})+$",
-        EXPIRES: td(minutes=20),
+        SZ_LIFESPAN: td(minutes=20),
     },
     Code._31D9: {  # fan_state
         SZ_NAME: "fan_state",
         # I_: r"^(00|21)[0-9A-F]{32}$",
         # I_: r"^(00|01|21)[0-9A-F]{4}((00|FE)(00|20){12}(00|08))?$",
-        I_: r"^(00|01|21)[0-9A-F]{4}(([0-9A-F]{2})(00|20){0,12}(00|01|04|08)?)?$",  # 00-0004-FE
-        RQ: r"^(00|01|21)$",
+        I_: r"^(00|01|15|16|17|21)[0-9A-F]{4}(([0-9A-F]{2})(00|20){0,12}(00|01|04|08)?)?$",  # 00-0004-FE
+        RQ: r"^(00|01|15|16|17|21)$",
     },
     Code._31DA: {  # hvac_state (fan_state_extended)
         SZ_NAME: "hvac_state",
-        I_: r"^(00|01|21)[0-9A-F]{56}(00|20)?$",
-        RQ: r"^(00|01|21)$"
+        I_: r"^(00|01|15|16|17|21)[0-9A-F]{56}(00|20)?$",
+        RQ: r"^(00|01|15|16|17|21)$",
         # RQ --- 32:168090 30:082155 --:------ 31DA 001 21
     },
     Code._31E0: {  # fan_demand
@@ -556,12 +561,12 @@ CODES_SCHEMA: dict[Code, dict] = {  # rf_unknown
         SZ_NAME: "fan_demand",
         I_: r"^00([0-9A-F]{4}){1,3}(00|FF)?$",
     },
-    Code._3200: {  # boiler output temp
+    Code._3200: {  # boiler (or CV?) output temp
         SZ_NAME: "boiler_output",
+        I_: r"^00[0-9A-F]{4}$",
         RQ: r"^00$",
-        RP: r"^00[0-9A-F]{4}$",
     },
-    Code._3210: {  # boiler return temp
+    Code._3210: {  # boiler (or CV?) return temp
         SZ_NAME: "boiler_return",
         RQ: r"^00$",
         RP: r"^00[0-9A-F]{4}$",
@@ -579,7 +584,7 @@ CODES_SCHEMA: dict[Code, dict] = {  # rf_unknown
     Code._3222: {  # unknown_3222, HVAC, NB: no I
         SZ_NAME: "unknown_3222",
         RQ: r"^00$",
-        RP: r"^00[0-9A-F]{4,20}$",
+        RP: r"^00[0-9A-F]{4,24}$",
     },
     Code._3223: {  # unknown_3223, from OTB
         SZ_NAME: "message_3223",
@@ -618,30 +623,45 @@ CODES_SCHEMA: dict[Code, dict] = {  # rf_unknown
         RQ: r"^[0-9A-F]{40}$",
         W_: r"^[0-9A-F]{40}$",
     },
-    Code._4E01: {  # hvac_4e01 - HVAC
+    Code._4E01: {  # xxx (HVAC) - Itho Spider
         SZ_NAME: "hvac_4e01",
-        I_: r"^00([0-9A-F]{4}){8}00$",
+        I_: r"^00([0-9A-F]{4}){3,12}00$",
     },
-    Code._4E02: {  # hvac_4e02 - HVAC
+    Code._4E02: {  # xxx (HVAC) - Itho Spider
         SZ_NAME: "hvac_4e02",
-        I_: r"^00([0-9A-F]{4}){8}02([0-9A-F]{4}){8}$",
+        I_: r"^00([0-9A-F]{4}){3,12}(02|03|04|05)([0-9A-F]{4}){3,12}$",
     },
-    Code._4E04: {  # hvac_4e04 - HVAC
+    Code._4E04: {  # xxx (HVAC) - Itho Spider
         SZ_NAME: "hvac_4e04",
-        I_: r"^00(00FF|01FE)$",
-        W_: r"^00(00FF|01FE)$",
+        I_: r"^00(00|01|02)[0-9A-F]{2}$",
+        W_: r"^00(00|01|02)[0-9A-F]{2}$",
+    },
+    Code._4E0D: {  # xxx (HVAC) - Itho Spider
+        SZ_NAME: "hvac_4e0d",
+        I_: r"^(01|02)(00|01)$",
+    },
+    Code._4E15: {  # xxx (HVAC) - Itho Spider
+        SZ_NAME: "hvac_4e15",
+        I_: r"^000[0-7]$",
+    },
+    Code._4E16: {  # xxx (HVAC) - Itho Spider
+        SZ_NAME: "hvac_4e16",
+        I_: r"^00(00){6}$",
     },
     Code._PUZZ: {
         SZ_NAME: "puzzle_packet",
         I_: r"^00(([0-9A-F]){2})+$",
     },
 }
-for code in CODES_SCHEMA.values():  # map any RPs to (missing) I_s
+CODE_NAME_LOOKUP = {k: v["name"] for k, v in CODES_SCHEMA.items()}
+
+
+for code in CODES_SCHEMA.values():  # map any (missing) RPs to I_s
     if RQ in code and RP not in code and I_ in code:
         code[RP] = code[I_]
 #
 # .I --- 01:210309 --:------ 01:210309 0009 006 FC00FFF900FF
-CODES_WITH_ARRAYS: dict[Code, list] = {  # 000C/1FC9 are special
+CODES_WITH_ARRAYS: dict[Code, list[int | tuple[str, ...]]] = {  # 000C/1FC9 are special
     Code._0005: [4, ("34",)],
     Code._0009: [3, ("01", "12", "22")],
     Code._000A: [6, ("01", "12", "22")],  # single element I after a W
@@ -659,6 +679,7 @@ RQ_IDX_COMPLEX: list[Code] = [
     Code._0016,  # optional payload
     Code._0100,  # optional payload
     Code._0404,  # context: index, fragment_idx (fragment_header)
+    Code._0418,  # context: index
     Code._10A0,  # optional payload
     Code._1100,  # optional payload
     Code._2309,  # optional payload
@@ -673,44 +694,50 @@ RQ_NO_PAYLOAD: list[Code] = [
 ]
 RQ_NO_PAYLOAD.extend((Code._0418,))
 
-# IDX_COMPLEX - *usually has* a context, but doesn't satisfy criteria for IDX_SIMPLE:
+
+########################################################################################
+# IDX:_xxxxxx: index (and context)
+
 # all known codes should be in only one of IDX_COMPLEX, IDX_NONE, IDX_SIMPLE
-CODE_IDX_COMPLEX: list[Code] = [
+
+# IDX_COMPLEX - *usually has* a context, but doesn't satisfy criteria for IDX_SIMPLE:
+CODE_IDX_ARE_COMPLEX: set[Code] = {
     Code._0005,
-    Code._000C,
+    Code._000C,  # idx = fx(payload[0:4])
+    # Code._0404,  # use "HW" for idx if payload[4:6] == "23"  # TODO: should be used
+    Code._0418,  # log_idx (payload[4:6])  #  null RPs are missing an idx
     Code._1100,
-    Code._3220,
-]  # TODO: 0005 to ..._NONE?
-# CODE_IDX_COMPLEX.sort()
+    Code._3220,  # data_id (payload[4:6])
+}  # TODO: 0005 to ..._NONE?
 
 # IDX_SIMPLE - *can have* a context, but sometimes not (usu. 00): only ever payload[:2],
 # either a zone_idx, domain_id or (UFC) circuit_idx (or array of such, i.e. seqx[:2])
-CODE_IDX_SIMPLE: list[Code] = [
+
+_SIMPLE_IDX = ("^0[0-9A-F]", "^(0[0-9A-F]", "^((0[0-9A-F]", "^(00|01)")
+CODE_IDX_ARE_SIMPLE: set[Code] = {
     k
     for k, v in CODES_SCHEMA.items()
-    if k not in CODE_IDX_COMPLEX
-    and (
-        (RQ in v and v[RQ].startswith(("^0[0-9A-F]", "^(0[0-9A-F]")))
-        or (I_ in v and v[I_].startswith(("^0[0-9A-F]", "^(0[0-9A-F]", "^((0[0-9A-F]")))
-    )
-]
-CODE_IDX_SIMPLE.extend(
-    (Code._10A0, Code._1260, Code._1F41, Code._22D0, Code._31D9, Code._3B00)
-)
-# CODE_IDX_SIMPLE.sort()
+    for verb in (RQ, I_)
+    if k not in CODE_IDX_ARE_COMPLEX and v.get(verb, "").startswith(_SIMPLE_IDX)
+}
+CODE_IDX_ARE_SIMPLE |= {
+    Code._22D0,
+    Code._2411,
+    Code._31D9,
+    Code._31DA,
+    Code._3B00,
+    Code._4E0D,
+}
 
 # IDX_NONE - *never has* a context: most payloads start 00, but no context even if the
 # payload starts with something else (e.g. 2E04)
-CODE_IDX_NONE: list[Code] = [
+CODE_IDX_ARE_NONE: set[Code] = {
     k
     for k, v in CODES_SCHEMA.items()
-    if k not in CODE_IDX_COMPLEX + CODE_IDX_SIMPLE
+    if k not in CODE_IDX_ARE_COMPLEX | CODE_IDX_ARE_SIMPLE
     and ((RQ in v and v[RQ][:3] == "^00") or (I_ in v and v[I_][:3] == "^00"))
-]
-CODE_IDX_NONE.extend(
-    (Code._0002, Code._22F1, Code._22F3, Code._2389, Code._2E04, Code._31DA, Code._4401)
-)  # 31DA does appear to have an idx?
-# CODE_IDX_NONE.sort()
+}
+CODE_IDX_ARE_NONE |= {Code._22F3, Code._2389, Code._2E04, Code._4401}
 
 # CODE_IDX_DOMAIN - NOTE: not necc. mutex with other 3
 CODE_IDX_DOMAIN: dict[Code, str] = {
@@ -723,13 +750,13 @@ CODE_IDX_DOMAIN: dict[Code, str] = {
     Code._3B00: "^FC",
 }
 
+
 #
 ########################################################################################
 # CODES_BY_DEV_SLUG - HEAT (CH/DHW) vs HVAC (ventilation)
-#
-
-_DEV_KLASSES_HEAT: dict[str, dict] = {
-    DEV_TYPE.RFG: {  # RFG100: RF to Internet gateway (and others)
+# TODO: 34: can 3220 - split out RND from THM/STA
+_DEV_KLASSES_HEAT: dict[str, dict[Code, dict[VerbT, Any]]] = {
+    DevType.RFG: {  # RFG100: RF to Internet gateway (and others)
         Code._0002: {RQ: {}},
         Code._0004: {I_: {}, RQ: {}},
         Code._0005: {RQ: {}},
@@ -755,7 +782,7 @@ _DEV_KLASSES_HEAT: dict[str, dict] = {
         Code._3220: {RQ: {}},
         Code._3EF0: {RQ: {}},
     },
-    DEV_TYPE.CTL: {  # e.g. ATC928: Evohome Colour Controller
+    DevType.CTL: {  # e.g. ATC928: Evohome Colour Controller
         Code._0001: {W_: {}},
         Code._0002: {I_: {}, RP: {}},
         Code._0004: {I_: {}, RP: {}},
@@ -794,7 +821,7 @@ _DEV_KLASSES_HEAT: dict[str, dict] = {
         Code._3B00: {I_: {}},
         Code._3EF0: {RQ: {}},
     },
-    DEV_TYPE.PRG: {  # e.g. HCF82/HCW82: Room Temperature Sensor
+    DevType.PRG: {  # e.g. HCF82/HCW82: Room Temperature Sensor
         Code._0009: {I_: {}},
         Code._1090: {RP: {}},
         Code._10A0: {RP: {}},
@@ -806,7 +833,7 @@ _DEV_KLASSES_HEAT: dict[str, dict] = {
         Code._3B00: {I_: {}},
         Code._3EF1: {RP: {}},
     },
-    DEV_TYPE.THM: {  # e.g. Generic Thermostat
+    DevType.THM: {  # e.g. Generic Thermostat
         Code._0001: {W_: {}},
         Code._0005: {I_: {}},
         Code._0008: {I_: {}},
@@ -824,6 +851,7 @@ _DEV_KLASSES_HEAT: dict[str, dict] = {
         Code._12C0: {I_: {}},
         Code._1F09: {I_: {}},
         Code._1FC9: {I_: {}},
+        Code._22C9: {W_: {}},  # DT4R
         Code._2309: {I_: {}, RQ: {}, W_: {}},
         Code._2349: {RQ: {}, W_: {}},
         Code._30C9: {I_: {}},
@@ -831,11 +859,12 @@ _DEV_KLASSES_HEAT: dict[str, dict] = {
         Code._313F: {
             I_: {}
         },  # .W --- 30:253184 34:010943 --:------ 313F 009 006000070E0...
+        Code._3220: {RP: {}},  # RND (using OT)
         Code._3B00: {I_: {}},
         Code._3EF0: {RQ: {}},  # when bound direct to a 13:
         Code._3EF1: {RQ: {}},  # when bound direct to a 13:
     },
-    DEV_TYPE.UFC: {  # e.g. HCE80/HCC80: Underfloor Heating Controller
+    DevType.UFC: {  # e.g. HCE80/HCC80: Underfloor Heating Controller
         Code._0001: {RP: {}, W_: {}},  # TODO: Ix RP
         Code._0005: {RP: {}},
         Code._0008: {I_: {}},
@@ -848,7 +877,7 @@ _DEV_KLASSES_HEAT: dict[str, dict] = {
         Code._2309: {RP: {}},
         Code._3150: {I_: {}},
     },
-    DEV_TYPE.TRV: {  # e.g. HR92/HR91: Radiator Controller
+    DevType.TRV: {  # e.g. HR92/HR91: Radiator Controller
         Code._0001: {W_: {r"^0[0-9A-F]"}},
         Code._0004: {RQ: {r"^0[0-9A-F]00$"}},
         Code._0016: {RQ: {}, RP: {}},
@@ -865,14 +894,14 @@ _DEV_KLASSES_HEAT: dict[str, dict] = {
         Code._313F: {RQ: {r"^00$"}},
         Code._3150: {I_: {r"^0[0-9A-F]{3}$"}},
     },
-    DEV_TYPE.DHW: {  # e.g. CS92: (DHW) Cylinder Thermostat
+    DevType.DHW: {  # e.g. CS92: (DHW) Cylinder Thermostat
         Code._0016: {RQ: {}},
         Code._1060: {I_: {}},
         Code._10A0: {RQ: {}},  # This RQ/07/10A0 includes a payload
         Code._1260: {I_: {}},
         Code._1FC9: {I_: {}},
     },
-    DEV_TYPE.OTB: {  # e.g. R8810/R8820: OpenTherm Bridge
+    DevType.OTB: {  # e.g. R8810/R8820: OpenTherm Bridge
         Code._0009: {I_: {}},  # 1/24h for a R8820 (not an R8810)
         Code._0150: {RP: {}},  # R8820A only?
         Code._042F: {I_: {}, RP: {}},
@@ -903,7 +932,7 @@ _DEV_KLASSES_HEAT: dict[str, dict] = {
         Code._3EF0: {I_: {}, RP: {}},
         Code._3EF1: {RP: {}},
     },  # see: https://www.opentherm.eu/request-details/?post_ids=2944
-    DEV_TYPE.BDR: {  # e.g. BDR91A/BDR91T: Wireless Relay Box
+    DevType.BDR: {  # e.g. BDR91A/BDR91T: Wireless Relay Box
         Code._0008: {RP: {}},  # doesn't RP/0009
         Code._0016: {RP: {}},
         # Code._10E0: {},  # 13: will not RP/10E0 # TODO: how to indicate that fact here
@@ -916,24 +945,24 @@ _DEV_KLASSES_HEAT: dict[str, dict] = {
         # RP: {},  # RQ --- 01:145038 13:237335 --:------ 3EF0 001 00
         Code._3EF1: {RP: {}},
     },
-    DEV_TYPE.OUT: {
+    DevType.OUT: {
         Code._0002: {I_: {}},
         Code._1FC9: {I_: {}},
     },  # i.e. HB85 (ext. temperature/luminosity(lux)), HB95 (+ wind speed)
     #
-    DEV_TYPE.JIM: {  # Jasper Interface Module, 08
+    DevType.JIM: {  # Jasper Interface Module, 08
         Code._0008: {RQ: {}},
         Code._10E0: {I_: {}},
         Code._1100: {I_: {}},
         Code._3EF0: {I_: {}},
         Code._3EF1: {RP: {}},
     },
-    DEV_TYPE.JST: {  # Jasper Stat, 31
+    DevType.JST: {  # Jasper Stat, 31
         Code._0008: {I_: {}},
         Code._10E0: {I_: {}},
         Code._3EF1: {RQ: {}, RP: {}},
     },
-    # DEV_TYPE.RND: {  # e.g. TR87RF: Single (round) Zone Thermostat
+    # DevType.RND: {  # e.g. TR87RF: Single (round) Zone Thermostat
     #     Code._0005: {I_: {}},
     #     Code._0008: {I_: {}},
     #     Code._000A: {I_: {}, RQ: {}},
@@ -953,7 +982,7 @@ _DEV_KLASSES_HEAT: dict[str, dict] = {
     #     Code._3EF0: {I_: {}, RQ: {}},  # when bound direct to a 13:
     #     Code._3EF1: {RQ: {}},  # when bound direct to a 13:
     # },
-    # DEV_TYPE.DTS: {  # e.g. DTS92(E)
+    # DevType.DTS: {  # e.g. DTS92(E)
     #     Code._0001: {W_: {}},
     #     Code._0008: {I_: {}},
     #     Code._0009: {I_: {}},
@@ -973,7 +1002,7 @@ _DEV_KLASSES_HEAT: dict[str, dict] = {
     #     Code._3B00: {I_: {}},
     #     Code._3EF1: {RQ: {}},
     # },
-    # DEV_TYPE.HCW: {  # e.g. HCF82/HCW82: Room Temperature Sensor
+    # DevType.HCW: {  # e.g. HCF82/HCW82: Room Temperature Sensor
     #     Code._0001: {W_: {}},
     #     Code._0002: {I_: {}},
     #     Code._0008: {I_: {}},
@@ -988,8 +1017,8 @@ _DEV_KLASSES_HEAT: dict[str, dict] = {
     # },
 }
 # TODO: add 1FC9 everywhere?
-_DEV_KLASSES_HVAC: dict[str, dict] = {
-    DEV_TYPE.DIS: {  # Orcon RF15 Display: ?a superset of a REM
+_DEV_KLASSES_HVAC: dict[str, dict[Code, dict[VerbT, Any]]] = {
+    DevType.DIS: {  # Orcon RF15 Display: ?a superset of a REM
         Code._0001: {RQ: {}},
         Code._042F: {I_: {}},
         Code._10E0: {I_: {}, RQ: {}},
@@ -1004,7 +1033,7 @@ _DEV_KLASSES_HVAC: dict[str, dict] = {
         Code._313F: {RQ: {}},
         Code._31DA: {RQ: {}},
     },
-    DEV_TYPE.RFS: {  # Itho spIDer: RF to Internet gateway (like a RFG100)
+    DevType.RFS: {  # Itho spIDer: RF to Internet gateway (like a RFG100)
         Code._1060: {I_: {}},
         Code._10E0: {I_: {}, RP: {}},
         Code._12C0: {I_: {}},
@@ -1019,8 +1048,9 @@ _DEV_KLASSES_HVAC: dict[str, dict] = {
         Code._31DA: {RQ: {}},
         Code._3EF0: {I_: {}},
     },
-    DEV_TYPE.FAN: {
+    DevType.FAN: {
         Code._0001: {RP: {}},
+        Code._0002: {I_: {}},
         Code._042F: {I_: {}},
         Code._10D0: {I_: {}, RP: {}},
         Code._10E0: {I_: {}, RP: {}},
@@ -1030,26 +1060,40 @@ _DEV_KLASSES_HVAC: dict[str, dict] = {
         Code._1470: {RP: {}},
         Code._1F09: {I_: {}, RP: {}},
         Code._1FC9: {W_: {}},
+        Code._2210: {I_: {}, RP: {}},
+        Code._22E0: {RP: {}},
+        Code._22E5: {RP: {}},
+        Code._22E9: {RP: {}},
+        Code._22F1: {RP: {}},
+        Code._22F2: {I_: {}, RP: {}},
+        Code._22F3: {},
+        Code._22F4: {I_: {}, RP: {}},
         Code._22F7: {I_: {}, RP: {}},
         Code._2411: {I_: {}, RP: {}},
+        Code._2E10: {I_: {}},
         Code._3120: {I_: {}},
+        Code._3150: {I_: {}},
+        Code._313E: {RP: {}},
         Code._313F: {I_: {}, RP: {}},
         Code._31D9: {I_: {}, RP: {}},
         Code._31DA: {I_: {}, RP: {}},
         # Code._31E0: {I_: {}},
+        Code._3200: {I_: {}},
+        Code._3222: {RP: {}},
     },
-    DEV_TYPE.CO2: {
+    DevType.CO2: {
         Code._042F: {I_: {}},
         Code._10E0: {I_: {}, RP: {}},
-        Code._1298: {I_: {}},
+        Code._1298: {I_: {}, RP: {}},
         Code._1FC9: {I_: {}},
+        Code._22F1: {RQ: {}},
         Code._2411: {RQ: {}},
         Code._2E10: {I_: {}},
         Code._3120: {I_: {}},
         Code._31DA: {RQ: {}},
         Code._31E0: {I_: {}},
     },
-    DEV_TYPE.HUM: {
+    DevType.HUM: {
         Code._042F: {I_: {}},
         Code._1060: {I_: {}},
         Code._10E0: {I_: {}},
@@ -1058,10 +1102,15 @@ _DEV_KLASSES_HVAC: dict[str, dict] = {
         Code._31DA: {RQ: {}},
         Code._31E0: {I_: {}},
     },
-    DEV_TYPE.REM: {  # HVAC: two-way switch; also an "06/22F1"?
+    DevType.REM: {  # HVAC: two-way switch; also an "06/22F1"?
         Code._0001: {RQ: {}},  # from a VMI (only?)
         Code._042F: {I_: {}},  # from a VMI (only?)
         Code._1060: {I_: {}},
+        Code._10D0: {
+            RP: {},
+            RQ: {},
+            W_: {},
+        },  # RQ/RP Orcon HRC, W=reset filter count from REM
         Code._10E0: {I_: {}, RQ: {}},  # RQ from a VMI (only?)
         Code._1470: {RQ: {}},  # from a VMI (only?)
         Code._1FC9: {I_: {}},
@@ -1078,8 +1127,8 @@ _DEV_KLASSES_HVAC: dict[str, dict] = {
     # },
 }
 
-CODES_BY_DEV_SLUG: dict[str, dict] = {
-    DEV_TYPE.HGI: {  # HGI80: RF to (USB) serial gateway interface
+CODES_BY_DEV_SLUG: dict[str, dict[Code, dict[VerbT, Any]]] = {
+    DevType.HGI: {  # HGI80: RF to (USB) serial gateway interface
         Code._PUZZ: {I_: {}, RQ: {}, W_: {}},
     },  # HGI80s can do what they like
     **{k: v for k, v in _DEV_KLASSES_HVAC.items() if k is not None},
@@ -1087,11 +1136,10 @@ CODES_BY_DEV_SLUG: dict[str, dict] = {
 }
 
 CODES_OF_HEAT_DOMAIN: tuple[Code] = sorted(  # type: ignore[assignment]
-    tuple(set(c for k in _DEV_KLASSES_HEAT.values() for c in k))
-    + (Code._0B04, Code._2389)
+    tuple({c for k in _DEV_KLASSES_HEAT.values() for c in k}) + (Code._0B04, Code._2389)
 )
 CODES_OF_HVAC_DOMAIN: tuple[Code] = sorted(  # type: ignore[assignment]
-    tuple(set(c for k in _DEV_KLASSES_HVAC.values() for c in k))
+    tuple({c for k in _DEV_KLASSES_HVAC.values() for c in k})
     + (Code._22F8, Code._4401, Code._4E01, Code._4E02, Code._4E04)
 )
 CODES_OF_HEAT_DOMAIN_ONLY: tuple[Code, ...] = tuple(
@@ -1100,27 +1148,27 @@ CODES_OF_HEAT_DOMAIN_ONLY: tuple[Code, ...] = tuple(
 CODES_OF_HVAC_DOMAIN_ONLY: tuple[Code, ...] = tuple(
     c for c in sorted(CODES_OF_HVAC_DOMAIN) if c not in CODES_OF_HEAT_DOMAIN
 )
-_CODES_OF_BOTH_DOMAINS: tuple[Code, ...] = sorted(
-    tuple(set(CODES_OF_HEAT_DOMAIN) & set(CODES_OF_HVAC_DOMAIN))
+_CODES_OF_BOTH_DOMAINS: tuple[Code, ...] = tuple(
+    sorted(set(CODES_OF_HEAT_DOMAIN) & set(CODES_OF_HVAC_DOMAIN))
 )
-_CODES_OF_EITHER_DOMAIN: tuple[Code, ...] = sorted(
-    tuple(set(CODES_OF_HEAT_DOMAIN) | set(CODES_OF_HVAC_DOMAIN))
+_CODES_OF_EITHER_DOMAIN: tuple[Code, ...] = tuple(
+    sorted(set(CODES_OF_HEAT_DOMAIN) | set(CODES_OF_HVAC_DOMAIN))
 )
 _CODES_OF_NO_DOMAIN: tuple[Code, ...] = tuple(
     c for c in CODES_SCHEMA if c not in _CODES_OF_EITHER_DOMAIN
 )
 
-_CODE_FROM_NON_CTL: tuple[Code] = tuple(  # type: ignore[assignment]
+_CODE_FROM_NON_CTL: tuple[Code, ...] = tuple(
     dict.fromkeys(
         c
         for k, v1 in CODES_BY_DEV_SLUG.items()
         for c, v2 in v1.items()
-        if k != DEV_TYPE.CTL and (I_ in v2 or RP in v2)
+        if k != DevType.CTL and (I_ in v2 or RP in v2)
     )
 )
-_CODE_FROM_CTL = _DEV_KLASSES_HEAT[DEV_TYPE.CTL].keys()
+_CODE_FROM_CTL = _DEV_KLASSES_HEAT[DevType.CTL].keys()
 
-_CODE_ONLY_FROM_CTL: tuple[Code] = tuple(  # type: ignore[assignment]
+_CODE_ONLY_FROM_CTL: tuple[Code, ...] = tuple(
     c for c in _CODE_FROM_CTL if c not in _CODE_FROM_NON_CTL
 )
 CODES_ONLY_FROM_CTL: tuple[Code, ...] = (
@@ -1130,6 +1178,10 @@ CODES_ONLY_FROM_CTL: tuple[Code, ...] = (
     Code._313F,
 )  # I packets, TODO: 31Dx too?
 
+#
+########################################################################################
+# Other Stuff
+
 # ### WIP:
 # _result = {}
 # for domain in (_DEV_KLASSES_HVAC, ):
@@ -1149,22 +1201,22 @@ CODES_ONLY_FROM_CTL: tuple[Code, ...] = (
 # }
 
 
-_HVAC_VC_PAIR_BY_CLASS: dict[str, tuple] = {
-    DEV_TYPE.CO2: ((I_, Code._1298),),
-    DEV_TYPE.FAN: ((I_, Code._31D9), (I_, Code._31DA), (RP, Code._31DA)),
-    DEV_TYPE.HUM: ((I_, Code._12A0),),
-    DEV_TYPE.REM: ((I_, Code._22F1), (I_, Code._22F3)),
+_HVAC_VC_PAIR_BY_CLASS: dict[DevType, tuple[tuple[VerbT, Code], ...]] = {
+    DevType.CO2: ((I_, Code._1298),),
+    DevType.FAN: ((I_, Code._31D9), (I_, Code._31DA), (RP, Code._31DA)),
+    DevType.HUM: ((I_, Code._12A0),),
+    DevType.REM: ((I_, Code._22F1), (I_, Code._22F3)),
 }
-HVAC_KLASS_BY_VC_PAIR: dict[tuple, str] = {
+HVAC_KLASS_BY_VC_PAIR: dict[tuple[VerbT, Code], DevType] = {
     t: k for k, v in _HVAC_VC_PAIR_BY_CLASS.items() for t in v
 }
 
 
-SZ_DESCRIPTION = "description"
-SZ_MIN_VALUE = "min_value"
-SZ_MAX_VALUE = "max_value"
-SZ_PRECISION = "precision"
-SZ_DATA_TYPE = "data_type"
+SZ_DESCRIPTION: Final = "description"
+SZ_MIN_VALUE: Final = "min_value"
+SZ_MAX_VALUE: Final = "max_value"
+SZ_PRECISION: Final = "precision"
+SZ_DATA_TYPE: Final = "data_type"
 
 _22F1_MODE_ITHO: dict[str, str] = {
     "00": "off",  # not seen
@@ -1192,13 +1244,24 @@ _22F1_MODE_ORCON: dict[str, str] = {
     "07": "off",
 }
 
-_22F1_SCHEMES: dict[str, dict] = {
+_22F1_MODE_VASCO: dict[str, str] = {  # for VASCO D60 and ClimaRad Minibox remotes
+    "00": "off",
+    "01": "away",  # 000106 minimum
+    "02": "low",  # 000206
+    "03": "medium",  # 000306
+    "04": "high",  # 000406, aka boost with 22F3
+    "05": "auto",
+}
+
+_22F1_SCHEMES: dict[str, dict[str, str]] = {
     "itho": _22F1_MODE_ITHO,
     "nuaire": _22F1_MODE_NUAIRE,
     "orcon": _22F1_MODE_ORCON,
+    "vasco": _22F1_MODE_VASCO,
 }
 
-_2411_PARAMS_SCHEMA: dict[str, dict] = {  # unclear if true for only Orcon/*all* models
+# unclear if true for only Orcon/*all* models
+_2411_PARAMS_SCHEMA: dict[str, dict[str, Any]] = {
     "31": {  # slot 09
         SZ_DESCRIPTION: "Time to change filter (days)",
         SZ_MIN_VALUE: 0,
@@ -1299,11 +1362,25 @@ _2411_PARAMS_SCHEMA: dict[str, dict] = {  # unclear if true for only Orcon/*all*
     },
 }
 
+# ventilation speed description
+_31D9_FAN_INFO_VASCO: dict[int, str] = {
+    0x00: "off",
+    0x01: "1 (trickle)",  # aka low
+    0x02: "2 (low)",  # aka medium
+    0x03: "3 (medium)",  # aka high
+    0x04: "4 (boost)",
+    0x05: "auto",
+    0xC8: "III (boost)",  # same code sent for speed II and III, mode manual
+    0x50: "I (low)",
+    0x1E: "0 (very low)",
+}
+
+# ventilation speed
 _31DA_FAN_INFO: dict[int, str] = {
     0x00: "off",
-    0x01: "speed 1",  # low
-    0x02: "speed 2",  # medium
-    0x03: "speed 3",  # high
+    0x01: "speed 1, low",  # aka low
+    0x02: "speed 2, medium",  # aka medium
+    0x03: "speed 3, high",  # aka high
     0x04: "speed 4",
     0x05: "speed 5",
     0x06: "speed 6",
@@ -1311,8 +1388,8 @@ _31DA_FAN_INFO: dict[int, str] = {
     0x08: "speed 8",
     0x09: "speed 9",
     0x0A: "speed 10",
-    0x0B: "speed 1 temporary override",
-    0x0C: "speed 2 temporary override",
+    0x0B: "speed 1 temporary override",  # timer
+    0x0C: "speed 2 temporary override",  # timer
     0x0D: "speed 3 temporary override",  # timer/boost? (timer 1, 2, 3)
     0x0E: "speed 4 temporary override",
     0x0F: "speed 5 temporary override",
@@ -1321,17 +1398,17 @@ _31DA_FAN_INFO: dict[int, str] = {
     0x12: "speed 8 temporary override",
     0x13: "speed 9 temporary override",
     0x14: "speed 10 temporary override",
-    0x15: "away",
+    0x15: "away",  # absolute minimum speed
     0x16: "absolute minimum",  # trickle?
-    0x17: "absolute maximum",  # boost?
+    0x17: "boost",  # absolute maximum",  # boost?
     0x18: "auto",
-    0x19: "auto night",
+    0x19: "auto_night",
     0x1A: "-unknown 0x1A-",
     0x1B: "-unknown 0x1B-",
     0x1C: "-unknown 0x1C-",
     0x1D: "-unknown 0x1D-",
     0x1E: "-unknown 0x1E-",
-    0x1F: "-unknown 0x1F-",
+    0x1F: "-unknown 0x1F-",  # static field, used as filter in parser_31da so keep same
 }