Skip to content

Feature: local_power pro counter #4120

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
LKuemmel merged 2 commits into from
Oct 16, 2026
Merged

Feature: local_power pro counter #4120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
98afaec
add Topic local_power pro counter
AlexanderHa98 Oct 15, 2026
23fd17f
Add fault_state-handling
AlexanderHa98 Oct 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/control/counter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ class Get:
fault_state: int = field(default=0, metadata={"topic": "get/fault_state"})
fault_str: str = field(default=NO_ERROR, metadata={"topic": "get/fault_str"})
power: float = field(default=0, metadata={"topic": "get/power"})
local_power: float = field(default=0, metadata={"topic": "get/local_power"})
serial_number: Optional[str] = field(default=None, metadata={"topic": "get/serial_number"})


Expand Down
7 changes: 6 additions & 1 deletion packages/control/counter_all/counter_all.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@ def _calc_home_consumption_from_counter(
home_consumption = 0.0
not_home_consumption = 0.0
local_power = self._get_local_power_from_counter(element)
data.data.counter_data[f"counter{element['id']}"].data.get.local_power = local_power

counter = self._get_component(element)
child_home_consumption = self._get_is_home_consumption(counter, parent_home_consumption)
Expand Down Expand Up @@ -163,8 +164,12 @@ def _calc_home_consumption_from_counter(
elif mode == CounterMode.NOT_HOME_CONSUMPTION.value:
not_home_consumption += comp.data.get.power
else:
if child["type"] == ComponentType.COUNTER.value:
# Bei einem fehlerhaften untergeordneten Zähler wird local_power auf 0 gesetzt,
# da der Zähler bei der Hausverbrauchsberechnung nicht berücksichtigt wird.
data.data.counter_data[f"counter{child['id']}"].data.get.local_power = 0
log.warning(
f"Komponente {element['type']}{comp.num} ist im Fehlerzustand und wird nicht berücksichtigt.")
f"Komponente {child['type']}{comp.num} ist im Fehlerzustand und wird nicht berücksichtigt.")

return home_consumption, not_home_consumption

Expand Down
3 changes: 2 additions & 1 deletion packages/helpermodules/setdata.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1002,7 +1002,8 @@ def process_counter_topic(self, msg: mqtt.MQTTMessage):
elif ("/get/fault_str" in msg.topic or
"/get/serial_number" in msg.topic):
self._validate_value(msg, str)
elif "/get/power" in msg.topic:
elif ("/get/power" in msg.topic or
"/get/local_power" in msg.topic):
self._validate_value(
msg, float, [(float("-inf"), float("inf"))])
elif "/get/soc" in msg.topic:
Expand Down
1 change: 1 addition & 0 deletions packages/helpermodules/update_config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,6 +259,7 @@ class UpdateConfig:
"^openWB/counter/set/daily_yield_home_consumption$",
"^openWB/counter/set/simulation$",
"^openWB/counter/[0-9]+/get/voltages$",
"^openWB/counter/[0-9]+/get/local_power$",
"^openWB/counter/[0-9]+/get/power$",
"^openWB/counter/[0-9]+/get/currents$",
"^openWB/counter/[0-9]+/get/powers$",
Expand Down
Loading