draft

Author: LKuemmel

packages/control/chargepoint/chargepoint.py

@@ -30,6 +30,7 @@
 from control.chargepoint.control_parameter import ControlParameter, control_parameter_factory
 from control.chargepoint.charging_type import ChargingType
 from control.chargepoint.rfid import ChargepointRfidMixin
+from control.ev.charge_template import ChargeTemplate
 from control.ev.ev import Ev
 from control import phase_switch
 from control.chargepoint.chargepoint_state import ChargepointState
@@ -240,7 +241,7 @@ def _process_charge_stop(self) -> None:
                     log.debug("/set/manual_lock True")
                 # Ev wurde noch nicht aktualisiert.
                 # Ladeprofil aus den Einstellungen laden.
-                self._update_charge_template(self.data.set.charging_ev_data)
+                self.update_charge_template(self.data.set.charging_ev_data.charge_template)
                 chargelog.save_and_reset_data(self, data.data.ev_data["ev"+str(self.data.set.charging_ev_prev)])
                 self.data.set.charging_ev_prev = -1
                 Pub().pub("openWB/set/chargepoint/"+str(self.num)+"/set/charging_ev_prev",
@@ -654,7 +655,7 @@ def update_ev(self, ev_list: Dict[str, Ev]) -> None:
             vehicle = -1
             self._pub_configured_ev(ev_list)
             if self.data.config.ev != self.data.set.ev_prev:
-                self._update_charge_template(ev_list[f"ev{self.data.config.ev}"])
+                self.update_charge_template(ev_list[f"ev{self.data.config.ev}"].charge_template)
 
     def update(self, ev_list: Dict[str, Ev]) -> None:
         try:
@@ -740,11 +741,11 @@ def update(self, ev_list: Dict[str, Ev]) -> None:
                 if vehicle != -1:
                     self._pub_connected_vehicle(ev_list[f"ev{vehicle}"])
                     if self.data.set.charge_template.data.id != ev_list[f"ev{vehicle}"].charge_template.data.id:
-                        self._update_charge_template(ev_list[f"ev{vehicle}"])
+                        self.update_charge_template(ev_list[f"ev{vehicle}"].charge_template)
                 else:
                     self._pub_configured_ev(ev_list)
                     if self.data.set.charge_template.data.id != ev_list[f"ev{self.data.config.ev}"].charge_template.data.id:
-                        self._update_charge_template(ev_list[f"ev{self.data.config.ev}"])
+                        self.update_charge_template(ev_list[f"ev{self.data.config.ev}"].charge_template)
             # OCPP Start Transaction nach Anstecken
             if ((self.data.get.plug_state and self.data.set.plug_state_prev is False) or
                     (self.data.set.ocpp_transaction_id is None and self.data.get.charge_state)):
@@ -787,17 +788,17 @@ def _get_charging_ev(self, vehicle: int, ev_list: Dict[str, Ev]) -> Ev:
         if self.data.set.charging_ev != vehicle and self.data.set.charging_ev_prev != vehicle:
             Pub().pub(f"openWB/set/vehicle/{charging_ev.num}/get/force_soc_update", True)
             log.debug("SoC nach EV-Wechsel")
-            self._update_charge_template(charging_ev)
+            self.update_charge_template(charging_ev.charge_template)
         if self.data.set.charge_template.data.id != charging_ev.charge_template.data.id:
-            self._update_charge_template(charging_ev)
+            self.update_charge_template(charging_ev)
         self.data.set.charging_ev_data = charging_ev
         self.data.set.charging_ev = vehicle
         Pub().pub("openWB/set/chargepoint/"+str(self.num)+"/set/charging_ev", vehicle)
         self.data.set.charging_ev_prev = vehicle
         Pub().pub("openWB/set/chargepoint/"+str(self.num)+"/set/charging_ev_prev", vehicle)
         return charging_ev
 
-    def _update_charge_template(self, charging_ev_data: Ev) -> None:
+    def update_charge_template(self, charge_template: ChargeTemplate) -> None:
         # evtl noch vorhandene, aber in den Einstellungen gelöschte Pläne entfernen
         def on_connect(client, userdata, flags, rc):
             client.subscribe(f'openWB/chargepoint/{self.num}/set/charge_template/#', 2)
@@ -808,7 +809,7 @@ def __get_payload(client, userdata, msg):
         InternalBrokerClient("processBrokerBranch", on_connect, __get_payload).start_finite_loop()
         for topic in received_topics:
             Pub().pub(topic, "")
-        self.data.set.charge_template = copy.deepcopy(charging_ev_data.charge_template)
+        self.data.set.charge_template = copy.deepcopy(charge_template)
         pub_template = copy.deepcopy(self.data.set.charge_template.data)
         pub_template = dataclasses.asdict(pub_template)
         pub_template["chargemode"]["scheduled_charging"]["plans"].clear()

packages/helpermodules/subdata.py

@@ -301,6 +301,16 @@ def process_vehicle_topic(self, client: mqtt.Client, var: Dict[str, ev.Ev], msg:
                         self.event_soc.set()
                     else:
                         self.set_json_payload_class(var["ev"+index].data, msg)
+                        if re.search("/vehicle/[0-9]+/charge_template$", msg.topic) is not None:
+                            if var["ev"+index].data.charge_template.data.id != decode_payload(msg.payload)["id"]:
+                                ev_id = get_index(msg.topic)
+                                for cp in self.cp_data.values():
+                                    if ((cp.chargepoint.data.set.charging_ev != -1 and
+                                         cp.chargepoint.data.set.charging_ev == ev_id) or
+                                            cp.chargepoint.data.config.ev == ev_id):
+                                        cp.update_charge_template(dataclass_from_dict(
+                                            ChargeTemplateData, decode_payload(msg.payload)))
+
         except Exception:
             log.exception("Fehler im subdata-Modul")