fixes

openWB · Dec 27, 2024 · ca8b3fa · ca8b3fa
1 parent 4bdf876
commit ca8b3fa
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/packages/control/ev/ev.py b/packages/control/ev/ev.py
@@ -192,10 +192,10 @@ def get_required_current(self,
                 # Info vom Zielladen erhalten
                 message = f"{message or ''} {tmp_message or ''}".strip()
                 if tmp_current > 0:
-                    control_parameter.current_plan = plan_id
                     # Wenn mit einem neuen Plan geladen wird, muss auch die Energiemenge von neuem gezählt werden.
                     if plan_id != control_parameter.current_plan:
                         control_parameter.imported_at_plan_start = imported
+                    control_parameter.current_plan = plan_id
                     required_current = tmp_current
                     submode = tmp_submode
             if (required_current == 0) or (required_current is None):

diff --git a/packages/helpermodules/update_config.py b/packages/helpermodules/update_config.py
@@ -1877,7 +1877,8 @@ def upgrade(topic: str, payload) -> Optional[dict]:
 
     def upgrade_datastore_68(self) -> None:
         def upgrade(topic: str, payload) -> Optional[dict]:
-            if (re.search("openWB/vehicle/template/charge_template/[0-9]+/chargemode/scheduled_charging/plans/[0-9]+", topic) is not None):
+            if (re.search("openWB/vehicle/template/charge_template/[0-9]+/chargemode/scheduled_charging/plans/[0-9]+", topic) is not None or
+                    re.search("openWB/vehicle/template/charge_template/[0-9]+/time_charging/plans/[0-9]+", topic) is not None):
                 payload = decode_payload(payload)
                 payload["id"] = int(get_second_index(topic))
                 return {topic: payload}