ramses-rf 0.52.2__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.2 → 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
@@ -41,7 +41,7 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install ruff  # pip install -r requirements_dev.txt
+          pip install ruff  # pip install -r requirements/requirements_dev.txt
 
       - name: Check with ruff
         run: ruff check --output-format=github .

{ramses_rf-0.52.2 → 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
@@ -41,7 +41,7 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install -r requirements_dev.txt
+          pip install -r requirements/requirements_dev.txt
 
       - name: Install the package (and its dependencies)
         run: pip install -e .

{ramses_rf-0.52.2 → 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
@@ -41,7 +41,7 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install -r requirements_dev.txt
+          pip install -r requirements/requirements_dev.txt
 
       - name: Install the package (its dependencies are needed for typing)
         run: pip install -e .

{ramses_rf-0.52.2 → 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
@@ -26,7 +26,7 @@ jobs:
         run: hatch build
 
       - name: Upload dist
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: dist
           path: dist/
@@ -40,7 +40,7 @@ jobs:
       url: https://pypi.org/project/ramses_rf
     steps:
       - name: Download dist
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v6
         with:
           name: dist
           path: dist/

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ramses_rf
-Version: 0.52.2
+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.2 → 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.4/docs/source/binding_process.md

@@ -0,0 +1,159 @@
+# 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.
+
+## State Machine Diagram
+
+```mermaid
+stateDiagram-v2
+    direction LR
+    [*] --> DevIsNotBinding
+    DevIsNotBinding --> InitiateBindingProcess : initiate_binding_process()
+    InitiateBindingProcess --> SuppSendOfferWaitForAccept
+    SuppSendOfferWaitForAccept --> OfferSent : _make_offer()
+    OfferSent --> SuppSendOfferWaitForAccept : wait_for_accept()
+    DevIsNotBinding --> RespIsWaitingForOffer : wait_for_binding_request()
+    RespIsWaitingForOffer --> OfferReceived : _wait_for_offer()
+    OfferReceived --> RespSendAcceptWaitForConfirm : _accept_offer()
+    RespSendAcceptWaitForConfirm --> SuppIsReadyToSendConfirm : wait_for_confirm()
+    SuppIsReadyToSendConfirm --> StateDecisionPoint : cast_confirm_accept()
+    StateDecisionPoint --> RespHasBoundAsRespondent : No addenda
+    StateDecisionPoint --> SuppHasBoundAsSupplicant : Yes addenda / Complete
+    RespHasBoundAsRespondent --> DevIsNotBinding
+    SuppHasBoundAsSupplicant --> DevIsNotBinding
+    DevIsNotBinding --> [*] : Binding Complete
+
+    subgraph Supplicant Role
+        SuppSendOfferWaitForAccept
+        OfferSent
+        SuppIsReadyToSendConfirm
+        SuppHasBoundAsSupplicant
+    end
+
+    subgraph Respondent Role
+        RespIsWaitingForOffer
+        OfferReceived
+        RespSendAcceptWaitForConfirm
+        RespHasBoundAsRespondent
+    end
+
+    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
+    class Supplicant Role supplicant
+    class Respondent Role respondent
+
+    note right of DevIsNotBinding
+        Not binding<br/>Ready to start
+    end note
+
+    note right of SuppSendOfferWaitForAccept
+        Made Offer<br/>Waiting for Accept
+    end note
+
+    note right of RespIsWaitingForOffer
+        Waiting for Offer
+    end note
+
+    note right of RespSendAcceptWaitForConfirm
+        Sent Accept<br/>Waiting for Confirm
+    end note
+
+    note right of SuppIsReadyToSendConfirm
+        Received Accept<br/>Ready to send Confirm
+    end note
+
+    note right of StateDecisionPoint
+        If addenda: SendAddenda<br/>If no addenda: Complete
+    end note
+
+    note right of RespHasBoundAsRespondent
+        Binding Complete
+    end note
+
+    note right of SuppHasBoundAsSupplicant
+        Binding Complete<br/>Nothing more to do
+    end note
+```
+
+## Method Flow by Role
+
+### Supplicant Flow (Device initiating binding)
+```python
+async def initiate_binding_process(self, offer_codes, confirm_code=None, ratify_cmd=None):
+    1. _make_offer(offer_codes, oem_code)           # Send Offer packet
+    2. _wait_for_accept(tender)                     # Wait for Accept response
+    3. _confirm_accept(accept, confirm_code)        # Send Confirm packet
+    4. _cast_addenda(accept, ratify_cmd)            # Optional: Send Addenda
+
+    # Result: SuppHasBoundAsSupplicant state
+```
+
+### Respondent Flow (Device responding to binding)
+```python
+async def wait_for_binding_request(self, accept_codes, idx="00", require_ratify=False):
+    1. _wait_for_offer()                            # Wait for Offer packet
+    2. _accept_offer(tender, accept_codes, idx)     # Send Accept packet
+    3. _wait_for_confirm(accept)                    # Wait for Confirm packet
+    4. _wait_for_addenda(accept)                    # Optional: Wait for Addenda
+
+    # Result: RespHasBoundAsRespondent state
+```
+
+## State Details
+
+| State | Role | Description | Key Methods |
+|-------|------|-------------|-------------|
+| `DevIsNotBinding` | Any | Initial/final state, not participating in binding | - |
+| `RespIsWaitingForOffer` | Respondent | Waiting for binding offer from supplicant | `wait_for_offer()` |
+| `RespSendAcceptWaitForConfirm` | Respondent | Sent Accept, waiting for Confirm | `cast_accept_offer()`, `wait_for_confirm()` |
+| `RespIsWaitingForAddenda` | Respondent | Received Confirm, waiting for optional Addenda | `wait_for_addenda()` |
+| `RespHasBoundAsRespondent` | Respondent | Binding completed successfully | ✅ **NEW LOGGING HERE** |
+| `SuppSendOfferWaitForAccept` | Supplicant | Sent Offer, waiting for Accept | `cast_offer()`, `wait_for_accept()` |
+| `SuppIsReadyToSendConfirm` | Supplicant | Received Accept, ready to send Confirm | `cast_confirm_accept()` |
+| `SuppIsReadyToSendAddenda` | Supplicant | Sent Confirm, ready to send Addenda | `cast_addenda()` |
+| `SuppHasBoundAsSupplicant` | Supplicant | Binding completed successfully | ✅ **NEW LOGGING HERE** |
+| `DevHasFailedBinding` | Any | Binding failed, error state | - |
+
+## Binding Phases (Packet Types)
+
+| Phase | Packet Type | Description | Direction |
+|-------|-------------|-------------|-----------|
+| `TENDER` | `1FC9` (I_) | Offer phase - initial binding proposal | Supplicant → Respondent |
+| `ACCEPT` | `1FC9` (W_) | Accept phase - acceptance of offer | Respondent → Supplicant |
+| `AFFIRM` | `1FC9` (I_) | Confirm phase - confirmation of acceptance | Supplicant → Respondent |
+| `RATIFY` | `10E0` (I_) | Addenda phase - optional additional binding info | Either direction |
+
+## New Logging Implementation
+
+The following log.info statements have been added at binding completion points:
+
+### 1. Constructor Logging (Immediate Confirmation)
+- **`RespHasBoundAsRespondent.__init__()`**: Logs when respondent binding completes
+- **`SuppHasBoundAsSupplicant.__init__()`**: Logs when supplicant binding completes
+
+### 2. State Transition Logging (Complete Flow)
+- **`BindContextBase.set_state()`**: Logs the complete state transition to bound states, including:
+  - Previous state name
+  - New bound state name  
+  - Final role (respondent/supplicant)
+
+## Example Log Output
+```
+INFO:ramses_rf.binding_fsm:32:123456: Binding completed as respondent
+INFO:ramses_rf.binding_fsm:37:789012: Binding completed as supplicant  
+INFO:ramses_rf.binding_fsm:32:123456: Binding process completed: RespSendAcceptWaitForConfirm -> RespHasBoundAsRespondent (role: BindRole.RESPONDENT)
+```
+
+## Error Handling
+- **Timeout**: Binding fails if expected packets not received within timeout periods
+- **Retry Limits**: Automatic failure after retry limits exceeded
+- **Exception**: `BindingFlowFailed` raised on binding errors
+
+## Configuration Constants
+- `CONFIRM_RETRY_LIMIT`: 3 (automatic binding after this many confirm sends)
+- `CONFIRM_TIMEOUT_SECS`: 3 (automatic binding after this many seconds)
+- `WAITING_TIMEOUT_SECS`: 5 (fail if no packet received within this time)

{ramses_rf-0.52.2 → ramses_rf-0.52.4}/docs/source/conf.py

@@ -36,6 +36,7 @@ extensions = [
     "sphinx.ext.githubpages",
     "sphinx_design",
     "myst_parser",  # to use Markdown inside reST
+    "sphinxcontrib.mermaid",  # to show mermaid diagrams in docs
 ]
 pygments_style = "sphinx"  # enable syntax highlighting
 
@@ -72,3 +73,4 @@ autosummary_generate_overwrite = True
 # Myst
 myst_enable_extensions = ["colon_fence"]
 myst_heading_anchors = 4
+myst_fence_as_directive = ["mermaid"]

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

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

{ramses_rf-0.52.2 → ramses_rf-0.52.4}/docs/source/usage.md

@@ -15,7 +15,7 @@ MyST [markup](https://myst-parser.readthedocs.io/en/latest/syntax/organising_con
 
 - Activate your virtual environment for ramses_rf as described in the [Wiki](https://github.com/ramses-rf/ramses_rf/blob/master/README-developers.md).
 
-- Install the extra required dependencies by running ``pip install -r requirements_docs.txt`` so you can build a local set.
+- Install the extra required dependencies by running ``pip install -r requirements/requirements_docs.txt`` so you can build a local set.
 
 - Then, in a Terminal, enter `cd docs/` and run `sphinx-build -b html source build/html`.
 

{ramses_rf-0.52.2 → 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.2 → ramses_rf-0.52.4}/ramses_rf/binding_fsm.py

@@ -178,6 +178,8 @@ class BindContextBase:
         self, state: type[BindStateBase], result: asyncio.Future[Message] | None = None
     ) -> None:
         """Transition the State of the Context, and process the result, if any."""
+        # Ensure prev_state is always available, not only during debugging
+        prev_state = self._state
 
         # if False and result:
         #     try:
@@ -185,10 +187,6 @@ class BindContextBase:
         #     except exc.BindingError as err:
         #         self._fut.set_result(err)
 
-        if _DBG_MAINTAIN_STATE_CHAIN:  # HACK for debugging
-            # if prev_state in (None, )
-            prev_state = self._state
-
         self._state = state(self)
         if not self.is_binding:
             self._is_respondent = None
@@ -197,6 +195,14 @@ class BindContextBase:
         elif state is SuppSendOfferWaitForAccept:
             self._is_respondent = False
 
+        # Log binding completion transitions
+        if isinstance(
+            self._state, (RespHasBoundAsRespondent, SuppHasBoundAsSupplicant)
+        ):
+            _LOGGER.info(
+                f"{self._dev.id}: Binding process completed: {type(prev_state).__name__} -> {state.__name__} (role: {self.role})"
+            )
+
         if _DBG_MAINTAIN_STATE_CHAIN:  # HACK for debugging
             setattr(self._state, "_prev_state", prev_state)  # noqa: B010
 
@@ -663,6 +669,10 @@ class RespHasBoundAsRespondent(BindStateBase):
 
     _attr_role = BindRole.IS_DORMANT
 
+    def __init__(self, context: BindContextBase) -> None:
+        super().__init__(context)
+        _LOGGER.info(f"{context._dev.id}: Binding completed as respondent")
+
 
 class RespIsWaitingForAddenda(_DevIsWaitingForMsg, BindStateBase):
     """Respondent has received a Confirm & is waiting for an Addenda."""
@@ -715,6 +725,10 @@ class SuppHasBoundAsSupplicant(BindStateBase):
 
     _attr_role = BindRole.IS_DORMANT
 
+    def __init__(self, context: BindContextBase) -> None:
+        super().__init__(context)
+        _LOGGER.info(f"{context._dev.id}: Binding completed as supplicant")
+
 
 class SuppIsReadyToSendAddenda(
     _DevIsReadyToSendCmd, BindStateBase

{ramses_rf-0.52.2 → 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
@@ -334,7 +338,7 @@ class MessageIndex:
                 payload_keys(msg.payload),
             ),
         )
-        _LOGGER.debug(f"Added {msg} to gwy.msg_db")
+        # _LOGGER.debug(f"Added {msg} to gwy.msg_db")
 
         return _old_msgs[0] if _old_msgs else None
 
@@ -435,7 +439,7 @@ class MessageIndex:
 
     def qry_dtms(self, **kwargs: bool | dt | str) -> list[Any]:
         """
-        Select from the ImageIndex a list of dtms that match the provided arguments.
+        Select from the MessageIndex a list of dtms that match the provided arguments.
 
         :param kwargs: data table field names and criteria
         :return: list of unformatted dtms that match, useful for msg lookup, or an empty list if 0 matches

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

@@ -120,7 +120,7 @@ _LOGGER = logging.getLogger(__name__)
 
 class Actuator(DeviceHeat):  # 3EF0, 3EF1 (for 10:/13:)
     # .I --- 13:109598 --:------ 13:109598 3EF0 003 00C8FF                # event-driven, 00/C8
-    # RP --- 13:109598 18:002563 --:------ 0008 002 00C8                  # 00/C8, as abobe
+    # RP --- 13:109598 18:002563 --:------ 0008 002 00C8                  # 00/C8, as above
     # RP --- 13:109598 18:002563 --:------ 3EF1 007 0000BF-00BFC8FF       # 00/C8, as above
 
     # RP --- 10:048122 18:140805 --:------ 3EF1 007 007FFF-003C2A10       # 10:s only RP, always 7FFF
@@ -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
@@ -668,11 +668,8 @@ class OtbGateway(Actuator, HeatDemand):  # OTB (10): 3220 (22D9, others)
         self._child_id = FC  # NOTE: domain_id
 
         # TODO(eb): cleanup
-        # should fix src/ramses_rf/database.py _add_record try/except when activating next line
         if self._gwy.msg_db:
-            self._add_record(
-                address=self.addr, code=Code._3220, verb="RP"
-            )  # << essential?
+            self._add_record(address=self.addr, code=Code._3220, verb="RP")
         # adds a "sim" RP opentherm_msg to the SQLite MessageIndex with code _3220
         # causes exc when fetching ALL, when no "real" msg was added to _msgs_. We skip those.
         else:
@@ -1411,7 +1408,7 @@ class UfhCircuit(Child, Entity):  # FIXME
     def __init__(self, ufc: UfhController, ufh_idx: str) -> None:
         super().__init__(ufc._gwy)
 
-        # FIXME: ZZZ entities must know their parent device ID and their own idx
+        # FIXME: gwy.msg_db entities must know their parent device ID and their own idx
         self._z_id = ufc.id
         self._z_idx = ufh_idx