Moving setting the discharge current to before the button press.

Author: CraigCallender

apps/predbat/inverter.py

@@ -2384,16 +2384,18 @@ def adjust_force_export(self, force_export, new_start_time=None, new_end_time=No
             self.write_and_poll_switch("scheduled_discharge_enable", self.base.get_arg("scheduled_discharge_enable", indirect=False, index=self.id), True)
             self.log("Inverter {} Turning on scheduled export".format(self.id))
 
+        # Set discharge current before the button press so the inverter registers it when the schedule is committed
+        if force_export and (not self.inv_has_charge_enable_time or self.inv_clear_slot_on_disable) and (self.inv_output_charge_control == "current"):
+            if self.inv_charge_control_immediate:
+                self.enable_charge_discharge_with_time_current("discharge", True)
+
         if (new_end != old_end) or (new_start != old_start) or (force_export != old_discharge_enable):
             if self.inv_time_button_press:
                 self.press_and_poll_button()
 
         # Force export, turn it on after we change the window
         if force_export:
             self.adjust_inverter_mode(force_export, changed_start_end=changed_start_end)
-            if (not self.inv_has_charge_enable_time or self.inv_clear_slot_on_disable) and (self.inv_output_charge_control == "current"):
-                if self.inv_charge_control_immediate:
-                    self.enable_charge_discharge_with_time_current("discharge", True)
 
         # Notify
         if changed_start_end: