Skip to content
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

Jump to bottom

fix: Exception when plan_data is None #1496

Closed
wants to merge 5 commits into from
Closed

fix: Exception when plan_data is None #1496

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
132e4ab
fix: Exception when plan_data is None
tpd-opitz Feb 29, 2024
c13f595
split long line to chill flake
tpd-opitz Feb 29, 2024
048310e
fix: bring back variable 'name'
tpd-opitz Feb 29, 2024
401116e
fix: remove trailing whitespace
tpd-opitz Feb 29, 2024
738ec1e
fix: variable access before declaration
tpd-opitz Mar 2, 2024
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
18 changes: 9 additions & 9 deletions packages/control/ev.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,30 +260,30 @@ def get_required_current(self,
used_amount,
max_phases_hw,
phase_switch_supported)
soc_request_intervall_offset = 0
if plan_data:
name = self.charge_template.data.chargemode.scheduled_charging.plans[plan_data.num].name
# Wenn mit einem neuen Plan geladen wird, muss auch die Energiemenge von neuem gezählt werden.
if (self.charge_template.data.chargemode.scheduled_charging.plans[plan_data.num].limit.
selected == "amount" and
name != control_parameter.current_plan):
control_parameter.imported_at_plan_start = imported
# Wenn der SoC ein paar Minuten alt ist, kann der Termin trotzdem gehalten werden.
# Zielladen kannn nicht genauer arbeiten, als das Abfrageintervall vom SoC.
if (self.soc_module and
self.charge_template.data.chargemode.
scheduled_charging.plans[plan_data.num].limit.selected == "soc"):
soc_request_intervall_offset = self.soc_module.general_config.request_interval_charging
control_parameter.current_plan = name
else:
name = None
# Wenn der SoC ein paar Minuten alt ist, kann der Termin trotzdem gehalten werden.
# Zielladen kannn nicht genauer arbeiten, als das Abfrageintervall vom SoC.
if (self.soc_module and self.charge_template.data.chargemode.scheduled_charging.plans[plan_data.num].
limit.selected == "soc"):
soc_request_intervall_offset = self.soc_module.general_config.request_interval_charging
else:
soc_request_intervall_offset = 0
control_parameter.current_plan = None
required_current, submode, message, phases = self.charge_template.scheduled_charging_calc_current(
plan_data,
self.data.get.soc,
used_amount,
control_parameter.phases,
self.ev_template.data.min_current,
soc_request_intervall_offset)
control_parameter.current_plan = name

# Wenn Zielladen auf Überschuss wartet, prüfen, ob Zeitladen aktiv ist.
if (submode != "instant_charging" and
Expand Down