From 93f176215952e9de4c1d15e5a0b286e8b39876a3 Mon Sep 17 00:00:00 2001 From: LKuemmel Date: Thu, 23 Jan 2025 10:27:31 +0100 Subject: [PATCH 1/2] fix deviating evse current --- packages/control/algorithm/surplus_controlled.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/control/algorithm/surplus_controlled.py b/packages/control/algorithm/surplus_controlled.py index f94af8720a..821632ccb5 100644 --- a/packages/control/algorithm/surplus_controlled.py +++ b/packages/control/algorithm/surplus_controlled.py @@ -142,7 +142,7 @@ def _fix_deviating_evse_current(self, chargepoint: Chargepoint) -> float: MAX_DEVIATION = 1.1 evse_current = chargepoint.data.get.evse_current if evse_current and chargepoint.data.set.current != chargepoint.data.set.current_prev: - formatted_evse_current = evse_current if evse_current < 32 else evse_current / 100 + formatted_evse_current = evse_current if evse_current <= 32 else evse_current / 100 offset = formatted_evse_current - max(chargepoint.data.get.currents) if abs(offset) >= MAX_DEVIATION: current_with_offset = chargepoint.data.set.current + offset From 8996d1b9003b95e2c3bbcafea443ad1235bdcc04 Mon Sep 17 00:00:00 2001 From: LKuemmel Date: Thu, 23 Jan 2025 10:44:24 +0100 Subject: [PATCH 2/2] ammend --- packages/control/algorithm/surplus_controlled.py | 3 +-- packages/modules/chargepoints/external_openwb/__init__.py | 0 packages/modules/common/evse.py | 2 ++ 3 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 packages/modules/chargepoints/external_openwb/__init__.py diff --git a/packages/control/algorithm/surplus_controlled.py b/packages/control/algorithm/surplus_controlled.py index 821632ccb5..9f814f2dd8 100644 --- a/packages/control/algorithm/surplus_controlled.py +++ b/packages/control/algorithm/surplus_controlled.py @@ -142,8 +142,7 @@ def _fix_deviating_evse_current(self, chargepoint: Chargepoint) -> float: MAX_DEVIATION = 1.1 evse_current = chargepoint.data.get.evse_current if evse_current and chargepoint.data.set.current != chargepoint.data.set.current_prev: - formatted_evse_current = evse_current if evse_current <= 32 else evse_current / 100 - offset = formatted_evse_current - max(chargepoint.data.get.currents) + offset = evse_current - max(chargepoint.data.get.currents) if abs(offset) >= MAX_DEVIATION: current_with_offset = chargepoint.data.set.current + offset current = min(current_with_offset, chargepoint.data.control_parameter.required_current) diff --git a/packages/modules/chargepoints/external_openwb/__init__.py b/packages/modules/chargepoints/external_openwb/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/modules/common/evse.py b/packages/modules/common/evse.py index 7277e28dc1..670b779056 100644 --- a/packages/modules/common/evse.py +++ b/packages/modules/common/evse.py @@ -47,6 +47,8 @@ def get_plug_charge_state(self) -> Tuple[bool, bool, float]: str(state)+", Soll-Stromstärke: "+str(set_current)) plugged = state.plugged charging = set_current > 0 if state.charge_enabled else False + if set_current > 32: + set_current = set_current / 100 return plugged, charging, set_current def get_firmware_version(self) -> int: