Revert "scheduled charging: consider soc request interval for 1p3p decision (openWB#2496)"

This reverts commit de81b67.

Author: LKuemmel

packages/control/ev/charge_template.py

@@ -308,8 +308,7 @@ def scheduled_charging_recent_plan(self,
                                        phase_switch_supported: bool,
                                        charging_type: str,
                                        chargemode_switch_timestamp: float,
-                                       control_parameter: ControlParameter,
-                                       soc_request_interval_offset: int) -> Optional[SelectedPlan]:
+                                       control_parameter: ControlParameter) -> Optional[SelectedPlan]:
         plans_diff_end_date = []
         for p in self.data.chargemode.scheduled_charging.plans:
             if p.active:
@@ -342,7 +341,7 @@ def scheduled_charging_recent_plan(self,
 
                     remaining_time, missing_amount, phases, duration = self._calc_remaining_time(
                         plan, plan_end_time, soc, ev_template, used_amount, max_hw_phases, phase_switch_supported,
-                        charging_type, control_parameter.phases, soc_request_interval_offset)
+                        charging_type, control_parameter.phases)
 
                     return SelectedPlan(remaining_time=remaining_time,
                                         duration=duration,
@@ -361,8 +360,7 @@ def _calc_remaining_time(self,
                              max_hw_phases: int,
                              phase_switch_supported: bool,
                              charging_type: str,
-                             control_parameter_phases: int,
-                             soc_request_interval_offset: int) -> SelectedPlan:
+                             control_parameter_phases) -> SelectedPlan:
         if plan.phases_to_use == 0:
             if max_hw_phases == 1:
                 duration, missing_amount = self._calculate_duration(
@@ -382,9 +380,7 @@ def _calc_remaining_time(self,
                 duration_1p, missing_amount = self._calculate_duration(
                     plan, soc, ev_template.data.battery_capacity, used_amount, 1, charging_type, ev_template)
                 remaining_time_1p = plan_end_time - duration_1p
-                # Kurz vor dem nächsten Abfragen des SoC, wenn noch der alte SoC da ist, kann es sein, dass die Zeit
-                # für 1p nicht mehr reicht, weil die Regelung den neuen SoC noch nicht kennt.
-                if remaining_time_1p - (soc_request_interval_offset if plan.limit.selected == "soc" else 0) < 0:
+                if remaining_time_1p < 0:
                     # Zeit reicht nicht mehr für einphasiges Laden
                     remaining_time = remaining_time_3p
                     duration = duration_3p
@@ -470,8 +466,6 @@ def scheduled_charging_calc_current(self,
         else:
             plan_current = plan.dc_current
             max_current = ev_template.data.dc_max_current
-        if plan.limit.selected != "soc":
-            soc_request_interval_offset = 0
         log.debug("Verwendeter Plan: "+str(plan.name))
         if limit.selected == "soc" and soc >= limit.soc_limit and soc >= limit.soc_scheduled:
             message = self.SCHEDULED_CHARGING_REACHED_LIMIT_SOC

packages/control/ev/charge_template_test.py

@@ -158,7 +158,7 @@ def test_scheduled_charging_recent_plan(params: Params, monkeypatch):
 
     # execution
     remaining_time, missing_amount, phases, duration = ct._calc_remaining_time(
-        plan, 6000, 50, evt, 3000, max_hw_phases, phase_switch_supported, ChargingType.AC.value, 2, 0)
+        plan, 6000, 50, evt, 3000, max_hw_phases, phase_switch_supported, ChargingType.AC.value, 2)
     # end time 16.5.22 10:00
 
     # evaluation
@@ -211,7 +211,7 @@ def test_search_plan(check_duration_return1: Tuple[Optional[float], bool],
 
     # execution
     selected_plan = ct.scheduled_charging_recent_plan(
-        60, EvTemplate(), 3, 200, 3, True, ChargingType.AC.value, 1652688000, Mock(spec=ControlParameter), 0)
+        60, EvTemplate(), 3, 200, 3, True, ChargingType.AC.value, 1652688000, Mock(spec=ControlParameter))
 
     # evaluation
     if expected_plan_num is None:
@@ -235,7 +235,7 @@ def test_scheduled_charging_recent_plan_fulfilled(monkeypatch):
 
     # execution
     selected_plan = ct.scheduled_charging_recent_plan(
-        60, EvTemplate(), 3, 1200, 3, True, ChargingType.AC.value, 1652688000, Mock(spec=ControlParameter), 0)
+        60, EvTemplate(), 3, 1200, 3, True, ChargingType.AC.value, 1652688000, Mock(spec=ControlParameter))
 
     # evaluation
     if selected_plan:

packages/control/ev/ev.py

@@ -147,12 +147,6 @@ def get_required_current(self,
                 required_current, submode, message = charge_template.stop()
                 phases = control_parameter.phases or max_phases_hw
             else:
-                # Wenn der SoC ein paar Minuten alt ist, kann der Termin trotzdem gehalten werden.
-                # Zielladen kann nicht genauer arbeiten, als das Abfrageintervall vom SoC.
-                if self.soc_module:
-                    soc_request_interval_offset = self.soc_module.general_config.request_interval_charging
-                else:
-                    soc_request_interval_offset = 0
                 if charge_template.data.chargemode.selected == "scheduled_charging":
                     plan_data = charge_template.scheduled_charging_recent_plan(
                         self.data.get.soc,
@@ -163,9 +157,15 @@ def get_required_current(self,
                         phase_switch_supported,
                         charging_type,
                         chargemode_switch_timestamp,
-                        control_parameter,
-                        soc_request_interval_offset)
+                        control_parameter)
+                    soc_request_interval_offset = 0
                     if plan_data:
+                        # Wenn der SoC ein paar Minuten alt ist, kann der Termin trotzdem gehalten werden.
+                        # Zielladen kann nicht genauer arbeiten, als das Abfrageintervall vom SoC.
+                        if (self.soc_module and
+                                charge_template.data.chargemode.
+                                scheduled_charging.plans[str(plan_data.plan.id)].limit.selected == "soc"):
+                            soc_request_interval_offset = self.soc_module.general_config.request_interval_charging
                         control_parameter.current_plan = plan_data.plan.id
                     else:
                         control_parameter.current_plan = None