fix: correct model-specific inverter projections

Author: Maksym Shtembuliak

catalog/inverter_models/models/anenji_hhs_11kw_wifi_no_parallel.json

@@ -27,14 +27,16 @@
     "notes": [
       "The exact layout/model fingerprint is captured from a beta.3 support archive.",
       "The compatible protocol 3-10 telemetry schema is enabled read-only.",
+      "A later proxy capture and matching DESSMonitor export confirmed Grid Power at holding register 340 for this exact fingerprint.",
       "No ANJ-11KW writable capability is inherited until this exact HHS model is write-validated."
     ]
   },
   "known_limitations": [
     "Local controls remain unavailable pending model-specific hardware validation."
   ],
-  "knowledge_summary": "An Anenji HHS 11kW non-parallel inverter with an exact captured protocol-3 fingerprint. The integration exposes the compatible telemetry schema read-only and deliberately withholds ANJ write controls.",
+  "knowledge_summary": "An Anenji HHS 11kW non-parallel inverter with an exact captured protocol-3 fingerprint. The integration exposes its compatible telemetry schema read-only, including hardware-correlated Grid Power, and deliberately withholds ANJ write controls.",
   "source_keys": [
-    "github_issue_13_hhs_11kw_beta3"
+    "github_issue_13_hhs_11kw_beta3",
+    "github_issue_13_hhs_grid_power_20260827"
   ]
 }

catalog/inverter_models/models/kevolt_pd0080g_tpm_eu.json

@@ -4,13 +4,13 @@
   "manufacturer": "Kevolt",
   "model": "PD0080G-TPM-EU",
   "aliases": [
-    "Kevolt 80 kW Three-Phase Hybrid"
+    "Kevolt 8 kW Three-Phase Hybrid"
   ],
   "lifecycle": "experimental",
   "variants": [
     {
       "variant_key": "deye_3ph_high_80kw",
-      "label": "Deye-compatible FC03 high-power map, protocol 0x0104, 80 kW",
+      "label": "Deye-compatible FC03 high-power map, protocol 0x0104, 8 kW",
       "device_descriptor_keys": [
         "deye_3ph_high_80kw"
       ],
@@ -21,7 +21,7 @@
     }
   ],
   "validation": {
-    "hardware": "captured",
+    "hardware": "confirmed",
     "telemetry": "partial",
     "controls": "partial"
   },
@@ -31,8 +31,9 @@
     "vendor_register_map": "documented",
     "notes": [
       "The supplied SmartValue proxy capture contains repeated, CRC-valid Modbus FC03 request/response pairs for the Deye-compatible three-phase runtime map at registers 500-683.",
-      "Runtime identification uses four local raw anchors: device type 5, protocol version 0x0104, and low-first rated-power words 0x3880/0x0001 (80000 raw W).",
-      "The translated document labels the rated-power words as 0.1 W, but that scale conflicts with both the reported 80 kW hardware and its captured raw value 80000. Runtime therefore uses the hardware-correlated 1 W scale and fingerprints the unscaled words.",
+      "Runtime identification uses four local raw anchors: device type 5, protocol version 0x0104, and low-first rated-power words 0x3880/0x0001 (80000 raw; documented 0.1 W scale = 8000 W).",
+      "Direct hardware feedback confirms this is the 8 kW model, so the runtime now follows the protocol document's 0.1 W rated-power scale. The raw words remain the stable fingerprint anchors.",
+      "Hardware feedback confirms the exposed battery values already use the expected negative-on-charge sign; the integration preserves that wire sign.",
       "Runtime reads use small register blocks of at most 15 words rather than the unsupported 500-599 bulk read reported in the issue.",
       "A bounded document-backed operational subset with unambiguous register encoding is available as 118 untested controls only in Full control mode. It covers battery, charging, generator, smart-load, export, metering, TOU, topology, and selected advanced functions.",
       "Settings read-back is rotated one compact block per poll so the expanded control surface does not delay live telemetry. Every write uses FC 0x10, preserves unrelated shared-register bits, and requires an immediate wire read-back before it is accepted."
@@ -41,16 +42,17 @@
   "known_limitations": [
     "All 118 document-backed controls are untested and disabled by default. Users must explicitly select Full control and then enable only the individual entities they intend to test.",
     "Factory reset, production-test, EEPROM initialization, calibration, BMS-owned live words, parallel-cluster addressing, and grid-code/certification curves are intentionally not exposed as user controls even though they occupy writable registers in the protocol document.",
-    "Battery output power/current retain the documented wire sign as diagnostic values; their charge/discharge sign has not yet been promoted to canonical battery telemetry.",
+    "Battery output power/current retain the hardware-confirmed wire sign; no additional canonical sign projection is inferred.",
     "Heat-sink temperature is diagnostic because the observed raw value requires the offset-1000 convention used by adjacent Deye storage maps, while the translated table omits that offset for register 541.",
-    "The commercial Kevolt identity comes from the public issue report; the local fingerprint identifies the compatible 80 kW Deye-family wire layout and may be shared by OEM siblings.",
+    "The commercial Kevolt identity comes from the public issue report; the local fingerprint identifies the compatible 8 kW Deye-family wire layout and may be shared by OEM siblings.",
     "A current-release hardware retest is still required before telemetry support can be marked confirmed."
   ],
-  "knowledge_summary": "Kevolt PD0080G-TPM-EU is a reported 80 kW three-phase hybrid inverter behind an EyeBond Wi-Fi collector. The latest SmartValue proxy capture proves a Modbus RTU FC03 layout with device type 5, protocol version 0x0104, rated-power words resolving to 80000 raw W, and live telemetry in the Deye-compatible 500-683 register range. Deye Modbus RTU V1.04 corroborates the telemetry and documents a broader FC 0x10 settings range. The exact wire fingerprint therefore exposes the current document-backed telemetry surface plus 118 opt-in, untested controls whose encodings are unambiguous, with shared-field-safe writes and mandatory immediate read-back confirmation.",
+  "knowledge_summary": "Kevolt PD0080G-TPM-EU is a hardware-confirmed 8 kW three-phase hybrid inverter behind an EyeBond Wi-Fi collector. The latest SmartValue proxy capture proves a Modbus RTU FC03 layout with device type 5, protocol version 0x0104, rated-power words 80000 raw at the documented 0.1 W scale (8000 W), and live telemetry in the Deye-compatible 500-683 register range. Deye Modbus RTU V1.04 corroborates the telemetry and documents a broader FC 0x10 settings range. The exact wire fingerprint therefore exposes the current document-backed telemetry surface plus 118 opt-in, untested controls whose encodings are unambiguous, with shared-field-safe writes and mandatory immediate read-back confirmation.",
   "source_keys": [
     "github_issue_15",
     "proxy_capture_issue_15_20260811",
     "documentation_deye_three_phase_modbus_high_map",
-    "maintainer_kevolt_control_readback_20260826"
+    "maintainer_kevolt_control_readback_20260826",
+    "maintainer_kevolt_hardware_feedback_20260827"
   ]
 }

catalog/inverter_models/sources/github_issue_13_hhs_grid_power_20260827.json

@@ -0,0 +1,15 @@
+{
+  "schema_version": 1,
+  "source_key": "github_issue_13_hhs_grid_power_20260827",
+  "kind": "github_issue",
+  "title": "Anenji HHS-11kW Grid Power proxy and cloud correlation",
+  "reference": "project-issue:13",
+  "captured_at": "2026-08-27",
+  "visibility": "public",
+  "summary": "A proxy capture from the exact layout-3/model-29440 HHS variant showed the manufacturer cloud repeatedly reading holding register 340 as Grid Power. Two captured values, 1729 W and 1709 W, matched the corresponding DESSMonitor export exactly. The compatible family register 204 remained zero and is not the Grid Power source for this fingerprint.",
+  "assertions": [
+    "telemetry_validation",
+    "register_map",
+    "hardware_test"
+  ]
+}

catalog/inverter_models/sources/maintainer_kevolt_hardware_feedback_20260827.json

@@ -0,0 +1,16 @@
+{
+  "schema_version": 1,
+  "source_key": "maintainer_kevolt_hardware_feedback_20260827",
+  "kind": "private_message",
+  "title": "Kevolt rated-power and battery-sign hardware feedback",
+  "reference": "private:kevolt-hardware-feedback-20260827",
+  "captured_at": "2026-08-27",
+  "visibility": "private",
+  "summary_publishable": true,
+  "summary": "The hardware owner confirmed that the exact captured Kevolt PD0080G-TPM-EU unit is rated for 8 kW, not 80 kW, and that its battery current is negative while the battery is charging. Main telemetry and refresh behavior were reported as working on the maintainer test build.",
+  "assertions": [
+    "commercial_identity",
+    "telemetry_validation",
+    "hardware_test"
+  ]
+}

custom_components/eybond_local/drivers/smg.py

@@ -499,6 +499,14 @@ async def async_read_values(
         config_block = await session.read_holding(config_block_start, config_block_count)
         values.update(_decode_block(config_block_start, config_block, config_fields))
         values.update(await _read_optional_specs(session, aux_config_fields))
+        # Exact model overlays may correct a value inherited from a compatible
+        # family schema.  Remove the inherited projection before the optional
+        # read so a failed model-specific read is reported as unavailable,
+        # never as a plausible value from the wrong register.
+        value_overrides = schema.spec_sets.get("value_overrides", ())
+        for spec in value_overrides:
+            values.pop(spec.key, None)
+        values.update(await _read_optional_specs(session, value_overrides))
         missing_probe_details = await _read_missing_optional_probe_details(session, inverter)
         if missing_probe_details:
             inverter.details.update(missing_probe_details)

custom_components/eybond_local/metadata/compiled_detection_catalog.py

@@ -332,6 +332,42 @@ def resolve_unique_persisted_model_surface(
     return descriptor, surface
 
 
+def model_names_share_catalog_identity(
+    first_model_name: object,
+    second_model_name: object,
+    *,
+    catalog: CompiledDetectionCatalog | None = None,
+) -> bool:
+    """Return whether two model labels resolve to one exact catalog identity.
+
+    Display names can change while an entry retains the previous name as a
+    declared alias.  Treat that migration as the same inverter only when both
+    labels resolve uniquely to the same device descriptor and runtime surface.
+    Unknown, malformed, family-fallback, and ambiguous labels fail closed.
+    """
+
+    if type(first_model_name) is not str or type(second_model_name) is not str:
+        return False
+    first = first_model_name.strip()
+    second = second_model_name.strip()
+    if not first or not second:
+        return False
+    if first == second:
+        return True
+
+    resolved = catalog if catalog is not None else load_compiled_detection_catalog()
+    first_identity = resolve_unique_persisted_model_surface(first, catalog=resolved)
+    second_identity = resolve_unique_persisted_model_surface(second, catalog=resolved)
+    if first_identity is None or second_identity is None:
+        return False
+    first_descriptor, first_surface = first_identity
+    second_descriptor, second_surface = second_identity
+    return (
+        first_descriptor.key == second_descriptor.key
+        and first_surface.key == second_surface.key
+    )
+
+
 def compile_detection_catalog(
     source: DetectionDescriptorCatalog,
     *,

custom_components/eybond_local/protocol_catalogs/inverter_catalog.json

@@ -1,6 +1,6 @@
 {
  "schema_version": 2,
- "catalog_version": "2026.08.5",
+ "catalog_version": "2026.08.6",
  "description": "Universal offline inverter catalog with reusable protocol actions, runtime surfaces, and deterministic identity evidence.",
  "protocols": [
   {
@@ -1307,7 +1307,7 @@
    "driver_key": "modbus_smg",
    "variant_key": "anenji_hhs_11kw_wifi_no_parallel",
    "profile_name": "",
-   "register_schema_name": "modbus_smg/models/anenji_anj_11kw_48v_wifi_p.json",
+   "register_schema_name": "modbus_smg/models/anenji_hhs_11kw_wifi_no_parallel.json",
    "tier": "partial",
    "read_only": true,
    "support_capture_policy": "smg_anenji_11k"
@@ -2751,9 +2751,10 @@
   {
    "entry_key": "deye_3ph_high_80kw",
    "surface_key": "deye_3ph_high_80kw_untested",
-   "model_name": "Deye-Compatible Three-Phase Hybrid 80 kW (Modbus)",
+   "model_name": "Deye-Compatible Three-Phase Hybrid 8 kW (Modbus)",
    "aliases": [
-    "Kevolt PD0080G-TPM-EU"
+    "Kevolt PD0080G-TPM-EU",
+    "Deye-Compatible Three-Phase Hybrid 80 kW (Modbus)"
    ],
    "detection_supersedes_protocols": [
     "modbus_smg"
@@ -2783,7 +2784,7 @@
    ],
    "provenance": {
     "sources": [
-     "GitHub issue #15 identifies the commercial hardware as Kevolt PD0080G-TPM-EU. Its SmartValue proxy capture repeatedly shows Modbus FC03, device type 5, protocol version 0x0104, and low-first rated-power words 0x3880/0x0001 (80000 raw), followed by the documented Deye-compatible three-phase runtime map at registers 500-683. The public protocol-document mirror corroborates register meanings, while the captured request/response pairs establish the exact wire layout."
+     "GitHub issue #15 identifies the commercial hardware as Kevolt PD0080G-TPM-EU 8 kW. Its SmartValue proxy capture repeatedly shows Modbus FC03, device type 5, protocol version 0x0104, and low-first rated-power words 0x3880/0x0001 (80000 raw, 0.1 W scale = 8000 W), followed by the documented Deye-compatible three-phase runtime map at registers 500-683. The public protocol-document mirror corroborates register meanings, while the captured request/response pairs establish the exact wire layout."
     ],
     "confidence": "capture-confirmed"
    }

custom_components/eybond_local/protocol_catalogs/register_schemas/deye_3ph_high_80kw/base.json

@@ -153,7 +153,9 @@
         "key": "rated_power",
         "register": 20,
         "word_count": 2,
-        "combine": "u32_low_first"
+        "combine": "u32_low_first",
+        "divisor": 10,
+        "decimals": 1
       },
       {
         "key": "run_state",

custom_components/eybond_local/protocol_catalogs/register_schemas/modbus_smg/models/anenji_hhs_11kw_wifi_no_parallel.json

@@ -0,0 +1,14 @@
+{
+  "extends": "./anenji_anj_11kw_48v_wifi_p.json",
+  "schema_key": "modbus_smg_anenji_hhs_11kw_wifi_no_parallel",
+  "title": "Anenji HHS-11kW-WIFI Non-Parallel Register Schema",
+  "spec_sets": {
+    "value_overrides": [
+      {
+        "key": "grid_power",
+        "register": 340,
+        "signed": true
+      }
+    ]
+  }
+}

custom_components/eybond_local/runtime/hub/common.py

@@ -78,6 +78,7 @@
 from ...metadata.compiled_detection_catalog import (
     PROBE_ACTION_MODBUS_READ,
     load_compiled_detection_catalog,
+    model_names_share_catalog_identity,
 )
 from ...telemetry import TypedTelemetryFrame, fold_driver_telemetry
 from ...payload.modbus import ModbusSession, to_signed_16
@@ -202,7 +203,12 @@ def _inverter_identities_conflict(current: object, candidate: object) -> bool:
         return True
     cur_model = str(getattr(current, "model_name", "") or "").strip()
     cand_model = str(getattr(candidate, "model_name", "") or "").strip()
-    if cur_model and cand_model and cur_model != cand_model:
+    if (
+        cur_model
+        and cand_model
+        and cur_model != cand_model
+        and not model_names_share_catalog_identity(cur_model, cand_model)
+    ):
         return True
     return False