Fix issue where fdSoc can not be less than minSocOnGrid (#3104)

* Fix issue where fdSoc can not be less than minSocOnGrid

* Version bump

Author: springfall2008

apps/predbat/fox.py

@@ -840,17 +840,6 @@ async def publish_schedule_settings_ha(self, deviceSN):
                         app="fox",
                     )
 
-    def getMinSocOnGrid(self, deviceSN):
-        """
-        Get the MinSocOnGrid setting for the device
-        """
-        value = self.device_settings.get(deviceSN, {}).get("MinSocOnGrid", {}).get("value", 10)
-        try:
-            value = int(float(value))
-        except ValueError:
-            value = 10
-        return value
-
     async def get_schedule_settings_ha(self, deviceSN):
         """
         Get the current schedule from HA database
@@ -1390,7 +1379,7 @@ async def apply_battery_schedule(self, serial):
                     )
                 elif direction == "discharge":
                     new_schedule.append(
-                        {"enable": 1, "startHour": start_hour, "startMinute": start_minute, "endHour": end_hour, "endMinute": end_minute, "workMode": "ForceDischarge", "fdSoc": soc, "maxSoc": reserve, "fdPwr": power, "minSocOnGrid": reserve}
+                        {"enable": 1, "startHour": start_hour, "startMinute": start_minute, "endHour": end_hour, "endMinute": end_minute, "workMode": "ForceDischarge", "fdSoc": max(soc, reserve), "maxSoc": reserve, "fdPwr": power, "minSocOnGrid": reserve}
                     )
         new_schedule = validate_schedule(new_schedule, reserve, fdPwr_max)
         self.log("Fox: New schedule for {}: {}".format(serial, new_schedule))

apps/predbat/predbat.py

@@ -27,7 +27,7 @@
 import requests
 import asyncio
 
-THIS_VERSION = "v8.30.2"
+THIS_VERSION = "v8.30.3"
 
 # fmt: off
 PREDBAT_FILES = ["predbat.py", "hass.py", "config.py", "prediction.py", "gecloud.py", "utils.py", "inverter.py", "ha.py", "download.py", "web.py", "web_helper.py", "predheat.py", "futurerate.py", "octopus.py", "solcast.py", "execute.py", "plan.py", "fetch.py", "output.py", "userinterface.py", "energydataservice.py", "alertfeed.py", "compare.py", "db_manager.py", "db_engine.py", "plugin_system.py", "ohme.py", "components.py", "fox.py", "carbon.py", "web_mcp.py", "component_base.py", "axle.py"]

apps/predbat/tests/test_fox_api.py

@@ -4322,7 +4322,7 @@ def test_apply_battery_schedule_discharge_only(my_predbat):
             assert group["startMinute"] == 0
             assert group["endHour"] == 18
             assert group["endMinute"] == 59
-            assert group["fdSoc"] == 10
+            assert group["fdSoc"] == 15  # fdsoc_min is 10, reserve is 15, so fdSoc should be max(10,15)=15
             assert group["fdPwr"] == 5000
             assert group["maxSoc"] == 15, f"Expected maxSoc=15, got {group['maxSoc']}"
             assert group["minSocOnGrid"] == 15, f"Expected minSocOnGrid=15, got {group['minSocOnGrid']}"