Fox fixes, minor bug fixes (#2659)

* Fox fixes

* Fox fixes

* Auto config + fixes

* Fix issue with scaling of charge rate

* [pre-commit.ci lite] apply automatic fixes

* HA Interface alive issue when not using HA

* Update custom-dictionary-workspace.txt

* [pre-commit.ci lite] apply automatic fixes

* GEneration PV sensor

* Update custom-dictionary-workspace.txt

---------

Co-authored-by: pre-commit-ci-lite[bot] <117423508+pre-commit-ci-lite[bot]@users.noreply.github.com>

Author: springfall2008

.cspell/custom-dictionary-workspace.txt

@@ -19,6 +19,7 @@ autopep
 autoupdate
 Basepath
 Batpred
+battemperature
 batteri
 batteryb
 bierner
@@ -79,6 +80,7 @@ energydataservice
 epod
 euids
 evse
+exportlimit
 fdpwr
 fdsoc
 feedin
@@ -92,11 +94,14 @@ foxess
 futurerate
 gecloud
 gekey
+generationpower
 geserial
 geseriale
 Ginlong
 GivEnergy
 givtcp
+gridconsumption
+gridconsumptionpower
 growatt
 HACS
 hadashboard
@@ -135,6 +140,7 @@ kvar
 kvarh
 kwhb
 linebreak
+loadspower
 localfolder
 lockstep
 logdata
@@ -203,6 +209,7 @@ predbatt
 Predheat
 psum
 pvbat
+pvpower
 pwindow
 pylint
 pyproject

apps/predbat/components.py

@@ -98,6 +98,11 @@
                 "required": True,
                 "config": "fox_key",
             },
+            "automatic": {
+                "required": False,
+                "default": False,
+                "config": "fox_automatic",
+            },
         },
     },
 }

apps/predbat/config.py

@@ -1278,7 +1278,7 @@
         "min": -20,
         "max": 40,
         "step": 0.1,
-        "unit": "c",
+        "unit": "°C",
         "default": 20,
         "enable": "predheat_enable",
     },
@@ -1421,33 +1421,6 @@
         "charge_discharge_with_rate": False,
         "target_soc_used_for_discharge": True,
     },
-    "GSC": {
-        "name": "Ginlong Solis Cloud",
-        "has_rest_api": False,
-        "has_mqtt_api": False,
-        "output_charge_control": "current",
-        "charge_control_immediate": False,
-        "has_charge_enable_time": True,
-        "has_discharge_enable_time": True,
-        "has_target_soc": False,
-        "has_reserve_soc": False,
-        "has_timed_pause": False,
-        "charge_time_format": "H:M-H:M",
-        "charge_time_entity_is_option": False,
-        "soc_units": "%",
-        "num_load_entities": 2,
-        "has_ge_inverter_mode": False,
-        "time_button_press": True,
-        "clock_time_format": "%Y-%m-%d %H:%M:%S",
-        "write_and_poll_sleep": 4,
-        "has_time_window": True,
-        "support_charge_freeze": False,
-        "support_discharge_freeze": False,
-        "has_idle_time": False,
-        "can_span_midnight": False,
-        "charge_discharge_with_rate": False,
-        "target_soc_used_for_discharge": True,
-    },
     "SE": {
         "name": "SolarEdge",
         "has_rest_api": False,
@@ -1709,12 +1682,13 @@
         "soc_units": "%",
         "num_load_entities": 1,
         "has_ge_inverter_mode": False,
+        "has_fox_inverter_mode": True,
         "time_button_press": False,
         "clock_time_format": "%Y-%m-%d %H:%M:%S",
         "write_and_poll_sleep": 2,
         "has_time_window": False,
         "support_charge_freeze": True,
-        "support_discharge_freeze": True,
+        "support_discharge_freeze": False,
         "has_idle_time": False,
         "can_span_midnight": False,
         "charge_discharge_with_rate": False,
@@ -1815,9 +1789,9 @@
     "pause_mode": {"type": "sensor_list", "sensor_type": "string", "modify": True, "entries": "num_inverters"},
     "pause_start_time": {"type": "sensor_list", "sensor_type": "none|string", "modify": True, "entries": "num_inverters"},
     "pause_end_time": {"type": "sensor_list", "sensor_type": "none|string", "modify": True, "entries": "num_inverters"},
-    "inverter_limit": {"type": "sensor_list", "sensor_type": "integer", "modify": False, "zero": False, "entries": "num_inverters"},
+    "inverter_limit": {"type": "sensor_list", "sensor_type": "float", "modify": False, "zero": False, "entries": "num_inverters"},
     "inverter_limit_charge": {"type": "sensor_list", "sensor_type": "integer", "modify": False, "zero": False, "entries": "num_inverters"},
-    "export_limit": {"type": "integer_list", "entries": "num_inverters"},
+    "export_limit": {"type": "sensor_list", "sensor_type": "float", "entries": "num_inverters"},
     "inverter_battery_rate_min": {"type": "integer", "zero": False, "entries": "num_inverters"},
     "inverter_reserve_max": {"type": "integer", "zero": False, "entries": "num_inverters"},
     "battery_charge_power_curve: ": {"type": "int_float_dict"},

apps/predbat/execute.py

@@ -349,7 +349,7 @@ def execute_plan(self):
                             self.log("Export Hold (Demand mode) as export is now at/below target or freeze only is set - current SoC {} and target {}".format(self.soc_kw, discharge_soc))
                 else:
                     if (self.minutes_now < minutes_end) and ((minutes_start - self.minutes_now) <= self.set_window_minutes) and (self.export_limits_best[0] < 100):
-                        inverter.adjust_force_export(False, discharge_start_time, discharge_end_time)
+                        inverter.adjust_force_export(inverter.inv_has_discharge_enable_time, discharge_start_time, discharge_end_time)
                     else:
                         self.log("Not setting export as we are not yet within the export window - next time is {} - {}".format(self.time_abs_str(minutes_start), self.time_abs_str(minutes_end)))
                         inverter.adjust_force_export(False)
@@ -378,6 +378,9 @@ def execute_plan(self):
                                     if resetDischarge:
                                         inverter.adjust_discharge_rate(0)
                                         resetDischarge = False
+                                    if self.set_reserve_enable:
+                                        inverter.adjust_reserve(min(inverter.soc_percent + 1, 100))
+                                        resetReserve = False
                                 carHolding = True
                                 self.log("Disabling battery discharge while the car {} is charging".format(car_n))
                                 if "Hold for car" not in status:
@@ -391,11 +394,16 @@ def execute_plan(self):
             boostHolding = False
             if self.set_charge_window and self.iboost_enable and self.iboost_prevent_discharge and self.iboost_running_full and status not in ["Exporting", "Charging"]:
                 if inverter.inv_has_timed_pause:
-                    inverter.adjust_pause_mode(pause_discharge=True)
-                    resetPause = False
+                    if resetPause:
+                        inverter.adjust_pause_mode(pause_discharge=True)
+                        resetPause = False
                 else:
-                    inverter.adjust_discharge_rate(0)
-                    resetDischarge = False
+                    if resetDischarge:
+                        inverter.adjust_discharge_rate(0)
+                        resetDischarge = False
+                    if self.set_reserve_enable:
+                        inverter.adjust_reserve(min(inverter.soc_percent + 1, 100))
+                        resetReserve = False
                 boostHolding = True
                 self.log("Disabling battery discharge while iBoost is running")
                 if "Hold for iBoost" not in status:
@@ -724,11 +732,11 @@ def fetch_inverter_data(self, create=True):
                 self.reserve_current,
                 self.soc_max,
                 self.soc_kw,
-                self.charge_rate_now * 60,
-                self.discharge_rate_now * 60,
+                self.charge_rate_now * MINUTE_WATT,
+                self.discharge_rate_now * MINUTE_WATT,
                 self.battery_rate_min * MINUTE_WATT,
-                dp3(self.inverter_limit * 60),
-                dp3(self.export_limit * 60),
+                dp3(self.inverter_limit * MINUTE_WATT),
+                dp3(self.export_limit * MINUTE_WATT),
                 100 - int(self.battery_loss * 100),
                 100 - int(self.battery_loss_discharge * 100),
                 100 - int(self.inverter_loss * 100),