Skip to content

fix quarter hourly tariff prices: fix chargecosts #2920

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 1 commit into from
Nov 10, 2025
Merged

fix quarter hourly tariff prices: fix chargecosts #2920

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
64 changes: 1 addition & 63 deletions packages/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,73 +187,11 @@ def handler5MinAlgorithm(self):
data.data.general_data.grid_protection()
data.data.optional_data.ocpp_transfer_meter_values()
data.data.counter_all_data.validate_hierarchy()
except Exception:
log.exception("Fehler im Main-Modul")

@__with_handler_lock(error_threshold=60)
def handler5Min(self):
""" Handler, der alle 5 Minuten aufgerufen wird und die Heartbeats der Threads überprüft und die Aufgaben
ausführt, die nur alle 5 Minuten ausgeführt werden müssen.
"""
try:
log.debug("5 Minuten Handler ausführen.")
if not sub.heartbeat:
log.error("Heartbeat für Subdata nicht zurückgesetzt.")
sub.disconnect()
thread_handler(Thread(target=sub.sub_topics, args=(), name="Subdata"))
else:
sub.heartbeat = False

if not set.heartbeat:
log.error("Heartbeat für Setdata nicht zurückgesetzt.")
set.disconnect()
thread_handler(Thread(target=set.set_data, args=(), name="Setdata"))
else:
set.heartbeat = False

if sub.internal_chargepoint_data["global_data"].configured:
if not general_internal_chargepoint_handler.internal_chargepoint_handler.heartbeat:
log.error("Heartbeat für Internen Ladepunkt nicht zurückgesetzt.")
general_internal_chargepoint_handler.event_stop.set()
general_internal_chargepoint_handler.event_start.set()
else:
general_internal_chargepoint_handler.internal_chargepoint_handler.heartbeat = False
with ChangedValuesContext(loadvars_.event_module_update_completed):
sub.system_data["system"].update_ip_address()

# In-Memory Log-Handler zurücksetzen
logger.clear_in_memory_log_handler("main")

log.info("# ***Start*** ")
# log.debug(run_command.run_shell_command("top -b -n 1 | head -n 20"))
# log.debug(f'Drosselung: {run_command.run_shell_command("if which vcgencmd >/dev/null; then vcgencmd get_throttled; else echo not found; fi")}')
Pub().pub("openWB/set/system/time", timecheck.create_timestamp())
if not self.__acquire_lock("handler10Sec", error_threshold=30):
return
try:
logger.write_logs_to_file("main")
finally:
self.__release_lock("handler10Sec")
except Exception:
log.exception("Fehler im Main-Modul")

@__with_handler_lock(error_threshold=60)
def handler5MinAlgorithm(self):
""" Handler, der alle 5 Minuten aufgerufen wird und die Heartbeats der Threads überprüft und die Aufgaben
ausführt, die nur alle 5 Minuten ausgeführt werden müssen.
"""
try:
with ChangedValuesContext(loadvars_.event_module_update_completed):
totals = save_log(LogType.DAILY)
update_daily_yields(totals)
update_pv_monthly_yearly_yields()
data.data.general_data.grid_protection()
data.data.optional_data.ocpp_transfer_meter_values()
data.data.counter_all_data.validate_hierarchy()
data.data.optional_data.et_get_prices()
except Exception:
log.exception("Fehler im Main-Modul")


@__with_handler_lock(error_threshold=60)
def handler5Min(self):
""" Handler, der alle 5 Minuten aufgerufen wird und die Heartbeats der Threads überprüft und die Aufgaben
Expand Down