Merge branch 'main' into remove-log-f-strings

Author: TCWORLD

custom_components/solax_modbus/const.py

@@ -383,6 +383,7 @@ class BaseModbusNumberEntityDescription(NumberEntityDescription):
     state: str | None = None
     max_exceptions: list[tuple[str, int | float]] | None = None  #  None or list with structure [ ('U50EC' , 40,) ]
     min_exceptions_minus: list[tuple[str, int | float]] | None = None  # same structure as max_exceptions, values are applied with a minus
+    min_exceptions: list[tuple[str, int | float]] | None = None  # None or list with structure [ ('U50EC' , 10,) ]
     blacklist: list[str] | None = None  # None or list of serial number prefixes like
     write_method: int = WRITE_SINGLE_MODBUS  # WRITE_SINGLE_MOBUS or WRITE_MULTI_MODBUS or WRITE_DATA_LOCAL
     initvalue: int | None = None  # initial default value for WRITE_DATA_LOCAL entities

custom_components/solax_modbus/energy_dashboard.py

@@ -319,14 +319,16 @@ def get_source_key(self, datadict: dict[str, float]) -> str:
 
         return self.source_key  # Use regular sensor (single mode or Slave)
 
-    def get_value(self, datadict: dict[str, float]) -> float:
+    def get_value(self, datadict: dict[str, float]) -> float | None:
         """Get value from source sensor, applying filter, invert, and custom functions."""
         source_key = self.get_source_key(datadict)  # Handles parallel mode
-        value = datadict.get(source_key, 0)
 
+        # Grab the value for the source. If it is unavailable, return None value to propagate unavailable state.
+        # This avoids resetting total increasing sensors and unintentionally breaking energy statistics.
+        value = datadict.get(source_key, None)
         if value is None:
-            _LOGGER.warning("Source sensor %s not found, using 0", source_key)  # type: ignore[unreachable]
-            return 0
+            _LOGGER.debug("Source sensor %s not found or has no value, marking unavailable", source_key)
+            return None
 
         # Apply filter function first (universal - applies to all sensor types)
         if self.filter_function:

custom_components/solax_modbus/number.py

@@ -122,6 +122,13 @@ def __init__(
             ) in number_info.max_exceptions:
                 if hub.seriesnumber.startswith(prefix):
                     self._attr_native_max_value = native_value
+        if number_info.min_exceptions:
+            for (
+                prefix,
+                native_value,
+            ) in number_info.min_exceptions:
+                if hub.seriesnumber.startswith(prefix):
+                    self._attr_native_min_value = native_value
         if number_info.min_exceptions_minus:
             for (
                 prefix,

custom_components/solax_modbus/plugin_sofar.py

@@ -3981,6 +3981,7 @@ def value_function_sync_rtc_ymd_sofar(initval: Any, descr: Any, datadict: dict[s
         native_unit_of_measurement=UnitOfElectricPotential.VOLT,
         device_class=SensorDeviceClass.VOLTAGE,
         register=0x9051,
+        suggested_display_precision=3,
         scale=0.001,
         rounding=3,
         allowedtypes=BAT_BTS,
@@ -3992,6 +3993,7 @@ def value_function_sync_rtc_ymd_sofar(initval: Any, descr: Any, datadict: dict[s
         native_unit_of_measurement=UnitOfElectricPotential.VOLT,
         device_class=SensorDeviceClass.VOLTAGE,
         register=0x9069,
+        suggested_display_precision=3,
         scale=0.001,
         rounding=3,
         allowedtypes=BAT_BTS,
@@ -4002,6 +4004,7 @@ def value_function_sync_rtc_ymd_sofar(initval: Any, descr: Any, datadict: dict[s
         native_unit_of_measurement=UnitOfElectricPotential.VOLT,
         device_class=SensorDeviceClass.VOLTAGE,
         register=0x906A,
+        suggested_display_precision=3,
         scale=0.001,
         rounding=3,
         allowedtypes=BAT_BTS,

custom_components/solax_modbus/plugin_solax.py

@@ -1900,6 +1900,10 @@ def value_function_bms_2_max_charge(initval: int, descr: Any, datadict: dict[str
     #    ('H1E', 1 ), # more specific entry comes last and wins
 ]
 
+MIN_SOC: list[tuple[str, int | float]] = [
+    ("10M", 0),  # Gen6 X1-VAST allow discharge to 0% per #2187
+]
+
 NUMBER_TYPES: Sequence["SolaxModbusNumberEntityDescription"] = [
     ###
     #
@@ -2034,6 +2038,7 @@ def value_function_bms_2_max_charge(initval: int, descr: Any, datadict: dict[str
         native_max_value=100,
         native_step=1,
         native_unit_of_measurement=PERCENTAGE,
+        min_exceptions=MIN_SOC,
         initvalue=95,
         register_data_type=REGISTER_U16,
         write_method=WRITE_DATA_LOCAL,
@@ -2048,6 +2053,7 @@ def value_function_bms_2_max_charge(initval: int, descr: Any, datadict: dict[str
         native_max_value=100,
         native_step=1,
         native_unit_of_measurement=PERCENTAGE,
+        min_exceptions=MIN_SOC,
         initvalue=10,
         register_data_type=REGISTER_U16,
         write_method=WRITE_DATA_LOCAL,
@@ -2299,6 +2305,7 @@ def value_function_bms_2_max_charge(initval: int, descr: Any, datadict: dict[str
         native_max_value=25,
         native_step=1,
         native_unit_of_measurement=PERCENTAGE,
+        min_exceptions=MIN_SOC,
         allowedtypes=AC | HYBRID | GEN4 | GEN5 | GEN6 | EPS,
         icon="mdi:battery-charging-low",
     ),
@@ -2350,6 +2357,7 @@ def value_function_bms_2_max_charge(initval: int, descr: Any, datadict: dict[str
         native_max_value=100,
         native_step=1,
         native_unit_of_measurement=PERCENTAGE,
+        min_exceptions=MIN_SOC,
         allowedtypes=AC | HYBRID | GEN4 | GEN5 | GEN6,
         icon="mdi:battery-charging-low",
     ),
@@ -2512,6 +2520,7 @@ def value_function_bms_2_max_charge(initval: int, descr: Any, datadict: dict[str
         native_max_value=100,
         native_step=1,
         native_unit_of_measurement=PERCENTAGE,
+        min_exceptions=MIN_SOC,
         allowedtypes=AC | HYBRID | GEN4 | GEN5 | GEN6,
         icon="mdi:battery-charging-low",
     ),

tests/unit/test_number_exceptions_type_regressions.py

@@ -137,6 +137,30 @@ def test_exception_value_used_as_native_max_value() -> None:
     assert isinstance(native_max_value, float)
 
 
+def test_exception_value_used_as_native_min_value() -> None:
+    """Test that exception values are used as native_min_value (float).
+
+    This documents why the exception values need to support float: they are
+    directly assigned to native_min_value which is typed as float in number.py.
+    """
+    max_exceptions: list[tuple[str, int | float]] = [
+        ("L30E", 15.0),
+        ("10M", 1.0),
+    ]
+
+    serial_number = "10M123456"
+    native_min_value: float = 10.0  # Default
+
+    # Simulate exception lookup and assignment
+    for prefix, value in max_exceptions:
+        if serial_number.startswith(prefix):
+            native_min_value = float(value)  # Must be float
+            break
+
+    assert native_min_value == 1.0
+    assert isinstance(native_min_value, float)
+
+
 def test_list_invariance_with_mixed_types() -> None:
     """Test that list invariance is satisfied with int | float union type.