Skip to content

scheduled charging: fix month change #2497

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
Jun 30, 2025
Merged

scheduled charging: fix month change #2497

Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions packages/control/ev/charge_template.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ def pv_charging(self,
message = self.PV_CHARGING_MIN_CURRENT_CHARGING
return current, sub_mode, message, phases
except Exception:
log.exception("Fehler im ev-Modul "+str(self.ct_num))
log.exception("Fehler im ev-Modul "+str(self.data.id))
return 0, "stop", "Keine Ladung, da ein interner Fehler aufgetreten ist: "+traceback.format_exc(), 1

def eco_charging(self,
Expand Down Expand Up @@ -337,7 +337,7 @@ def scheduled_charging_recent_plan(self,
log.debug(f"Verbleibende Zeit bis zum Zieltermin [s]: {plans_diff_end_date}, "
f"Plan erfüllt: {plan_fulfilled}")
except Exception:
log.exception("Fehler im ev-Modul "+str(self.ct_num))
log.exception("Fehler im ev-Modul "+str(self.data.id))
if plans_diff_end_date:
# ermittle den Key vom kleinsten value in plans_diff_end_date
filtered_plans = [d for d in plans_diff_end_date if list(d.values())[0] is not None]
Expand Down
7 changes: 4 additions & 3 deletions packages/helpermodules/timecheck.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,11 +145,12 @@ def missed_date_still_active(remaining_time: float) -> bool:
elif plan.frequency.selected == "weekly":
if not any(plan.frequency.weekly):
raise ValueError("Es muss mindestens ein Tag ausgewählt werden.")
end = end.replace(now.year, now.month, now.day + _get_next_charging_day(plan.frequency.weekly, now.weekday()))
end = end.replace(now.year, now.month, now.day)
end += datetime.timedelta(days=_get_next_charging_day(plan.frequency.weekly, now.weekday()))
remaining_time = end - now
if missed_date_still_active(remaining_time):
end = end.replace(now.year, now.month, now.day +
_get_next_charging_day(plan.frequency.weekly, now.weekday()+1)+1)
end = end.replace(now.year, now.month, now.day)
end += datetime.timedelta(days=_get_next_charging_day(plan.frequency.weekly, now.weekday()+1)+1)
remaining_time = end - now
else:
raise TypeError(f'Unbekannte Häufigkeit {plan.frequency.selected}')
Expand Down