fix: EVC register segmentation, firmware-version gating, doc-aligned entities

SolaX support (ticket 703158) confirmed the EVC holding registers are
internally segmented: 0x600-0x650 is one segment, 0x660-0x66F another
(used for master-slave parallel operation). A function 0x03 read that
spans the boundary silently returns 0 for second-segment registers.
Reproduced on an X3-EVC-11kW Gen1 (ARM V1.18). Fixed by starting a new
read block at 0x668 and restoring the default block_size 100 (the
block_size=32 workaround predating this knowledge is no longer needed).

The plugin now publishes its firmware version (input 0x25, e.g.
V1.18 -> 118) as hub.modbus_protocol_version, enabling modbus_min/
modbus_max gating for EV chargers. Entities on registers dated by the
protocol document's revision history are gated accordingly, and every
register pair that changed location across firmware versions is exposed
as a single entity identity whose backing register follows the
firmware: Charge Power 0x08-0x0A -> 0x100-0x102, Run Mode 0x1D ->
0x106, Charge Phase 0x625 -> 0x63B, Charge Mode (0x104 sensor on
V1.12-13, 0x641 select from V1.14, 0x669 select on GEN2). The
Alt-suffixed duplicate entities are gone.

Support suggested using the documented 0x64F (limit_current_allmode)
for the maximum current. Live testing shows it is the persistent
device limit rather than the setpoint (SolaXCloud itself writes 0x668;
external writes to 0x64F are acknowledged but ignored), so Max Charge
Current stays on 0x668 and a new optional max_key field on number
descriptions caps the Max/Min Charge Current sliders dynamically from
the 0x64F readback.

New doc-based entities (disabled by default unless noted): Unbalanced
Power 0x63C and Unbalanced Switch 0x63D (X3), Mode Button 0x63E, Min
Charge Current 0x63F, Datahub Charge Power 0x643, Green 30s Delay
0x644 (switch), Parallel Support 0x107, WiFi S/N 0x607, Customized S/N
0x629. Alignments: Overload Limit renamed Overvoltage Limit (doc
OverVoltSet), Charger Type name unified across GEN1/GEN2, RSSI renamed
WiFi RSSI, per-phase Charge Current sensors consistently disabled by
default, Datahub Charge Current disabled by default, charge_added_cum
GEN2 scope narrowed from GEN2|GEN3|GEN4. Input 0x2D/0x2E are marked in
code as conflicting between the Gen1 V3.5 and GEN2 documents
(clarification requested from SolaX). Register 0x642 Parallel_enable
is deliberately not exposed: the device returns values outside the
documented 0/1 range and SolaXCloud's parallel toggle does not use it.

Author: Bl00d-B0b

custom_components/solax_modbus/__init__.py

@@ -99,9 +99,15 @@
 from .const import (
     CONF_ENERGY_DASHBOARD_DEVICE as CONF_ENERGY_DASHBOARD_DEVICE,
 )
+from .const import (
+    CONF_READ_DATAHUB as CONF_READ_DATAHUB,
+)
 from .const import (
     CONF_READ_DCB as CONF_READ_DCB,
 )
+from .const import (
+    CONF_READ_EMS as CONF_READ_EMS,
+)
 from .const import (
     CONF_READ_EPS as CONF_READ_EPS,
 )
@@ -123,9 +129,15 @@
 from .const import (
     DEFAULT_PLUGIN as DEFAULT_PLUGIN,
 )
+from .const import (
+    DEFAULT_READ_DATAHUB as DEFAULT_READ_DATAHUB,
+)
 from .const import (
     DEFAULT_READ_DCB as DEFAULT_READ_DCB,
 )
+from .const import (
+    DEFAULT_READ_EMS as DEFAULT_READ_EMS,
+)
 from .const import (
     DEFAULT_READ_EPS as DEFAULT_READ_EPS,
 )
@@ -447,11 +459,15 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
 DEVICE_GROUP_NAMES: dict[str, str] = {
     "eps": "EPS",
     "pm": "Parallel",
+    "ems": "EMS∕V2G",
+    "datahub": "Datahub",
 }
 
 GATED_DEVICE_GROUPS: dict[str, tuple[str, bool]] = {
     "eps": (CONF_READ_EPS, DEFAULT_READ_EPS),
     "pm": (CONF_READ_PM, DEFAULT_READ_PM),
+    "ems": (CONF_READ_EMS, DEFAULT_READ_EMS),
+    "datahub": (CONF_READ_DATAHUB, DEFAULT_READ_DATAHUB),
     "ENERGY_DASHBOARD": (CONF_ENERGY_DASHBOARD_DEVICE, DEFAULT_ENERGY_DASHBOARD_DEVICE),
 }
 

custom_components/solax_modbus/config_flow.py

@@ -44,7 +44,9 @@
     CONF_MODBUS_ADDR,
     CONF_PLUGIN,
     CONF_READ_BATTERY,
+    CONF_READ_DATAHUB,
     CONF_READ_DCB,
+    CONF_READ_EMS,
     CONF_READ_EPS,
     CONF_READ_PM,
     CONF_SCAN_INTERVAL_FAST,
@@ -62,7 +64,9 @@
     DEFAULT_PLUGIN,
     DEFAULT_PORT,
     DEFAULT_READ_BATTERY,
+    DEFAULT_READ_DATAHUB,
     DEFAULT_READ_DCB,
+    DEFAULT_READ_EMS,
     DEFAULT_READ_EPS,
     DEFAULT_READ_PM,
     DEFAULT_SCAN_INTERVAL,
@@ -156,6 +160,8 @@ def _configured_hub_names(handler: SchemaCommonFlowHandler) -> set[str]:
         vol.Optional(CONF_READ_EPS, default=DEFAULT_READ_EPS): bool,
         vol.Optional(CONF_READ_DCB, default=DEFAULT_READ_DCB): bool,
         vol.Optional(CONF_READ_PM, default=DEFAULT_READ_PM): bool,
+        vol.Optional(CONF_READ_EMS, default=DEFAULT_READ_EMS): bool,
+        vol.Optional(CONF_READ_DATAHUB, default=DEFAULT_READ_DATAHUB): bool,
         vol.Optional(CONF_TIME_OUT, default=DEFAULT_TIME_OUT): int,
     }
 )
@@ -178,6 +184,8 @@ def _configured_hub_names(handler: SchemaCommonFlowHandler) -> set[str]:
         vol.Optional(CONF_READ_EPS, default=DEFAULT_READ_EPS): bool,
         vol.Optional(CONF_READ_DCB, default=DEFAULT_READ_DCB): bool,
         vol.Optional(CONF_READ_PM, default=DEFAULT_READ_PM): bool,
+        vol.Optional(CONF_READ_EMS, default=DEFAULT_READ_EMS): bool,
+        vol.Optional(CONF_READ_DATAHUB, default=DEFAULT_READ_DATAHUB): bool,
         vol.Optional(CONF_TIME_OUT, default=DEFAULT_TIME_OUT): int,
     }
 )
@@ -381,6 +389,10 @@ async def _option_schema(handler: SchemaCommonFlowHandler) -> vol.Schema:
     for option, flag_name in ((CONF_READ_EPS, "EPS"), (CONF_READ_PM, "PM")):
         if not _plugin_uses_feature_flag(plugin_name, flag_name):
             hidden.add(option)
+    if not _plugin_supports_device_group(plugin_name, "ems"):
+        hidden.add(CONF_READ_EMS)
+    if not _plugin_supports_device_group(plugin_name, "datahub"):
+        hidden.add(CONF_READ_DATAHUB)
     if not hidden:
         return OPTION_SCHEMA
     return vol.Schema({marker: value for marker, value in OPTION_SCHEMA.schema.items() if getattr(marker, "schema", None) not in hidden})

custom_components/solax_modbus/const.py

@@ -51,6 +51,8 @@ class UnitOfReactivePower(StrEnum):  # type: ignore[no-redef]
 CONF_READ_EPS = "read_eps"
 CONF_READ_DCB = "read_dcb"
 CONF_READ_PM = "read_pm"
+CONF_READ_EMS = "read_ems"
+CONF_READ_DATAHUB = "read_datahub"
 CONF_MODBUS_ADDR = "read_modbus_addr"
 CONF_INTERFACE = "interface"
 CONF_SERIAL_PORT = "read_serial_port"
@@ -67,6 +69,8 @@ class UnitOfReactivePower(StrEnum):  # type: ignore[no-redef]
 DEFAULT_READ_EPS = False
 DEFAULT_READ_DCB = False
 DEFAULT_READ_PM = False
+DEFAULT_READ_EMS = False
+DEFAULT_READ_DATAHUB = False
 DEFAULT_BAUDRATE = "19200"
 DEFAULT_PLUGIN = "solax"
 DEFAULT_READ_BATTERY = False

custom_components/solax_modbus/number.py

@@ -290,6 +290,10 @@ async def async_set_native_value(self, value: float) -> None:
                 f"writing {self._platform_name} {self._key} number register {self._register} value {pl} after div by readscale {self.entity_description.read_scale} scale {self._attr_scale} with mode {self._write_method}"
             )
             await self._hub.async_write_registers_multi(unit=self._modbus_addr, address=self._register, payload=pl)
+        if self._write_method in (WRITE_MULTISINGLE_MODBUS, WRITE_SINGLE_MODBUS, WRITE_MULTI_MODBUS):
+            # Publish the written value locally: the readback register only catches up on a
+            # later poll, so the entity would otherwise keep reporting the previous value.
+            self._hub.data[self._key] = value
         elif self._write_method == WRITE_DATA_LOCAL:
             _LOGGER.info(f"*** local data written {self._key}: {payload}")
             # corresponding_sensor = self._hub.preventSensors.get(self.entity_description.key, None)