Fix surplus controlled (#2245)

* fix pv charging with min current

* ChargepointState WAIT_FOR_USING_PHASES after switch on delay

Author: LKuemmel

packages/control/algorithm/common.py

@@ -126,8 +126,12 @@ def update_raw_data(preferenced_chargepoints: List[Chargepoint],
 
         if diff_to_zero is False:
             if chargepoint.data.control_parameter.min_current < max_target_set_current:
-                diffs = [chargepoint.data.control_parameter.min_current -
-                         max_target_set_current if required_currents[i] != 0 else 0 for i in range(3)]
+                if surplus:
+                    diffs = [chargepoint.data.set.target_current -
+                             max_target_set_current if required_currents[i] != 0 else 0 for i in range(3)]
+                else:
+                    diffs = [chargepoint.data.control_parameter.min_current -
+                             max_target_set_current if required_currents[i] != 0 else 0 for i in range(3)]
             else:
                 continue
         else:

packages/control/counter.py

@@ -335,7 +335,7 @@ def switch_on_timer_expired(self, chargepoint: Chargepoint) -> None:
                 control_parameter.timestamp_switch_on_off = None
                 self.data.set.reserved_surplus -= pv_config.switch_on_threshold*control_parameter.phases
                 msg = self.SWITCH_ON_EXPIRED.format(pv_config.switch_on_threshold)
-                control_parameter.state = ChargepointState.CHARGING_ALLOWED
+                control_parameter.state = ChargepointState.WAIT_FOR_USING_PHASES
 
                 if chargepoint.data.set.charging_ev_data.charge_template.data.chargemode.pv_charging.feed_in_limit:
                     feed_in_yield = pv_config.feed_in_yield