From 93ddc40dc7009ea59130f30b9af5870dccd48caa Mon Sep 17 00:00:00 2001 From: LKuemmel Date: Wed, 16 Oct 2024 15:16:02 +0200 Subject: [PATCH 1/2] info messages for pv charging --- packages/control/ev.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/packages/control/ev.py b/packages/control/ev.py index 5442da80b..467725649 100644 --- a/packages/control/ev.py +++ b/packages/control/ev.py @@ -693,6 +693,9 @@ def instant_charging(self, return 0, "stop", "Keine Ladung, da da ein interner Fehler aufgetreten ist: "+traceback.format_exc() PV_CHARGING_SOC_REACHED = "Keine Ladung, da der maximale Soc bereits erreicht wurde." + PV_CHARGING_SOC_CHARGING = ("Ladung evtl. auch ohne PV-Überschuss, da der Mindest-SoC des Fahrzeugs noch nicht " + "erreicht wurde.") + PV_CHARGING_MIN_CURRENT_CHARGING = "Ladung evtl. auch ohne PV-Überschuss, da minimaler Dauerstrom aktiv ist." def pv_charging(self, soc: Optional[float], min_current: int, charging_type: str) -> Tuple[int, str, Optional[str]]: """ prüft, ob Min-oder Max-Soc erreicht wurden und setzt entsprechend den Ladestrom. @@ -707,7 +710,7 @@ def pv_charging(self, soc: Optional[float], min_current: int, charging_type: str current = pv_charging.min_soc_current else: current = pv_charging.dc_min_soc_current - return current, "instant_charging", message + return current, "instant_charging", self.PV_CHARGING_SOC_CHARGING if charging_type == ChargingType.AC.value: pv_min_current = pv_charging.min_current else: @@ -717,7 +720,7 @@ def pv_charging(self, soc: Optional[float], min_current: int, charging_type: str return min_current, "pv_charging", message else: # Min PV - return pv_min_current, "instant_charging", message + return pv_min_current, "instant_charging", self.PV_CHARGING_MIN_CURRENT_CHARGING else: return 0, "stop", self.PV_CHARGING_SOC_REACHED except Exception: From db33f8e9336c51997a3d6a731046ddca26a14d14 Mon Sep 17 00:00:00 2001 From: LKuemmel Date: Wed, 16 Oct 2024 15:21:35 +0200 Subject: [PATCH 2/2] tests --- packages/control/ev_charge_template_test.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/control/ev_charge_template_test.py b/packages/control/ev_charge_template_test.py index 0c46ea6b2..579dcf1b3 100644 --- a/packages/control/ev_charge_template_test.py +++ b/packages/control/ev_charge_template_test.py @@ -97,9 +97,11 @@ def test_instant_charging(selected: str, current_soc: float, used_amount: float, "min_soc, min_current, current_soc, expected", [ pytest.param(0, 0, 100, (0, "stop", ChargeTemplate.PV_CHARGING_SOC_REACHED), id="max soc reached"), - pytest.param(15, 0, 14, (10, "instant_charging", None), id="min soc not reached"), + pytest.param(15, 0, 14, (10, "instant_charging", ChargeTemplate.PV_CHARGING_SOC_CHARGING), + id="min soc not reached"), pytest.param(15, 0, None, (6, "pv_charging", None), id="soc not defined"), - pytest.param(15, 8, 15, (8, "instant_charging", None), id="min current configured"), + pytest.param(15, 8, 15, (8, "instant_charging", ChargeTemplate.PV_CHARGING_MIN_CURRENT_CHARGING), + id="min current configured"), pytest.param(15, 0, 15, (6, "pv_charging", None), id="bare pv charging"), ]) def test_pv_charging(min_soc: int, min_current: int, current_soc: float,