Skip to content

Improve PeakFilter #3380

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 5 commits into from
May 22, 2026
+10 −7
Merged

Improve PeakFilter #3380

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1749ab7
check for NoneType
ndrsnhs May 21, 2026
d2ccbac
remove warning
ndrsnhs May 21, 2026
da82de2
remove whitespace
ndrsnhs May 21, 2026
042b634
check exported value
ndrsnhs May 21, 2026
1eb5287
add log output
ndrsnhs May 22, 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
14 changes: 10 additions & 4 deletions packages/modules/common/store/_inverter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,11 @@ def __init__(self, component_num: int) -> None:

def set(self, inverter_state: InverterState):
self.__pv.power.write(int(inverter_state.power))
self.__pv.energy.write(inverter_state.exported)
self.__pv.energy_k.write(inverter_state.exported / 1000)
if inverter_state.exported is not None:
self.__pv.energy.write(inverter_state.exported)
self.__pv.energy_k.write(inverter_state.exported / 1000)
else:
log.debug("Kein gültiger Zählerstand. Wert wird nicht aktualisiert.")
if inverter_state.currents:
self.__pv.currents.write(inverter_state.currents)

Expand Down Expand Up @@ -69,8 +72,11 @@ def fix_hybrid_values(self, state: InverterState) -> InverterState:
for bat in hybrid:
bat_get = data.data.bat_data[bat].data.get
power -= bat_get.power

exported += bat_get.imported - bat_get.exported - imported
if (bat_get.imported is not None and bat_get.exported is not None and
imported is not None and exported is not None):
exported += bat_get.imported - bat_get.exported - imported
else:
exported = None
Comment on lines +75 to +79
Comment on lines +75 to +79
Comment on lines +75 to +79
Comment on lines +78 to +79

if state.dc_power is not None:
# Manche Systeme werden auch aus dem Netz geladen, um einen Mindest-SoC zu halten.
Expand Down
3 changes: 0 additions & 3 deletions packages/modules/common/utils/peak_filter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,9 +82,6 @@ def check_total_energy(
log.debug(f"PeakFilter: Unplausibler Zählerwert: {total_energy / 1000}kWh. "
f"Differenz zum vorherigen Wert: {total_energy - previous_total_energy}Wh. "
f"erlaubte Differenz: {round(allowed_deviation, 2)}Wh.")
self.fault_state.warning(f"Peakfilter: {total_energy / 1000}kWh. "
"Die Energie erscheint höher, als laut Anlagenkonfiguration plausibel "
"ist. Erneute Prüfung im nächsten Regelintervall.")
else:
log.debug(f"PeakFilter: Zählerwert: {total_energy}Wh innerhalb der zulässigen Grenzen. "
f"Differenz zum vorherigen Wert: {total_energy - previous_total_energy}Wh.")
Expand Down
Loading