From 8e4c078b540a56cf4e5d1f0e77eb742b90b1f2f0 Mon Sep 17 00:00:00 2001 From: LKuemmel Date: Thu, 9 Apr 2026 09:26:26 +0200 Subject: [PATCH 1/2] power limit is int, format bat power limit str --- packages/control/bat.py | 2 +- packages/control/bat_all.py | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/control/bat.py b/packages/control/bat.py index 2052de16f7..f0e3b4a1c9 100644 --- a/packages/control/bat.py +++ b/packages/control/bat.py @@ -41,7 +41,7 @@ def get_factory() -> Get: @dataclass class Set: - power_limit: float = field(default=None, metadata={"topic": "set/power_limit"}) + power_limit: int = field(default=None, metadata={"topic": "set/power_limit"}) def set_factory() -> Set: diff --git a/packages/control/bat_all.py b/packages/control/bat_all.py index d05b359d3a..8d2784b8fb 100644 --- a/packages/control/bat_all.py +++ b/packages/control/bat_all.py @@ -279,8 +279,8 @@ def _set_bat_power_active_control(self, power): # setze Entladeleistung als Bruchteil der möglichen Entladeleistung else: factor = min(power / max_discharge_power_total, 1) - power_limit = bat_component_data.get.max_discharge_power * factor - bat_component_data.get.state_str = f"Entladung mit {power_limit}W" + power_limit = int(bat_component_data.get.max_discharge_power * factor) + bat_component_data.get.state_str = f"Entladung mit {round(power_limit / 1000, 3)} kW" log.debug(("Aktive Speichersteuerung: Entladung - " f"Speicher (ID: {bat_component.component_config.id}) " f"entlädt mit {power_limit} ({factor} x " @@ -296,8 +296,8 @@ def _set_bat_power_active_control(self, power): "befindet sich oberhalb maximal SoC - Speicher sperren.")) else: factor = min(power / max_charge_power_total, 1) - power_limit = bat_component_data.get.max_charge_power * factor - bat_component_data.get.state_str = f"Ladung mit {power_limit}W" + power_limit = int(bat_component_data.get.max_charge_power * factor) + bat_component_data.get.state_str = f"Ladung mit {round(power_limit / 1000, 3)} kW" log.debug(("Aktive Speichersteuerung: Ladung - " f"Speicher (ID: {bat_component.component_config.id}) " f"lädt mit {power_limit} ({factor} x {bat_component_data.get.max_charge_power})")) From 4ba219899614b2bf095f42e77dfb440cdd816dc3 Mon Sep 17 00:00:00 2001 From: LKuemmel Date: Thu, 9 Apr 2026 09:40:51 +0200 Subject: [PATCH 2/2] type hint --- packages/control/bat.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/control/bat.py b/packages/control/bat.py index f0e3b4a1c9..f3ae1e7d9f 100644 --- a/packages/control/bat.py +++ b/packages/control/bat.py @@ -1,6 +1,6 @@ from dataclasses import dataclass, field import logging -from typing import List +from typing import List, Optional from dataclass_utils.factories import currents_list_factory from helpermodules.constants import NO_ERROR @@ -41,7 +41,7 @@ def get_factory() -> Get: @dataclass class Set: - power_limit: int = field(default=None, metadata={"topic": "set/power_limit"}) + power_limit: Optional[int] = field(default=None, metadata={"topic": "set/power_limit"}) def set_factory() -> Set: