fix: EVC energy word order, unreachable protocol gates, reactive power, MIC-G2 sensors

Six hardware-verified fixes (raw Modbus TCP reads cross-checked against
the official protocol documents):

1. EVC Charge Added - Cumulative read 19660.8 kWh instead of 0.3 kWh:
   the charger sends EQ_Total (0x10, u32) high-word-first. Adds the
   per-sensor order32 override field (read path already honored it)
   and sets order32="big" on charge_added_cum.
2. modbus_min=101/102 gates were unreachable: no device reports more
   than 100 from register 0x82 (the values conflated the protocol
   register with the document revision). Relaxed to 100 after raw-read
   verification; misleading dataclass comments corrected; peakshaving
   complementary pairs re-split at the documented boundary
   (unscaled max=99, X1/X3-scaled min=100).
3. Grid Reactive Power L1/L2 showed ~26 Mvar: 0xC0/0xC2-as-S32 merged
   two S16 values. L1/L2 now use the documented S32 registers 0xDE/0xE0
   for protocol >=100 (raw-verified, phases sum to total) and the
   legacy S16 quad for <=99; the V1.00-derived 0xC0/0xC2 S32 defs are
   removed (doc error confirmed, resolves the open question in wills106#2099).
4. MIC pv_total_power removed: exact computed duplicate of
   pv_power_total (same value_function, same device).
5. MIC-G2 measured power: doc V4.0 marks the whole 0x700-0x70A block
   as EVC-only and its PowerToEV row proves the parenthetical addresses
   carry a systematic -1 typo. The _alt sensors (l1/l2/l3), built on
   that typo and reading Int32 at overlapping odd offsets, are removed;
   the primaries (0x704/0x706/0x708, Int32 per the authoritative
   address column) and measured_power_2 stay default-disabled - a
   meter-attached test shows the firmware never serves per-phase
   values there (handler echoes one buffer at every offset).
6. MIC-G2 Q Curve select always showed unknown: readback 0x347 is
   byte-packed (mode in low byte, Pf in high byte) but was decoded as
   full u16. Now REGISTER_U8L.

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

Author: Bl00d-B0b

custom_components/solax_modbus/const.py

@@ -204,8 +204,9 @@ class BaseModbusSensorEntityDescription(SensorEntityDescription):
     """Base class for modbus sensor declarations."""
 
     allowedtypes: int = 0  # overload with ALLDEFAULT from plugin
-    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.
+    order32: str | None = None  # per-sensor 32-bit word order override ("big"/"little"); None = plugin default
+    modbus_min: int | None = None  # Minimum protocol version as reported by register 0x82 (e.g. 100 for V001.00); not the document revision.
+    modbus_max: int | None = None  # Maximum protocol version as reported by register 0x82.
     scale: float | dict[Any, Any] | Callable[[Any, Any, dict[str, Any]], Any] = (
         1  # can be float, dictionary or callable function(initval, descr, datadict)
     )
@@ -252,8 +253,8 @@ class BaseModbusButtonEntityDescription(ButtonEntityDescription):
     """Base class for modbus button declarations."""
 
     allowedtypes: int = 0  # overload with ALLDEFAULT from plugin
-    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.
+    modbus_min: int | None = None  # Minimum protocol version as reported by register 0x82 (e.g. 100 for V001.00); not the document revision.
+    modbus_max: int | None = None  # Maximum protocol version as reported by register 0x82.
     register: int | None = None
     command: int | None = None
     blacklist: list[str] | None = None  # none or list of serial number prefixes
@@ -268,8 +269,8 @@ class BaseModbusSelectEntityDescription(SelectEntityDescription):
     """Base class for modbus select declarations."""
 
     allowedtypes: int = 0  # overload with ALLDEFAULT from plugin
-    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.
+    modbus_min: int | None = None  # Minimum protocol version as reported by register 0x82 (e.g. 100 for V001.00); not the document revision.
+    modbus_max: int | None = None  # Maximum protocol version as reported by register 0x82.
     register: int | None = None
     option_dict: dict[int, str] | None = None
     reverse_option_dict: dict[str, int] | None = None  # autocomputed
@@ -288,8 +289,8 @@ class BaseModbusSwitchEntityDescription(SwitchEntityDescription):
     """Base class for modbus switch declarations."""
 
     allowedtypes: int = 0  # overload with ALLDEFAULT from plugin
-    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.
+    modbus_min: int | None = None  # Minimum protocol version as reported by register 0x82 (e.g. 100 for V001.00); not the document revision.
+    modbus_max: int | None = None  # Maximum protocol version as reported by register 0x82.
     register: int | None = None
     register_bit: int | None = None
     blacklist: list[str] | None = None  # none or list of serial number prefixes
@@ -307,8 +308,8 @@ class BaseModbusTimeEntityDescription(TimeEntityDescription):
     """Base class for modbus time declarations."""
 
     allowedtypes: int = 0  # overload with ALLDEFAULT from plugin
-    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.
+    modbus_min: int | None = None  # Minimum protocol version as reported by register 0x82 (e.g. 100 for V001.00); not the document revision.
+    modbus_max: int | None = None  # Maximum protocol version as reported by register 0x82.
     scale: float | dict[Any, Any] | Callable[[Any, Any, dict[str, Any]], Any] = 1
     read_scale_exceptions: list[Any] | None = None
     read_scale: float = 1
@@ -336,8 +337,8 @@ class BaseModbusNumberEntityDescription(NumberEntityDescription):
     """Base class for modbus number declarations."""
 
     allowedtypes: int = 0  # overload with ALLDEFAULT from plugin
-    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.
+    modbus_min: int | None = None  # Minimum protocol version as reported by register 0x82 (e.g. 100 for V001.00); not the document revision.
+    modbus_max: int | None = None  # Maximum protocol version as reported by register 0x82.
     register: int | None = None
     read_scale_exceptions: list[Any] | None = None
     read_scale: float = 1

custom_components/solax_modbus/plugin_solax.py

@@ -2283,7 +2283,7 @@ def value_function_bms_2_max_charge(initval: int, descr: Any, datadict: dict[str
         native_unit_of_measurement=UnitOfPower.WATT,
         device_class=NumberDeviceClass.POWER,
         allowedtypes=AC | HYBRID | GEN4 | GEN5,
-        modbus_min=101,
+        modbus_min=100,
         entity_category=EntityCategory.CONFIG,
         entity_registry_enabled_default=False,
         icon="mdi:tune-variant",
@@ -2498,7 +2498,7 @@ def value_function_bms_2_max_charge(initval: int, descr: Any, datadict: dict[str
         native_unit_of_measurement=UnitOfPower.WATT,
         device_class=NumberDeviceClass.POWER,
         allowedtypes=HYBRID | GEN4 | GEN5,
-        modbus_max=100,
+        modbus_max=99,
     ),
     SolaxModbusNumberEntityDescription(
         name="PeakShaving Discharge Limit 1",
@@ -2511,7 +2511,7 @@ def value_function_bms_2_max_charge(initval: int, descr: Any, datadict: dict[str
         native_unit_of_measurement=UnitOfPower.WATT,
         device_class=NumberDeviceClass.POWER,
         allowedtypes=HYBRID | GEN4 | GEN5 | X1,
-        modbus_min=101,
+        modbus_min=100,
     ),
     SolaxModbusNumberEntityDescription(
         name="PeakShaving Discharge Limit 1",
@@ -2525,7 +2525,7 @@ def value_function_bms_2_max_charge(initval: int, descr: Any, datadict: dict[str
         device_class=NumberDeviceClass.POWER,
         scale=0.1,
         allowedtypes=HYBRID | GEN4 | GEN5 | X3,
-        modbus_min=101,
+        modbus_min=100,
     ),
     SolaxModbusNumberEntityDescription(
         name="PeakShaving Discharge Limit 2",
@@ -2538,7 +2538,7 @@ def value_function_bms_2_max_charge(initval: int, descr: Any, datadict: dict[str
         native_unit_of_measurement=UnitOfPower.WATT,
         device_class=NumberDeviceClass.POWER,
         allowedtypes=HYBRID | GEN4 | GEN5,
-        modbus_max=100,
+        modbus_max=99,
     ),
     SolaxModbusNumberEntityDescription(
         name="PeakShaving Discharge Limit 2",
@@ -2551,7 +2551,7 @@ def value_function_bms_2_max_charge(initval: int, descr: Any, datadict: dict[str
         native_unit_of_measurement=UnitOfPower.WATT,
         device_class=NumberDeviceClass.POWER,
         allowedtypes=HYBRID | GEN4 | GEN5 | X1,
-        modbus_min=101,
+        modbus_min=100,
     ),
     SolaxModbusNumberEntityDescription(
         name="PeakShaving Discharge Limit 2",
@@ -2565,7 +2565,7 @@ def value_function_bms_2_max_charge(initval: int, descr: Any, datadict: dict[str
         device_class=NumberDeviceClass.POWER,
         scale=0.1,
         allowedtypes=HYBRID | GEN4 | GEN5 | X3,
-        modbus_min=101,
+        modbus_min=100,
     ),
     SolaxModbusNumberEntityDescription(
         name="PeakShaving Discharge Limit 2",
@@ -4421,7 +4421,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,
         allowedtypes=AC | HYBRID | GEN4 | GEN5,
-        modbus_min=101,
+        modbus_min=100,
         internal=True,
     ),
     SolaXModbusSensorEntityDescription(
@@ -5223,44 +5223,44 @@ def value_function_bms_2_max_charge(initval: int, descr: Any, datadict: dict[str
         key="peakshaving_discharge_limit_1",
         register=0x153,
         allowedtypes=AC | HYBRID | GEN4 | GEN5,
-        modbus_max=100,
+        modbus_max=99,
         internal=True,
     ),
     SolaXModbusSensorEntityDescription(
         key="peakshaving_discharge_limit_1",
         register=0x153,
         allowedtypes=AC | HYBRID | GEN4 | GEN5 | X1,
-        modbus_min=101,
+        modbus_min=100,
         internal=True,
     ),
     SolaXModbusSensorEntityDescription(
         key="peakshaving_discharge_limit_1",
         register=0x153,
         scale=0.1,
         allowedtypes=AC | HYBRID | GEN4 | GEN5 | X3,
-        modbus_min=101,
+        modbus_min=100,
         internal=True,
     ),
     SolaXModbusSensorEntityDescription(
         key="peakshaving_discharge_limit_2",
         register=0x154,
         allowedtypes=AC | HYBRID | GEN4 | GEN5,
-        modbus_max=100,
+        modbus_max=99,
         internal=True,
     ),
     SolaXModbusSensorEntityDescription(
         key="peakshaving_discharge_limit_2",
         register=0x154,
         allowedtypes=AC | HYBRID | GEN4 | GEN5 | X1,
-        modbus_min=101,
+        modbus_min=100,
         internal=True,
     ),
     SolaXModbusSensorEntityDescription(
         key="peakshaving_discharge_limit_2",
         register=0x154,
         scale=0.1,
         allowedtypes=AC | HYBRID | GEN4 | GEN5 | X3,
-        modbus_min=101,
+        modbus_min=100,
         internal=True,
     ),
     SolaXModbusSensorEntityDescription(
@@ -7692,7 +7692,7 @@ def value_function_bms_2_max_charge(initval: int, descr: Any, datadict: dict[str
             1: "Connected",
         },
         allowedtypes=AC | HYBRID | GEN4 | GEN5 | GEN6,
-        modbus_min=101,
+        modbus_min=100,
         entity_registry_enabled_default=False,
         entity_category=EntityCategory.DIAGNOSTIC,
     ),
@@ -7706,7 +7706,7 @@ def value_function_bms_2_max_charge(initval: int, descr: Any, datadict: dict[str
             1: "Connected",
         },
         allowedtypes=AC | HYBRID | GEN4 | GEN5 | GEN6,
-        modbus_min=101,
+        modbus_min=100,
         entity_registry_enabled_default=False,
         entity_category=EntityCategory.DIAGNOSTIC,
     ),
@@ -8042,20 +8042,6 @@ def value_function_bms_2_max_charge(initval: int, descr: Any, datadict: dict[str
         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,
-    ),
     SolaXModbusSensorEntityDescription(
         name="Grid Reactive Power L1",
         key="grid_reactive_power_l1",
@@ -8066,7 +8052,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=102,
+        modbus_min=100,  # V1.02 registers respond at protocol 100 (raw-read verified: 397/572 var)
         entity_registry_enabled_default=False,
     ),
     SolaXModbusSensorEntityDescription(
@@ -8082,20 +8068,6 @@ def value_function_bms_2_max_charge(initval: int, descr: Any, datadict: dict[str
         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,
-    ),
     SolaXModbusSensorEntityDescription(
         name="Grid Reactive Power L2",
         key="grid_reactive_power_l2",
@@ -8106,7 +8078,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=102,
+        modbus_min=100,  # V1.02 registers respond at protocol 100 (raw-read verified: 397/572 var)
         entity_registry_enabled_default=False,
     ),
     SolaXModbusSensorEntityDescription(
@@ -9600,6 +9572,7 @@ def value_function_bms_2_max_charge(initval: int, descr: Any, datadict: dict[str
     SolaXModbusSensorEntityDescription(
         key="q-curve",
         register=0x347,
+        register_data_type=REGISTER_U8L,  # packed register: QCurve_SetMode in low byte, bQCurve_SetPf in high byte
         scale={
             0: "Off",
             1: "Over Excited",
@@ -9958,17 +9931,6 @@ def value_function_bms_2_max_charge(initval: int, descr: Any, datadict: dict[str
         allowedtypes=MIC | GEN | GEN2,
         icon="mdi:solar-power-variant",
     ),
-    SolaXModbusSensorEntityDescription(
-        name="PV Total Power",
-        key="pv_total_power",
-        value_function=value_function_pv_power_total,
-        native_unit_of_measurement=UnitOfPower.WATT,
-        device_class=SensorDeviceClass.POWER,
-        state_class=SensorStateClass.MEASUREMENT,
-        entity_registry_enabled_default=False,
-        allowedtypes=MIC | GEN | GEN2,
-        icon="mdi:solar-power-variant",
-    ),
     SolaXModbusSensorEntityDescription(
         name="Total Yield",
         key="total_yield",
@@ -10178,83 +10140,51 @@ def value_function_bms_2_max_charge(initval: int, descr: Any, datadict: dict[str
         icon="mdi:home-import-outline",
     ),
     SolaXModbusSensorEntityDescription(
-        name="Measured Power 2",
+        name="Feed-in Power L1",
         key="measured_power_2",
         native_unit_of_measurement=UnitOfPower.WATT,
         device_class=SensorDeviceClass.POWER,
         state_class=SensorStateClass.MEASUREMENT,
         register=0x704,
         register_type=REG_INPUT,
         register_data_type=REGISTER_S32,
+        entity_registry_enabled_default=False,  # doc V4.0 marks the 0x700-0x70A block as EVC-only; not served as meter data (meter-attached test)
         allowedtypes=MIC | GEN2 | X1,
     ),
     SolaXModbusSensorEntityDescription(
-        name="Measured Power L1",
+        name="Feed-in Power L1",
         key="measured_power_l1",
         native_unit_of_measurement=UnitOfPower.WATT,
         device_class=SensorDeviceClass.POWER,
         state_class=SensorStateClass.MEASUREMENT,
         register=0x704,
         register_type=REG_INPUT,
         register_data_type=REGISTER_S32,
+        entity_registry_enabled_default=False,  # doc V4.0 marks the 0x700-0x70A block as EVC-only; not served as meter data (meter-attached test)
         allowedtypes=MIC | GEN2 | X3,
     ),
     SolaXModbusSensorEntityDescription(
-        name="Measured Power L2",
+        name="Feed-in Power L2",
         key="measured_power_l2",
         native_unit_of_measurement=UnitOfPower.WATT,
         device_class=SensorDeviceClass.POWER,
         state_class=SensorStateClass.MEASUREMENT,
         register=0x706,
         register_type=REG_INPUT,
         register_data_type=REGISTER_S32,
+        entity_registry_enabled_default=False,  # doc V4.0 marks the 0x700-0x70A block as EVC-only; not served as meter data (meter-attached test)
         allowedtypes=MIC | GEN2 | X3,
     ),
     SolaXModbusSensorEntityDescription(
-        name="Measured Power L3",
+        name="Feed-in Power L3",
         key="measured_power_l3",
         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_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,
+        entity_registry_enabled_default=False,  # doc V4.0 marks the 0x700-0x70A block as EVC-only; not served as meter data (meter-attached test)
         allowedtypes=MIC | GEN2 | X3,
     ),
     #####

custom_components/solax_modbus/plugin_solax_ev_charger.py

@@ -1135,6 +1135,7 @@ 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,
+        order32="big",  # device sends this u32 high-word-first (see holding twin 0x619)
         scale=0.1,
         native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,