From 4047fb14380cf7f0924c302292a2e1973a1356b3 Mon Sep 17 00:00:00 2001 From: LKuemmel Date: Thu, 23 Oct 2025 09:24:52 +0200 Subject: [PATCH 1/2] update default for limit -> amount --- packages/helpermodules/abstract_plans.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/helpermodules/abstract_plans.py b/packages/helpermodules/abstract_plans.py index d6017fb952..6c7e3ff78f 100644 --- a/packages/helpermodules/abstract_plans.py +++ b/packages/helpermodules/abstract_plans.py @@ -22,7 +22,7 @@ def time_factory(): @dataclass class Limit: selected: str = "none" - amount: int = 1000 + amount: int = 50000 soc: int = 50 From e7534bc60cc61c1b641b6a1bf170669b82d62726 Mon Sep 17 00:00:00 2001 From: LKuemmel Date: Thu, 23 Oct 2025 09:38:01 +0200 Subject: [PATCH 2/2] pytest --- packages/control/ev/charge_template_test.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/packages/control/ev/charge_template_test.py b/packages/control/ev/charge_template_test.py index 06c3cb6b40..672915e33d 100644 --- a/packages/control/ev/charge_template_test.py +++ b/packages/control/ev/charge_template_test.py @@ -43,12 +43,12 @@ def data_module() -> None: pytest.param({"0": TimeChargingPlan(id=0, limit=Limit(selected="soc"))}, None, 0, TimeChargingPlan(id=0, limit=Limit(selected="soc")), (16, "time_charging", None, 0, 1), id="plan active, soc is not defined"), - pytest.param({"0": TimeChargingPlan(id=0, limit=Limit(selected="amount"))}, 0, 1500, - TimeChargingPlan(id=0, limit=Limit(selected="amount")), + pytest.param({"0": TimeChargingPlan(id=0, limit=Limit(selected="amount", amount=1000))}, 0, 1500, + TimeChargingPlan(id=0, limit=Limit(selected="amount", amount=1000)), (0, "stop", ChargeTemplate.TIME_CHARGING_AMOUNT_REACHED, 0, 1), id="plan active, used_amount_time_charging is reached"), - pytest.param({"0": TimeChargingPlan(id=0, limit=Limit(selected="amount"))}, 0, 500, - TimeChargingPlan(id=0, limit=Limit(selected="amount")), + pytest.param({"0": TimeChargingPlan(id=0, limit=Limit(selected="amount", amount=1000))}, 0, 500, + TimeChargingPlan(id=0, limit=Limit(selected="amount", amount=1000)), (16, "time_charging", None, 0, 1), id="plan active, used_amount_time_charging is not reached"), pytest.param({"0": TimeChargingPlan(id=0)}, 0, 0, None, @@ -91,6 +91,7 @@ def test_instant_charging(selected: str, current_soc: float, used_amount: float, data.data.optional_data.data.et.active = False ct = ChargeTemplate() ct.data.chargemode.instant_charging.limit.selected = selected + ct.data.chargemode.instant_charging.limit.amount = 1000 # execution ret = ct.instant_charging(current_soc, used_amount, ChargingType.AC.value) @@ -124,6 +125,7 @@ def test_pv_charging(min_soc: int, ct.data.chargemode.pv_charging.phases_to_use = 0 ct.data.chargemode.pv_charging.phases_to_use_min_soc = 3 ct.data.chargemode.pv_charging.limit.selected = limit_selected + ct.data.chargemode.pv_charging.limit.amount = 1000 ct.data.chargemode.pv_charging.limit.soc = 90 data.data.bat_all_data.data.config.configured = True