@@ -1,18 +1,18 @@
 name: Report an issue
-description: Report a problem with the OpenDTU to SDM630 ESPHome component
+description: Report a problem with the OpenDTU Meter Bridge ESPHome component
 body:
   - type: markdown
     attributes:
       value: |
         Before reporting an issue, please review the [README](https://github.com/Lewa-Reka/esphome-opendtu-to-sdm630/blob/main/README.md) - especially **Requirements**, **Configuration reference**, and **Failsafe behaviour**.
 
-        **Scope of this repository:** the `opendtu_sdm630` ESPHome component only (WebSocket livedata → Modbus SDM630 emulator).
+        **Scope of this repository:** the `opendtu_meter_bridge` ESPHome component only (WebSocket livedata → selectable SDM630/DTSU666 Modbus profile).
 
         **Out of scope - issues will be closed without a response** if the report does not show that the problem is in this component, for example:
         - OpenDTU setup, DTU hardware, or Hoymiles microinverter connectivity
-        - Hybrid inverter wiring, RS485 port setup, or inverter menu configuration (e.g. Deye AC Couple, Grid Tie Meter 2, Eastron meter type)
+        - Hybrid inverter wiring, RS485 port setup, or inverter menu configuration (e.g. Deye AC Couple, Grid Tie Meter 2, Eastron/CHNT meter selection)
 
-        You must demonstrate a component-side fault: ESPHome logs (`opendtu_sdm630`), published sensors (WebSocket Status, Data Valid, phase values), or incorrect Modbus register output from the bridge - not only symptoms on the inverter display.
+        You must demonstrate a component-side fault: ESPHome logs (`opendtu_meter_bridge`), published sensors (WebSocket Status, Data Valid, phase values), or incorrect Modbus register output from the bridge - not only symptoms on the inverter display.
 
   - type: textarea
     id: problem
@@ -47,7 +47,18 @@ body:
       label: Component version
       description: >
         Value from the **Component Version** text sensor, a git tag/commit.
-      placeholder: e.g. 0.0.1
+      placeholder: e.g. 0.2.0
+    validations:
+      required: true
+
+  - type: dropdown
+    id: meter_profile
+    attributes:
+      label: Meter profile
+      description: Select the value configured under `opendtu_meter_bridge.meter_profile`.
+      options:
+        - sdm630 (Eastron SDM630)
+        - dtsu666 (CHINT DTSU666 / Deye CHNT)
     validations:
       required: true
 
@@ -91,13 +102,15 @@ body:
     attributes:
       label: Relevant YAML (sanitized)
       description: >
-        Paste the `opendtu_sdm630:`, `uart:`, and `modbus:` blocks from your config.
+        Paste the `opendtu_meter_bridge:`, `uart:`, and `modbus:` blocks from your config.
         Remove passwords and WiFi credentials - use `!secret` placeholders.
       render: yaml
       placeholder: |
-        opendtu_sdm630:
+        opendtu_meter_bridge:
           host: 192.168.1.50
           password: !secret opendtu_password
+          # Allowed values: sdm630 or dtsu666.
+          meter_profile: sdm630
           slave_address: 0x02
           microinverter_map:
             - name: Garage-HMS-2000-4T
@@ -110,11 +123,11 @@ body:
       description: |
         **Required for most reports.** Output from `esphome logs <your-config>.yaml`.
 
-        Set `logger: level: DEBUG` temporarily if needed. Include lines tagged `opendtu_sdm630`.
+        Set `logger: level: DEBUG` temporarily if needed. Include lines tagged `opendtu_meter_bridge`.
       render: txt
       placeholder: |
-        [00:00:00][I][opendtu_sdm630:379]: WebSocket connected to OpenDTU
-        [00:00:00][W][opendtu_sdm630:258]: Microinverter serial '...' not found in livedata
+        [00:00:00][I][opendtu_meter_bridge]: WebSocket connected to OpenDTU
+        [00:00:00][W][opendtu_meter_bridge]: Microinverter serial '...' not found in livedata
     validations:
       required: true
 
 
@@ -13,23 +13,102 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
+  protocol-tests:
+    name: Meter profile protocol tests
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout source code
+        uses: actions/checkout@v7
+
+      - name: Build meter profile tests
+        run: >-
+          c++ -std=c++17 -Wall -Wextra -Werror -pedantic
+          -fsanitize=address,undefined -fno-omit-frame-pointer -I.
+          tests/meter_profile_test.cpp
+          components/opendtu_meter_bridge/meter_profile.cpp
+          components/opendtu_meter_bridge/meter_profile_codec.cpp
+          components/opendtu_meter_bridge/meter_profile_sdm630.cpp
+          components/opendtu_meter_bridge/meter_profile_dtsu666.cpp
+          -o "${RUNNER_TEMP}/meter-profile-tests"
+
+      - name: Run meter profile tests
+        run: "${RUNNER_TEMP}/meter-profile-tests"
+
+  configuration-tests:
+    name: Configuration validation / ${{ matrix.esphome-version }}
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        esphome-version:
+          - stable
+          - 2026.7.3
+          - 2025.6.3
+    steps:
+      - name: Checkout source code
+        uses: actions/checkout@v7
+
+      - name: Set up Python
+        uses: actions/setup-python@v7
+        with:
+          python-version: "3.12"
+
+      - name: Install ESPHome ${{ matrix.esphome-version }}
+        env:
+          ESPHOME_VERSION: ${{ matrix.esphome-version }}
+        run: |
+          if [ "${ESPHOME_VERSION}" = "stable" ]; then
+            python -m pip install esphome
+          else
+            python -m pip install "esphome==${ESPHOME_VERSION}"
+          fi
+
+      - name: Create secrets.yaml
+        run: cp secrets.yaml.example tests/secrets.yaml
+
+      - name: Validate the default profile
+        run: esphome -q config tests/meter_bridge_default_ci.yaml >/dev/null
+
+      - name: Validate the deprecated meter_type option
+        run: esphome -q config tests/meter_bridge_legacy_option_ci.yaml >/dev/null
+
+      - name: Reject conflicting profile selectors
+        run: |
+          if esphome -q config tests/meter_bridge_conflicting_options_invalid.yaml >/dev/null; then
+            echo "Expected conflicting meter selectors to fail validation" >&2
+            exit 1
+          fi
+
+      - name: Reject conflicting component domains
+        run: |
+          if esphome -q config tests/meter_bridge_conflicting_domains_invalid.yaml >/dev/null; then
+            echo "Expected the neutral and legacy component domains to conflict" >&2
+            exit 1
+          fi
+
   build-ci:
-    name: Building opendtu_sdm630_ci / ${{ matrix.esphome-version }}
+    name: Building ${{ matrix.config }} / ${{ matrix.esphome-version }}
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
         esphome-version:
           - stable
+          - 2026.7.3
+          - 2025.6.3
+        config:
+          - meter_bridge_sdm630_ci.yaml
+          - meter_bridge_dtsu666_ci.yaml
+          - opendtu_sdm630_legacy_ci.yaml
     steps:
       - name: Checkout source code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v7
 
       - name: Create secrets.yaml
         run: cp secrets.yaml.example tests/secrets.yaml
 
       - name: ESPHome ${{ matrix.esphome-version }}
         uses: esphome/build-action@v7
         with:
-          yaml-file: tests/opendtu_sdm630_ci.yaml
+          yaml-file: tests/${{ matrix.config }}
           version: ${{ matrix.esphome-version }}
@@ -0,0 +1,58 @@
+# Changelog
+
+All notable changes to this project are documented here.
+
+## Unreleased
+
+### Added
+
+- ESPHome sensors for daily and lifetime production, summed only across microinverters selected in `microinverter_map`.
+- ESPHome sensors for average mapped-inverter temperature and aggregate inverter efficiency.
+
+### Changed
+
+- Extended OpenDTU livedata parsing to consume `INV["0"]` production, temperature, efficiency, and DC-power fields in addition to the AC channel.
+
+### Added
+
+- Selectable `sdm630` and `dtsu666` meter profiles through `meter_profile`.
+- CHINT DTSU666 instantaneous voltage, current, active-power, and frequency register mapping based on the published CHINT Modbus specification.
+- Separate profile descriptor tables, a shared `meter_profile_codec`, and CI build configurations for SDM630 and DTSU666.
+- Golden-vector protocol tests for exact register words, FP32 encoding, profile windows, and boundary handling.
+- A compatibility wrapper for existing `components: [opendtu_sdm630]` and `opendtu_sdm630:` configurations.
+- Migration, Modbus behavior, release, and profile-extension documentation.
+
+### Changed
+
+- Introduced `opendtu_meter_bridge` / OpenDTU Meter Bridge as the canonical ESPHome component, C++ namespace, class, file, log-tag, reference-configuration, and device-facing naming.
+- Raised the documented and tested minimum ESPHome version to 2025.6.3.
+- Added compatibility with the ESPHome Modbus server API introduced in newer releases while retaining the older supported API path.
+- Made DTSU666 current registers positive RMS magnitudes while retaining directional active power and the legacy SDM630 current convention.
+- Hardened WebSocket callback handoff with synchronized state, bounded/coalesced event queuing, and validated fragmented frames.
+- Removed fixed-size Basic Auth buffers, marked the password as sensitive in supported ESPHome versions, and validated Modbus slave addresses and read quantities.
+- Updated the GitHub-hosted checkout and Python setup actions to their current Node.js runtime generation.
+
+### Deprecated
+
+- The legacy `opendtu_sdm630` component/domain remains functional through a compatibility wrapper, emits a deprecation warning, and defaults to the SDM630 profile.
+- `meter_type` remains accepted as a deprecated alias for `meter_profile`, with the same `sdm630` and `dtsu666` values.
+- Both deprecated aliases remain supported throughout all 0.2.x releases and may be removed no earlier than v0.3.0.
+
+### Compatibility
+
+- Existing v0.0.1 configurations can use the updated component without changing `components: [opendtu_sdm630]` or the `opendtu_sdm630:` domain. They receive a deprecation warning and retain SDM630 as the default profile.
+- New configurations should use `components: [opendtu_meter_bridge]`, the `opendtu_meter_bridge:` domain, and `meter_profile`.
+- The legacy and neutral component domains cannot be configured together in one ESPHome node.
+
+### Validation status
+
+- The SDM630 profile has been validated with the documented Deye setup.
+- The DTSU666 phase active-power block has been exercised with Deye configured for CHNT and Grid Tie Meter 2; all 17 captured FC03 requests to slave `0x02` received valid responses matching OpenDTU data.
+- The DTSU666 profile is implemented from the published specification and has not been compared with physical DTSU666 hardware.
+- Both neutral profiles and the legacy-domain compatibility path are compiled in CI against ESPHome stable, the pinned 2026.7.3 release, and the minimum supported ESPHome version.
+- Host-side golden-vector tests validate the profile codec and exact SDM630/DTSU666 register output.
+
+## v0.0.1 - 2026-06-06
+
+- Original upstream release by Lewa-Reka.
+- Added the `opendtu_sdm630` ESPHome external component for exposing OpenDTU measurements through an Eastron SDM630-compatible Modbus register map.
@@ -1,5 +1,5 @@
 ================================================================================
-ESPHome OpenDTU to SDM630
+ESPHome OpenDTU Meter Bridge
 Copyright 2026 Lewa-Reka <lewareka.yt@gmail.com>
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,7 +16,8 @@ limitations under the License.
 ================================================================================
 
 This project provides an ESPHome external component that bridges OpenDTU
-microinverter data to a Modbus RTU Eastron SDM630 energy meter emulator.
+microinverter data to selectable Modbus RTU Eastron SDM630 and CHINT DTSU666
+register profiles.
 
 Project Repository: https://github.com/Lewa-Reka/esphome-opendtu-to-sdm630