ramses-rf 0.52.3__tar.gz → 0.52.4__tar.gz

ramses_rf-0.52.4/.github/workflows/check-cov.yml

@@ -0,0 +1,131 @@
+name: Coverage
+# based on: https://github.com/marketplace/actions/code-coverage-summary
+
+on:
+  push:
+    branches: [ "master" ]
+    paths: [
+      ".github/workflows/check-cov.yml",
+      "pyproject.toml",
+      "requirements/**",
+      "src/**.py",
+      "tests/**",
+    ]
+
+  pull_request:
+    branches: [ "master" ]
+    paths: [
+      ".github/workflows/check-cov.yml",
+      "pyproject.toml",
+      "requirements/**",
+      "src/**.py",
+      "tests/**",
+    ]
+
+  pull_request_target:
+    branches: [ "master" ]
+    paths: [
+      ".github/workflows/check-cov.yml",
+      "pyproject.toml",
+      "requirements/**",
+      "src/**.py",
+      "tests/**",
+    ]
+
+  schedule:
+    - cron: "0 7 * * 5"
+
+  workflow_dispatch:
+
+permissions:
+  pull-requests: write
+
+jobs:
+  coverage:
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version: ["3.14"]
+
+    steps:
+      - uses: actions/checkout@v6
+
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v6
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install -r requirements/requirements_dev.txt
+
+      - name: Install the package (and its dependencies)
+        run: pip install -e .
+
+      - name: Run coverage with pytest
+        run: coverage run -m pytest
+
+      - name: Debug - Check if .coverage exists
+        run: test -f .coverage && echo ".coverage exists" || echo ".coverage does NOT exist"
+
+      - name: Display coverage report
+        run: coverage report
+
+      - name: Create coverage xml
+        run: coverage xml
+
+      - name: Create Code Coverage Report
+        # from: https://github.com/marketplace/actions/code-coverage-summary
+        uses: irongut/CodeCoverageSummary@v1.3.0
+        with:
+          filename: coverage.xml
+          badge: true
+          fail_below_min: true
+          format: markdown
+          hide_branch_rate: false
+          hide_complexity: true
+          indicators: true
+          output: both
+          thresholds: '60 80'
+
+      - name: Add Coverage PR Comment
+        # from: https://github.com/marketplace/actions/comment-pull-request
+        if: github.event_name == 'pull_request_target'
+        uses: thollander/actions-comment-pull-request@v3
+        with:
+          file-path: code-coverage-results.md
+          comment-tag: code-coverage-results.md  # replaces existing by this name
+          mode: recreate
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        # or: https://github.com/marketplace/actions/sticky-pull-request-comment
+        #        if: github.event_name == 'pull_request'
+        #        with:
+        #          recreate: true
+        #          path: code-coverage-results.md
+        # GITHUB_TOKEN is implicitly passed in
+
+#      - name: Create Coverage Badge
+#        # from: https://github.com/marketplace/actions/coverage-py-badge
+#        uses: tj-actions/coverage-badge-py@v2
+#        id: coverage-badge-py
+#        with:
+#            # Output path to write the
+#            # coverage badge.
+#            # Type: string
+#            # Default: "coverage.svg"
+#            output: 'misc/coverage-badge.svg'
+#
+#            # Overwrite an existing coverage badge.
+#            # Type: boolean
+#            # Default: "true"
+#            overwrite: ''
+#
+#            # Current working directory
+#            # Type: string
+#            # Default: "."
+#            working-directory: ''
+
+      - run: echo "🍏 This job's status is ${{ job.status }}."

{ramses_rf-0.52.3 → ramses_rf-0.52.4}/.github/workflows/check-lint.yml

@@ -31,7 +31,7 @@ jobs:
         python-version: ["3.13"]
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
 
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v6

{ramses_rf-0.52.3 → ramses_rf-0.52.4}/.github/workflows/check-test.yml

@@ -31,7 +31,7 @@ jobs:
         python-version: ["3.11", "3.12", "3.13"]
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
 
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v6

{ramses_rf-0.52.3 → ramses_rf-0.52.4}/.github/workflows/check-type.yml

@@ -31,7 +31,7 @@ jobs:
         python-version: ["3.13"]
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
 
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v6

{ramses_rf-0.52.3 → ramses_rf-0.52.4}/.github/workflows/publish-hatch.yml

@@ -17,7 +17,7 @@ jobs:
     name: Build release to /dist
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
 
       - name: Install hatch
         run: pipx install hatch

{ramses_rf-0.52.3 → ramses_rf-0.52.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ramses_rf
-Version: 0.52.3
+Version: 0.52.4
 Summary: A stateful RAMSES-II protocol decoder & analyser.
 Project-URL: Homepage, https://github.com/ramses-rf/ramses_rf
 Project-URL: Bug Tracker, https://github.com/ramses-rf/ramses_rf/issues
@@ -22,6 +22,7 @@ Description-Content-Type: text/markdown
 ![Linting](https://github.com/ramses-rf/ramses_rf/actions/workflows/check-lint.yml/badge.svg)
 ![Typing](https://github.com/ramses-rf/ramses_rf/actions/workflows/check-type.yml/badge.svg)
 ![Testing](https://github.com/ramses-rf/ramses_rf/actions/workflows/check-test.yml/badge.svg)
+[![Coverage](https://github.com/ramses-rf/ramses_rf/actions/workflows/check-cov.yml/badge.svg?event=push)](https://github.com/ramses-rf/ramses_rf/actions/workflows/check-cov.yml)
 
 ## Overview
 

{ramses_rf-0.52.3 → ramses_rf-0.52.4}/README.md

@@ -1,6 +1,7 @@
 ![Linting](https://github.com/ramses-rf/ramses_rf/actions/workflows/check-lint.yml/badge.svg)
 ![Typing](https://github.com/ramses-rf/ramses_rf/actions/workflows/check-type.yml/badge.svg)
 ![Testing](https://github.com/ramses-rf/ramses_rf/actions/workflows/check-test.yml/badge.svg)
+[![Coverage](https://github.com/ramses-rf/ramses_rf/actions/workflows/check-cov.yml/badge.svg?event=push)](https://github.com/ramses-rf/ramses_rf/actions/workflows/check-cov.yml)
 
 ## Overview
 

ramses_rf-0.52.3/docs/source/binding_process_diagram.md → ramses_rf-0.52.4/docs/source/binding_process.md

@@ -1,4 +1,4 @@
-# RAMSES RF Binding Process Diagram
+# RAMSES RF Binding Process
 
 ## Overview
 This diagram shows the binding finite state machine (FSM) for RAMSES RF devices, illustrating the complete process from initial state to binding completion.
@@ -38,8 +38,8 @@ stateDiagram-v2
         RespHasBoundAsRespondent
     end
 
-    classDef supplicant fill:#006400,stroke:#ffffff,stroke-width:2px
-    classDef respondent fill:#00008B,stroke:#ffffff,stroke-width:2px
+    classDef supplicant fill:#ff64dd,stroke:#ffffff,stroke-width:2px
+    classDef respondent fill:#55bb8B,stroke:#ffffff,stroke-width:2px
 
     class SuppSendOfferWaitForAccept,OfferSent,SuppIsReadyToSendConfirm,SuppHasBoundAsSupplicant supplicant
     class RespIsWaitingForOffer,OfferReceived,RespSendAcceptWaitForConfirm,RespHasBoundAsRespondent respondent

{ramses_rf-0.52.3 → ramses_rf-0.52.4}/docs/source/index.rst

@@ -11,7 +11,7 @@ ramses_rf
 
    usage
    glossary
-   binding_process_diagram
+   binding_process
 
 .. toctree::
    :maxdepth: 2

{ramses_rf-0.52.3 → ramses_rf-0.52.4}/pyproject.toml

@@ -81,8 +81,46 @@
   asyncio_default_fixture_loop_scope = "function"
   asyncio_mode = "auto"
 
+  testpaths = [
+    "tests/"
+  ]
   norecursedirs = "deprecated/*"
 
+  # pytest-cov slows down our tests to 10 mins, so leave off.
+  # We run coverage in a separate workflow on python 3.13 only (fastest)
+  # pytest-cov coverage reporting. open htmlcov/index.html in a browser for details
+  # addopts = ["--cov=src", "--cov-fail-under=50", "--cov-report=xml", "--cov-report=term"]
+  # to create an interactive local HTML report, add: --cov-report=html
+  # to report missed lines during test writing, add: --cov-report=term-missing
+  # PyCharm might not hit a breakpoint. For debugging, disable -cov by adding:
+  # –no-cov"
+  # cov_report_term = "term-missing:skip-covered"
+
+#
+### coverage #########################################################################
+
+[tool.coverage.run]
+  core = "sysmon"  # essential setting for speed on GitHub < 11 secs instead of >12 mins
+  branch = false  # true takes a lot longer and can't be combined with sysmon
+#  patch = ["subprocess"]
+  source = [
+    "src",
+    "tests"
+  ]
+
+[tool.coverage.report]
+  # Regexes for lines to exclude from consideration
+  exclude_also = [
+    # Don't complain if tests don't hit defensive assertion code:
+    "raise AssertionError",
+    "raise NotImplementedError",
+  ]
+  format = "text"
+  fail_under = 75
+  ignore_errors = true
+
+[tool.coverage.html]
+  directory = "coverage_html"
 
 #
 ### mypy #############################################################################

{ramses_rf-0.52.3 → ramses_rf-0.52.4}/ramses_rf/database.py

@@ -130,11 +130,15 @@ class MessageIndex:
     def stop(self) -> None:
         """Stop the housekeeper loop."""
 
-        if self._housekeeping_task and (not self._housekeeping_task.done()):
+        if (
+            self.maintain
+            and self._housekeeping_task
+            and (not self._housekeeping_task.done())
+        ):
             self._housekeeping_task.cancel()  # stop the housekeeper
 
         self._cx.commit()  # just in case
-        # self._cx.close()  # may still need to do queries after engine has stopped?
+        self._cx.close()  # may still need to do queries after engine has stopped?
 
     @property
     def msgs(self) -> MsgDdT:
@@ -193,7 +197,7 @@ class MessageIndex:
             """
             dtm = dt_now - _cutoff  # .isoformat(timespec="microseconds") < needed?
 
-            self._cu.execute("SELECT dtm FROM messages WHERE dtm => ?", (dtm,))
+            self._cu.execute("SELECT dtm FROM messages WHERE dtm >= ?", (dtm,))
             rows = self._cu.fetchall()  # fetch dtm of current messages to retain
 
             try:  # make this operation atomic, i.e. update self._msgs only on success

{ramses_rf-0.52.3 → ramses_rf-0.52.4}/ramses_rf/device/heat.py

@@ -450,7 +450,7 @@ class UfhController(Parent, DeviceHeat):  # UFC (02):
                 #     )
                 #     self._send_cmd(cmd)
 
-        elif msg.code == Code._0008:  # relay_demand, TODO: use msgIndex DB?
+        elif msg.code == Code._0008:  # relay_demand
             if msg.payload.get(SZ_DOMAIN_ID) == FC:
                 self._relay_demand = msg
             else:  # FA

{ramses_rf-0.52.3 → ramses_rf-0.52.4}/ramses_rf/entity_base.py

@@ -224,7 +224,10 @@ class _MessageDB(_Entity):
 
         # As of 0.52.1 we use SQLite MessageIndex, see ramses_rf/database.py
         # _msgz_ (nested) was only used in this module. Note:
-        # _msgz (now rebuilt from _msgs) also used in: client, base, device.heat
+        # _msgz (now rebuilt from _msgs) is also used in:
+        #   - client.py: for code in device._msgz.values()
+        #   - base.py: Code._1060 in self._msgz
+        #   [x] device.heat (no longer used)
 
     def _handle_msg(self, msg: Message) -> None:
         """Store a msg in the DBs.
@@ -244,14 +247,14 @@ class _MessageDB(_Entity):
 
         if self._gwy.msg_db:  # central SQLite MessageIndex
             _LOGGER.debug(
-                "For %s (z_id %s) add msg %s, src %s, dst %s to msg_db.",
+                "For %s (_z_id %s) add msg %s, src %s, dst %s to msg_db.",
                 self.id,
                 self._z_id,
                 msg,
                 msg.src,
                 msg.dst,
             )
-            debug_code: Code = Code._3150
+            debug_code: Code = Code._3150  # for debugging only log these, pick your own
             if msg.code == debug_code and msg.src.id.startswith("01:"):
                 _LOGGER.debug(
                     "Added msg from %s with code %s to _gwy.msg_db. hdr=%s",
@@ -293,6 +296,7 @@ class _MessageDB(_Entity):
     def _msg_list(self) -> list[Message]:
         """Return a flattened list of all messages logged on this device."""
         # (only) used in gateway.py#get_state() and in tests/tests/test_eavesdrop_schema.py
+        # TODO remove _msg_list Q1 2026
         if self._gwy.msg_db:
             msg_list_qry: list[Message] = []
             code_list = self._msg_dev_qry()
@@ -303,16 +307,21 @@ class _MessageDB(_Entity):
                         msg_list_qry.append(self._msgs[c])
                     else:
                         # evohome has these errors
-                        # _msg_list could not fetch self._msgs[7FFF] for 18:072981 (z_id 18:072981)
+                        # _msg_list could not fetch self._msgs[7FFF] for 18:072981 (_z_id 18:072981)
                         _LOGGER.debug(
-                            "_msg_list could not fetch self._msgs[%s] for %s (z_id %s)",
+                            "_msg_list could not fetch self._msgs[%s] for %s (_z_id %s)",
                             c,
                             self.id,
                             self._z_id,
                         )
             return msg_list_qry
         # else create from legacy nested dict
-        return [m for c in self._msgz.values() for v in c.values() for m in v.values()]
+        return [
+            msg
+            for code in self._msgz.values()
+            for ctx in code.values()
+            for msg in ctx.values()
+        ]
 
     def _add_record(
         self, address: Address, code: Code | None = None, verb: str = " I"
@@ -424,7 +433,7 @@ class _MessageDB(_Entity):
         **kwargs: Any,
     ) -> dict | list | None:
         """
-        Query the message dict or the SQLite index for the most recent
+        Query the _msgz message dict or the SQLite MessageIndex for the most recent
         key: value pairs(s) for a given code.
 
         :param code: filter messages by Code or a tuple of Codes, optional
@@ -517,7 +526,7 @@ class _MessageDB(_Entity):
             or (idx == SZ_DOMAIN_ID)
         ), (
             f"full dict:{msg_dict}, payload:{msg.payload} < Coding error: key='{idx}', val='{val}'"
-        )  # should not be there (TODO(eb): BUG but occurs when using SQLite MessageIndex)
+        )  # should not be there
 
         if (
             key == "*" or not key
@@ -535,21 +544,35 @@ class _MessageDB(_Entity):
         """
         Retrieve from the MessageIndex a list of Code keys involving this device.
 
-        :return: list of Codes or empty list when query returned empty
+        :return: list of Codes or an empty list when the query returned empty
         """
 
         if self._gwy.msg_db:
             # SQLite query on MessageIndex
             res: list[Code] = []
-            if self.id[_ID_SLICE:] == "_HW":
+
+            if len(self.id) == 9:
+                # fetch a ctl's message codes (add all its children?)
+                sql = """
+                    SELECT code from messages WHERE
+                    verb in (' I', 'RP')
+                    AND (src = ? OR dst = ?)
+                    AND ctx LIKE ?
+                """
+                _ctx_qry = "%"
+
+            elif self.id[_ID_SLICE:] == "_HW":
+                # fetch a DHW entity's message codes
                 sql = """
                     SELECT code from messages WHERE
                     verb in (' I', 'RP')
                     AND (src = ? OR dst = ?)
                     AND (ctx IN ('FC', 'FA', 'F9', 'FA') OR plk LIKE ?)
                 """
-                _ctx_qry = "%dhw_idx%"  # syntax error ?
+                _ctx_qry = "%dhw_idx%"
+
             else:
+                # fetch a zone's message codes
                 sql = """
                     SELECT code from messages WHERE
                     verb in (' I', 'RP')
@@ -562,12 +585,12 @@ class _MessageDB(_Entity):
                 sql, (self.id[:_ID_SLICE], self.id[:_ID_SLICE], _ctx_qry)
             ):
                 _LOGGER.debug(
-                    "Fetched from index: %s for %s (z_id %s)",
+                    "Fetched from index: %s for %s (_z_id %s)",
                     rec[0],
                     self.id,
                     self._z_id,
                 )
-                # Example: "Fetched from index: code 1FD4 for 01:123456 (z_id 01)"
+                # Example: "Fetched from index: code 1FD4 for 01:123456 (_z_id 01)"
                 res.append(Code(str(rec[0])))
             return res
         else:
@@ -743,7 +766,18 @@ class _MessageDB(_Entity):
         # for r in results:
         #     print(r)
 
-        if self.id[_ID_SLICE:] == "_HW":
+        if len(self.id) == 9:
+            # fetch a ctl's message dtms (add all its children?)
+            sql = """
+                SELECT dtm from messages WHERE
+                verb in (' I', 'RP')
+                AND (src = ? OR dst = ?)
+                AND ctx LIKE ?
+            """
+            _ctx_qry = "%"
+
+        elif self.id[_ID_SLICE:] == "_HW":
+            # fetch a DHW entity's message dtms
             sql = """
                 SELECT dtm from messages WHERE
                 verb in (' I', 'RP')
@@ -753,6 +787,7 @@ class _MessageDB(_Entity):
             _ctx_qry = "%dhw_idx%"
             # TODO add Children messages? self.ctl.dhw
         else:
+            # fetch a zone's message dtms
             sql = """
                 SELECT dtm from messages WHERE
                 verb in (' I', 'RP')
@@ -769,14 +804,14 @@ class _MessageDB(_Entity):
         }
         # if CTL, remove 3150, 3220 heat_demand, both are only stored on children
         # HACK
-        if self.id[:3] == "01:" and self._SLUG == "CTL":
-            # with next ON: 2 errors , both 1x UFC, 1x CTR
-            # with next OFF: 4 errors, all CTR
-            # if Code._3150 in _msg_dict:  # Note: CTL can send a 3150 (see heat_ufc_00)
-            #     _msg_dict.pop(Code._3150)  # keep, prefer to have 2 extra instead of missing 1
-            if Code._3220 in _msg_dict:
-                _msg_dict.pop(Code._3220)
-            # _LOGGER.debug(f"Removed 3150/3220 from %s._msgs dict", self.id)
+        # if self.id[:3] == "01:" and self._SLUG == "CTL":
+        # with next ON: 2 errors , both 1x UFC, 1x CTR
+        # with next OFF: 4 errors, all CTR
+        # if Code._3150 in _msg_dict:  # Note: CTL can send a 3150 (see heat_ufc_00)
+        #     _msg_dict.pop(Code._3150)  # keep, prefer to have 2 extra instead of missing 1
+        # if Code._3220 in _msg_dict:
+        #     _msg_dict.pop(Code._3220)
+        # _LOGGER.debug(f"Removed 3150/3220 from %s._msgs dict", self.id)
         return _msg_dict
 
     @property
@@ -862,7 +897,6 @@ class _Discovery(_MessageDB):
         #     return f"{data_id:02X}"  # type: ignore[return-value]
 
         res: list[str] = []
-        # look for the "sim" OT 3220 record initially added in OtbGateway.init
         if self._gwy.msg_db:
             # SQLite query for ctx field on MessageIndex
             sql = """
@@ -995,18 +1029,24 @@ class _Discovery(_MessageDB):
                         sql = """
                             SELECT dtm from messages WHERE
                             code = ?
-                            verb = ' I'
+                            AND verb = ' I'
                             AND ctx = 'True'
                             AND (src = ? OR dst = ?)
                         """
-                        msgs += self._gwy.msg_db.qry(
+                        res = self._gwy.msg_db.qry(
                             sql,
                             (
                                 task[_SZ_COMMAND].code,
                                 self.tcs.id[:_ID_SLICE],
                                 self.tcs.id[:_ID_SLICE],
                             ),
-                        )[0]  # expect 1 Message in returned tuple
+                        )
+                        if len(res) > 0:
+                            msgs += res[0]  # expect 1 Message in returned tuple
+                        else:
+                            _LOGGER.debug(
+                                f"No msg found for hdr {hdr}, tesk code {task[_SZ_COMMAND].code}"
+                            )
                     else:  # TODO(eb) remove next Q1 2026
                         msgs += [self.tcs._msgz[task[_SZ_COMMAND].code][I_][True]]
                         # raise NotImplementedError
@@ -1145,6 +1185,7 @@ class Parent(Entity):  # A System, Zone, DhwZone or a UfhController
     (incl. the DHW Zone), and also any UFH controllers.
 
     For a heating Zone, children are limited to a sensor, and a number of actuators.
+
     For the DHW Zone, the children are limited to a sensor, a DHW valve, and/or a
     heating valve.
 

{ramses_rf-0.52.3 → ramses_rf-0.52.4}/ramses_rf/gateway.py

@@ -258,14 +258,6 @@ class Gateway(Engine):
             #     return True
             return include_expired or not msg._expired
 
-        msgs = [m for device in self.devices for m in device._msg_list]
-
-        for system in self.systems:
-            msgs.extend(list(system._msgs.values()))
-            msgs.extend([m for z in system.zones for m in z._msgs.values()])
-            # msgs.extend([m for z in system.dhw for m in z._msgs.values()])  # TODO: DHW
-            # Related to/Fixes ramses_cc Issue 249 non-existing via-device _HW ?
-
         if self.msg_db:
             pkts = {
                 f"{repr(msg._pkt)[:26]}": f"{repr(msg._pkt)[27:]}"
@@ -273,12 +265,20 @@ class Gateway(Engine):
                 if wanted_msg(msg, include_expired=include_expired)
             }
         else:  # deprecated, to be removed in Q1 2026
-            # _LOGGER.warning("Missing MessageIndex")
+            msgs = [m for device in self.devices for m in device._msg_list]
+            # add systems._msgs and zones._msgs
+            for system in self.systems:
+                msgs.extend(list(system._msgs.values()))
+                msgs.extend([m for z in system.zones for m in z._msgs.values()])
+                # msgs.extend([m for z in system.dhw for m in z._msgs.values()])  # TODO: DHW
+                # Related to/Fixes ramses_cc Issue 249 non-existing via-device _HW ?
+
             pkts = {  # BUG: assumes pkts have unique dtms: may be untrue for contrived logs
                 f"{repr(msg._pkt)[:26]}": f"{repr(msg._pkt)[27:]}"
                 for msg in msgs
                 if wanted_msg(msg, include_expired=include_expired)
             }
+            # _LOGGER.warning("Missing MessageIndex")
 
         self._resume()
 

{ramses_rf-0.52.3 → ramses_rf-0.52.4}/ramses_rf/system/heat.py

@@ -532,7 +532,7 @@ class MultiZone(SystemBase):  # 0005 (+/- 000C?)
         schema = shrink(SCH_TCS_ZONES_ZON(schema))
 
         zon: Zone = self.zone_by_idx.get(zone_idx)  # type: ignore[assignment]
-        if zon is None:
+        if zon is None:  # not found in tcs, create it
             zon = zone_factory(self, zone_idx, msg=msg, **schema)  # type: ignore[unreachable]
             self.zone_by_idx[zon.idx] = zon
             self.zones.append(zon)

{ramses_rf-0.52.3 → ramses_rf-0.52.4}/ramses_rf/version.py

@@ -1,4 +1,4 @@
 """RAMSES RF - a RAMSES-II protocol decoder & analyser (application layer)."""
 
-__version__ = "0.52.3"
+__version__ = "0.52.4"
 VERSION = __version__

{ramses_rf-0.52.3 → ramses_rf-0.52.4}/ramses_tx/const.py

@@ -440,7 +440,7 @@ DEV_TYPE_MAP = attr_dict_factory(
         ),  # CH/DHW devices instead of HVAC/other
         "HEAT_ZONE_SENSORS": ("00", "01", "03", "04", "12", "22", "34"),
         "HEAT_ZONE_ACTUATORS": ("00", "02", "04", "13"),
-        "THM_DEVICES": ("03", "12", "22", "34"),
+        "THM_DEVICES": ("03", "12", "21", "22", "34"),
         "TRV_DEVICES": ("00", "04"),
         "CONTROLLERS": ("01", "02", "12", "22", "23", "34"),  # potentially controllers
         "PROMOTABLE_SLUGS": (DevType.DEV, DevType.HEA, DevType.HVC),