draft

Author: LKuemmel

packages/control/algorithm/additional_current.py

@@ -30,7 +30,8 @@ def set_additional_current(self) -> None:
                     available_currents, limit = Loadmanagement().get_available_currents(missing_currents, counter, cp)
                     log.debug(f"cp {cp.num} available currents {available_currents} missing currents "
                               f"{missing_currents} limit {limit.message}")
-                    cp.data.control_parameter.limit = limit
+                    if limit.limiting_value is not None:
+                        cp.data.control_parameter.limit = limit
                     available_for_cp = common.available_current_for_cp(cp, counts, available_currents, missing_currents)
                     current = common.get_current_to_set(
                         cp.data.set.current, available_for_cp, cp.data.set.target_current)

packages/control/algorithm/min_current.py

@@ -27,7 +27,8 @@ def set_min_current(self) -> None:
                     if max(missing_currents) > 0:
                         available_currents, limit = Loadmanagement().get_available_currents(
                             missing_currents, counter, cp)
-                        cp.data.control_parameter.limit = limit
+                        if limit.limiting_value is not None:
+                            cp.data.control_parameter.limit = limit
                         available_for_cp = common.available_current_for_cp(
                             cp, counts, available_currents, missing_currents)
                         current = common.get_current_to_set(

packages/control/algorithm/surplus_controlled.py

@@ -61,7 +61,9 @@ def _set(self,
                 cp,
                 feed_in=feed_in_yield
             )
-            cp.data.control_parameter.limit = limit
+            # im PV-Laden wird der Strom immer durch die Leistung begrenzt
+            if limit.limiting_value is not None and limit.limiting_value != LimitingValue.POWER:
+                cp.data.control_parameter.limit = limit
             available_for_cp = common.available_current_for_cp(cp, counts, available_currents, missing_currents)
             if counter.get_control_range_state(feed_in_yield) == ControlRangeState.MIDDLE:
                 pv_charging = data.data.general_data.data.chargemode_config.pv_charging

packages/control/ev/ev.py

@@ -277,7 +277,8 @@ def _check_phase_switch_conditions(self,
         all_surplus = data.data.counter_all_data.get_evu_counter().get_usable_surplus(feed_in_yield)
         required_surplus = control_parameter.min_current * max_phases_ev * 230 - get_power
         unbalanced_load_limit_reached = limit.limiting_value == LimitingValue.UNBALANCED_LOAD
-        condition_1_to_3 = (((get_medium_charging_current(get_currents) > max_current_range and
+        current_limit_reached = limit.limiting_value == LimitingValue.CURRENT
+        condition_1_to_3 = ((((get_medium_charging_current(get_currents) > max_current_range or current_limit_reached) and
                             all_surplus > required_surplus) or unbalanced_load_limit_reached) and
                             phases_in_use == 1)
         condition_3_to_1 = get_medium_charging_current(