fix control parameter phases if phase switch is not supported (#2727)

* fix control parameter phases if phase switch is not supported

* condition for charging ist charge_state

* pytest

Author: LKuemmel

packages/control/algorithm/common_test.py

@@ -51,6 +51,7 @@ def test_set_current_counterdiff(diff: float,
     cp.data.control_parameter.required_currents = required_currents
     cp.data.set.charging_ev_data = ev
     cp.data.set.current = 6
+    cp.data.get.charge_state = True
     cp.data.get.currents = [10]*3
     get_counters_to_check_mock = Mock(return_value=["cp0", "cp6"])
     monkeypatch.setattr(CounterAll, "get_counters_to_check", get_counters_to_check_mock)

packages/control/algorithm/filter_chargepoints.py

@@ -44,7 +44,7 @@ def get_preferenced_chargepoint_charging(
             log.info(
                 f"LP {cp.num}: Keine Zuteilung des Mindeststroms, daher keine weitere Berücksichtigung")
             preferenced_chargepoints_without_set_current.append(cp)
-        elif max(cp.data.get.currents) == 0:
+        elif cp.data.get.charge_state is False:
             log.info(
                 f"LP {cp.num}: Lädt nicht, daher keine weitere Berücksichtigung")
             preferenced_chargepoints_without_set_current.append(cp)

packages/control/algorithm/integration_test/instant_charging_test.py

@@ -29,6 +29,7 @@ def all_cp_charging_1p():
     for i in range(3, 6):
         data.data.cp_data[f"cp{i}"].data.get.currents = [0]*3
         data.data.cp_data[f"cp{i}"].data.get.currents[i-3] = 16
+        data.data.cp_data[f"cp{i}"].data.get.charge_state = True
 
 
 @pytest.fixture()
@@ -40,6 +41,7 @@ def all_cp_instant_charging_3p():
         control_parameter.required_currents = [16]*3
         control_parameter.required_current = 16
         control_parameter.chargemode = Chargemode.INSTANT_CHARGING
+        data.data.cp_data[f"cp{i}"].data.get.charge_state = True
         data.data.cp_data[f"cp{i}"].data.get.currents = [16]*3
 
 

packages/control/algorithm/integration_test/pv_charging_test.py

@@ -295,10 +295,13 @@ def test_phase_switch_1p_3p(all_cp_pv_charging_1p, monkeypatch):
     data.data.counter_data["counter0"].data.set.raw_power_left = cases_phase_switch[1].raw_power_left
     data.data.counter_data["counter0"].data.set.raw_currents_left = cases_phase_switch[1].raw_currents_left_counter0
     data.data.counter_data["counter6"].data.set.raw_currents_left = cases_phase_switch[1].raw_currents_left_counter6
+    data.data.cp_data["cp3"].data.get.charge_state = True
     data.data.cp_data["cp3"].data.get.currents = [32, 0, 0]
     data.data.cp_data["cp3"].data.get.power = 7360
     data.data.cp_data["cp3"].data.control_parameter.timestamp_last_phase_switch = 1652682252
+    data.data.cp_data["cp4"].data.get.charge_state = False
     data.data.cp_data["cp4"].data.get.currents = [0, 0, 0]
+    data.data.cp_data["cp5"].data.get.charge_state = False
     data.data.cp_data["cp5"].data.get.currents = [0, 0, 0]
     for i in range(3, 6):
         data.data.cp_data[f"cp{i}"].data.control_parameter.template_phases = 0

packages/control/algorithm/surplus_controlled_test.py

@@ -115,6 +115,7 @@ def test_add_unused_evse_current(evse_current: float,
                                  expected_current: float):
     # setup
     c = Chargepoint(0, None)
+    c.data.get.charge_state = True
     c.data.get.currents = [13]*3
     c.data.get.evse_current = evse_current
     c.data.control_parameter.required_current = 16

packages/control/chargepoint/chargepoint.py

@@ -576,18 +576,17 @@ def set_phases(self, phases: int, template_phases: int) -> int:
         if phases != self.data.get.phases_in_use:
             # Wenn noch kein Eintrag im Protokoll erstellt wurde, wurde noch nicht geladen und die Phase kann noch
             # umgeschaltet werden.
-            if self.data.set.log.imported_since_plugged != 0:
-                if charging_ev.ev_template.data.prevent_phase_switch:
-                    log.info(f"Phasenumschaltung an Ladepunkt {self.num} nicht möglich, da bei EV"
-                             f"{charging_ev.num} nach Ladestart nicht mehr umgeschaltet werden darf.")
-                    if self.data.get.phases_in_use != 0:
-                        phases = self.data.get.phases_in_use
-                    else:
-                        phases = self.data.control_parameter.phases
-                elif self.hw_supports_phase_switch() is False:
-                    # sonst passt die Phasenzahl nicht bei Autos, die eine Phase weg schalten.
-                    log.info(f"Phasenumschaltung an Ladepunkt {self.num} wird durch die Hardware nicht unterstützt.")
-                    phases = phases
+            if self.data.set.log.imported_since_plugged != 0 and charging_ev.ev_template.data.prevent_phase_switch:
+                log.info(f"Phasenumschaltung an Ladepunkt {self.num} nicht möglich, da bei EV"
+                         f"{charging_ev.num} nach Ladestart nicht mehr umgeschaltet werden darf.")
+                if self.data.get.phases_in_use != 0:
+                    phases = self.data.get.phases_in_use
+                else:
+                    phases = self.data.control_parameter.phases
+            elif self.hw_supports_phase_switch() is False:
+                # sonst passt die Phasenzahl nicht bei Autos, die eine Phase weg schalten.
+                log.info(f"Phasenumschaltung an Ladepunkt {self.num} wird durch die Hardware nicht unterstützt.")
+                phases = self.data.get.phases_in_use
         if phases != self.data.control_parameter.phases:
             self.data.control_parameter.phases = phases
         self.data.control_parameter.template_phases = template_phases

packages/control/chargepoint/get_phases_test.py

@@ -152,7 +152,7 @@ def __init__(self,
     SetPhasesParams(name="Switch phases", phases=1, phases_in_use=3, prevent_phase_switch=False,
                     imported_since_plugged=1, phase_switch_supported=True, expected_phases=1),
     SetPhasesParams(name="Phase switch not supported by cp", phases=1, phases_in_use=3, prevent_phase_switch=False,
-                    imported_since_plugged=1, phase_switch_supported=False, expected_phases=1)
+                    imported_since_plugged=1, phase_switch_supported=False, expected_phases=3)
 ]