fix: correct 32-bit register decoding errors (EVC EQ_Total, MIC GEN2 meter power, hybrid reactive power)

Three independent 32-bit decoding bugs, all producing absurd values,
all verified against protocol documents and real hardware:

1. EV charger cumulative energy (0x0010 EQ_Total, input u32): the
   charger transmits this register high-word-first, contradicting the
   doc (EVC_Modbus_V3.5: 0x10=Lo/0x11=Hi) and the same counter's
   little-ordered holding copy at 0x0619. Raw 3 (0.3 kWh) displayed as
   19660.8 kWh. Adds an optional per-sensor order32 override to
   BaseModbusSensorEntityDescription (the read path already honored it
   via getattr; only the dataclass field was missing) and sets
   order32="big" on charge_added_cum.

2. MIC GEN2 X3 meter phase powers were read one register early: the
   MIC-G2 V3.1 doc explicitly places the data words at
   R=(0x705:LSB,0x706:MSB), S=(0x707,0x708), T=(0x709,0x70A), while
   measured_power_l1/l2/l3 read 0x704/0x706/0x708 - straddling two
   different phases (149 MW on an 8 kW inverter). The "_alt" sensors
   at 0x705/0x707/0x709 were pointing at the correct addresses all
   along; the primaries now use those addresses and the redundant
   _alt entities are removed.

3. Hybrid per-phase meter reactive power: the S32 variants at
   0xC0/0xC2 gated modbus_min=100..101 are undocumented (V1.02 only
   documents 0xDE/0xE0) and contradicted by a real protocol-100
   device, which still serves the legacy per-phase S16 layout there
   (the S32 read merged two neighbouring S16s into 26 Mvar). Legacy
   S16 definitions now cover protocol <= 101; the documented S32
   registers (0xDE/0xE0/0xD4) start at protocol 102.

Verified live on X3 EVC 11kW, X3-MIC/PRO-G2 and X3-Hybrid-G4 15kW.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

Author: Bl00d-B0b

custom_components/solax_modbus/const.py

@@ -204,6 +204,7 @@ class BaseModbusSensorEntityDescription(SensorEntityDescription):
     """Base class for modbus sensor declarations."""
 
     allowedtypes: int = 0  # overload with ALLDEFAULT from plugin
+    order32: str | None = None  # per-sensor 32-bit word order override ("big"/"little"); None = plugin default
     modbus_min: int | None = None  # Minimum supported Modbus protocol document version, e.g. 102 for V001.02.
     modbus_max: int | None = None  # Maximum supported Modbus protocol document version.
     scale: float | dict[Any, Any] | Callable[[Any, Any, dict[str, Any]], Any] = (

custom_components/solax_modbus/plugin_solax.py

@@ -8039,20 +8039,6 @@ def value_function_bms_2_max_charge(initval: int, descr: Any, datadict: dict[str
         register_type=REG_INPUT,
         register_data_type=REGISTER_S16,
         allowedtypes=AC | HYBRID | GEN4 | GEN5 | X3,
-        modbus_max=99,
-        entity_registry_enabled_default=False,
-    ),
-    SolaXModbusSensorEntityDescription(
-        name="Grid Reactive Power L1",
-        key="grid_reactive_power_l1",
-        native_unit_of_measurement=UnitOfReactivePower.VOLT_AMPERE_REACTIVE,
-        device_class=SensorDeviceClass.REACTIVE_POWER,
-        state_class=SensorStateClass.MEASUREMENT,
-        register=0xC0,
-        register_type=REG_INPUT,
-        register_data_type=REGISTER_S32,
-        allowedtypes=AC | HYBRID | GEN4 | GEN5 | X3,
-        modbus_min=100,
         modbus_max=101,
         entity_registry_enabled_default=False,
     ),
@@ -8079,20 +8065,6 @@ def value_function_bms_2_max_charge(initval: int, descr: Any, datadict: dict[str
         register_type=REG_INPUT,
         register_data_type=REGISTER_S16,
         allowedtypes=AC | HYBRID | GEN4 | GEN5 | X3,
-        modbus_max=99,
-        entity_registry_enabled_default=False,
-    ),
-    SolaXModbusSensorEntityDescription(
-        name="Grid Reactive Power L2",
-        key="grid_reactive_power_l2",
-        native_unit_of_measurement=UnitOfReactivePower.VOLT_AMPERE_REACTIVE,
-        device_class=SensorDeviceClass.REACTIVE_POWER,
-        state_class=SensorStateClass.MEASUREMENT,
-        register=0xC2,
-        register_type=REG_INPUT,
-        register_data_type=REGISTER_S32,
-        allowedtypes=AC | HYBRID | GEN4 | GEN5 | X3,
-        modbus_min=100,
         modbus_max=101,
         entity_registry_enabled_default=False,
     ),
@@ -8119,7 +8091,7 @@ def value_function_bms_2_max_charge(initval: int, descr: Any, datadict: dict[str
         register_type=REG_INPUT,
         register_data_type=REGISTER_S16,
         allowedtypes=AC | HYBRID | GEN4 | GEN5 | X3,
-        modbus_max=99,
+        modbus_max=101,
         entity_registry_enabled_default=False,
     ),
     SolaXModbusSensorEntityDescription(
@@ -8132,7 +8104,7 @@ def value_function_bms_2_max_charge(initval: int, descr: Any, datadict: dict[str
         register_type=REG_INPUT,
         register_data_type=REGISTER_S32,
         allowedtypes=AC | HYBRID | GEN4 | GEN5 | X3,
-        modbus_min=100,
+        modbus_min=102,
         entity_registry_enabled_default=False,
     ),
     SolaXModbusSensorEntityDescription(
@@ -10194,7 +10166,7 @@ def value_function_bms_2_max_charge(initval: int, descr: Any, datadict: dict[str
         native_unit_of_measurement=UnitOfPower.WATT,
         device_class=SensorDeviceClass.POWER,
         state_class=SensorStateClass.MEASUREMENT,
-        register=0x704,
+        register=0x705,  # MIC-G2 V3.1: data words at LSB/MSB addresses given in doc (off-by-one vs table row)
         register_type=REG_INPUT,
         register_data_type=REGISTER_S32,
         allowedtypes=MIC | GEN2 | X3,
@@ -10205,7 +10177,7 @@ def value_function_bms_2_max_charge(initval: int, descr: Any, datadict: dict[str
         native_unit_of_measurement=UnitOfPower.WATT,
         device_class=SensorDeviceClass.POWER,
         state_class=SensorStateClass.MEASUREMENT,
-        register=0x706,
+        register=0x707,  # MIC-G2 V3.1: data words at LSB/MSB addresses given in doc (off-by-one vs table row)
         register_type=REG_INPUT,
         register_data_type=REGISTER_S32,
         allowedtypes=MIC | GEN2 | X3,
@@ -10216,45 +10188,9 @@ def value_function_bms_2_max_charge(initval: int, descr: Any, datadict: dict[str
         native_unit_of_measurement=UnitOfPower.WATT,
         device_class=SensorDeviceClass.POWER,
         state_class=SensorStateClass.MEASUREMENT,
-        register=0x708,
-        register_type=REG_INPUT,
-        register_data_type=REGISTER_S32,
-        allowedtypes=MIC | GEN2 | X3,
-    ),
-    SolaXModbusSensorEntityDescription(
-        name="Measured Power L1 Alt",
-        key="measured_power_l1_alt",
-        native_unit_of_measurement=UnitOfPower.WATT,
-        device_class=SensorDeviceClass.POWER,
-        state_class=SensorStateClass.MEASUREMENT,
-        register=0x705,
-        register_type=REG_INPUT,
-        register_data_type=REGISTER_S32,
-        entity_registry_enabled_default=False,
-        allowedtypes=MIC | GEN2 | X3,
-    ),
-    SolaXModbusSensorEntityDescription(
-        name="Measured Power L2 Alt",
-        key="measured_power_l2_alt",
-        native_unit_of_measurement=UnitOfPower.WATT,
-        device_class=SensorDeviceClass.POWER,
-        state_class=SensorStateClass.MEASUREMENT,
-        register=0x707,
+        register=0x709,  # MIC-G2 V3.1: data words at LSB/MSB addresses given in doc (off-by-one vs table row)
         register_type=REG_INPUT,
         register_data_type=REGISTER_S32,
-        entity_registry_enabled_default=False,
-        allowedtypes=MIC | GEN2 | X3,
-    ),
-    SolaXModbusSensorEntityDescription(
-        name="Measured Power L3 Alt",
-        key="measured_power_l3_alt",
-        native_unit_of_measurement=UnitOfPower.WATT,
-        device_class=SensorDeviceClass.POWER,
-        state_class=SensorStateClass.MEASUREMENT,
-        register=0x709,
-        register_type=REG_INPUT,
-        register_data_type=REGISTER_S32,
-        entity_registry_enabled_default=False,
         allowedtypes=MIC | GEN2 | X3,
     ),
     #####

custom_components/solax_modbus/plugin_solax_ev_charger.py

@@ -1135,6 +1135,11 @@ def value_function_sync_rtc_evc(initval: Any, descr: Any, datadict: dict[str, An
         register=0x10,
         register_type=REG_INPUT,
         register_data_type=REGISTER_U32,
+        # Firmware sends this u32 high-word-first, contradicting the doc (EVC_Modbus_V3.5
+        # declares 0x10=Lo/0x11=Hi) and the holding-register twin 0x619 (EQ_Total), which
+        # is little-ordered. Without this override the value reads as N*65536
+        # (e.g. raw 3 -> 19660.8 kWh instead of 0.3 kWh).
+        order32="big",
         scale=0.1,
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,