fix merge

Author: LKuemmel

packages/control/algorithm/additional_current.py

@@ -27,8 +27,7 @@ def set_additional_current(self) -> None:
                 while len(preferenced_chargepoints):
                     cp = preferenced_chargepoints[0]
                     missing_currents, counts = common.get_missing_currents_left(preferenced_chargepoints)
-                    available_currents, limit = Loadmanagement().get_available_currents(
-                        missing_currents, cp.data.get.voltages, counter, cp)
+                    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

packages/control/algorithm/min_current.py

@@ -24,7 +24,7 @@ def set_min_current(self) -> None:
                     missing_currents, counts = common.get_min_current(cp)
                     if max(missing_currents) > 0:
                         available_currents, limit = Loadmanagement().get_available_currents(
-                            missing_currents, cp.data.get.voltages, counter, cp)
+                            missing_currents, counter, cp)
                         cp.data.control_parameter.limit = limit
                         available_for_cp = common.available_current_for_cp(
                             cp, counts, available_currents, missing_currents)

packages/control/loadmanagement.py

@@ -15,7 +15,6 @@
 class Loadmanagement:
     def get_available_currents(self,
                                missing_currents: List[float],
-                               cp_voltages: List[float],
                                counter: Counter,
                                cp: Chargepoint,
                                feed_in: int = 0) -> Tuple[List[float], LoadmanagementLimit]:
@@ -36,7 +35,7 @@ def get_available_currents(self,
         limit = new_limit if new_limit.limiting_value is not None else limit
 
         available_currents, new_limit = self._limit_by_power(
-            counter, available_currents, cp_voltages, counter.data.set.raw_power_left, feed_in)
+            counter, available_currents, cp.data.get.voltages, counter.data.set.raw_power_left, feed_in)
         limit = new_limit if new_limit.limiting_value is not None else limit
 
         if f"counter{counter.num}" == data.data.counter_all_data.get_evu_counter_str():