Skip to content

Commit 80279b4

Browse files
committed
fix temporary charge template: change vehicle (openWB#2869)
1 parent f8c6148 commit 80279b4

1 file changed

Lines changed: 6 additions & 5 deletions

File tree

packages/control/chargepoint/chargepoint.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,9 @@ def _process_charge_stop(self) -> None:
234234
log.debug("/set/manual_lock True")
235235
# Ev wurde noch nicht aktualisiert.
236236
# Ladeprofil aus den Einstellungen laden.
237-
self.update_charge_template(data.data.ev_data["ev"+str(self.data.set.charging_ev_prev)].charge_template)
237+
if data.data.general_data.data.temporary_charge_templates_active:
238+
self.update_charge_template(
239+
data.data.ev_data["ev"+str(self.data.set.charging_ev_prev)].charge_template)
238240
chargelog.save_and_reset_data(self, data.data.ev_data["ev"+str(self.data.set.charging_ev_prev)])
239241
self.data.set.charging_ev_prev = -1
240242
Pub().pub("openWB/set/chargepoint/"+str(self.num)+"/set/charging_ev_prev",
@@ -843,10 +845,9 @@ def _get_charging_ev(self, vehicle: int, ev_list: Dict[str, Ev]) -> Ev:
843845
return charging_ev
844846

845847
def update_charge_template(self, charge_template: ChargeTemplate) -> None:
846-
if data.data.general_data.data.temporary_charge_templates_active:
847-
# Prüfen, ob ein temporäres Ladeprofil aktiv ist und dieses übernehmen
848-
Pub().pub(f"openWB/set/chargepoint/{self.num}/set/charge_template",
849-
dataclasses.asdict(charge_template.data))
848+
# Prüfen, ob ein temporäres Ladeprofil aktiv ist und dieses übernehmen
849+
Pub().pub(f"openWB/set/chargepoint/{self.num}/set/charge_template",
850+
dataclasses.asdict(charge_template.data))
850851

851852
def _pub_connected_vehicle(self, vehicle: Ev):
852853
""" published die Daten, die zur Anzeige auf der Hauptseite benötigt werden.

0 commit comments

Comments
 (0)