Merge Master into Beta

packages/control/bat.py

@@ -29,7 +29,7 @@ def get_factory() -> Get:
 
 @dataclass
 class Set:
-    power_limit: float = field(default=0, metadata={"topic": "set/power_limit"})
+    power_limit: float = field(default=None, metadata={"topic": "set/power_limit"})
 
 
 def set_factory() -> Set:

packages/control/bat_all.py

@@ -294,7 +294,7 @@ def get_power_limit(self):
             return
         chargepoint_by_chargemodes = get_chargepoints_by_chargemodes(CONSIDERED_CHARGE_MODES_CHARGING)
         # Falls aktive Steuerung an und Fahrzeuge laden und kein Überschuss im System ist,
-        # dann Speichereistung begrenzen.
+        # dann Speicherleistung begrenzen.
         if (self.data.config.power_limit_mode != BatPowerLimitMode.NO_LIMIT.value and
             len(chargepoint_by_chargemodes) > 0 and
                 data.data.cp_all_data.data.get.power > 100 and
@@ -315,7 +315,7 @@ def get_power_limit(self):
                 log.debug("Speicher-Leistung nicht begrenzen, "
                           "da keine Ladepunkte in einem Lademodus mit Netzbezug sind.")
             elif data.data.cp_all_data.data.get.power <= 100:
-                log.debug("Speicher-Leistung nicht begrenzen, da kein Ladepunkt mit Netzubezug lädt.")
+                log.debug("Speicher-Leistung nicht begrenzen, da kein Ladepunkt mit Netzbezug lädt.")
             elif self.data.get.power_limit_controllable is False:
                 log.debug("Speicher-Leistung nicht begrenzen, da keine regelbaren Speicher vorhanden sind.")
             elif self.data.get.power > 0:

packages/control/chargepoint/chargepoint.py

@@ -20,6 +20,7 @@
 from threading import Thread, Event
 import traceback
 from typing import Dict, Optional, Tuple
+from fnmatch import fnmatch
 
 from control.algorithm.utils import get_medium_charging_current
 from control.chargelog import chargelog
@@ -154,11 +155,18 @@ def _is_autolock_inactive(self) -> Tuple[bool, Optional[str]]:
     def _is_manual_lock_inactive(self) -> Tuple[bool, Optional[str]]:
         # Die Pro schickt je nach Timing auch nach Abstecken noch ein paar Zyklen den Tag. Dann darf der Ladepunkt
         # nicht wieder entsperrt werden.
-        if (self.data.get.rfid or
-            self.data.get.vehicle_id or
-                self.data.set.rfid) in self.template.data.valid_tags:
-            Pub().pub(f"openWB/set/chargepoint/{self.num}/set/manual_lock", False)
-        elif self.template.data.disable_after_unplug and self.data.get.plug_state is False:
+
+        # Prüfung auf ein passendes Muster
+        # Vergleiche werden case-insensitive durchgeführt
+        # das vereinfacht die Eingabe, kann aber auch für falsche Treffer sorgen.
+        # 'fnmatch()' ist case-insensitive
+        for tag_id in self.template.data.valid_tags:
+            if ((self.data.get.rfid is not None and fnmatch(self.data.get.rfid, tag_id)) or
+                    (self.data.get.vehicle_id is not None and fnmatch(self.data.get.vehicle_id, tag_id)) or
+                    (self.data.set.rfid is not None and fnmatch(self.data.set.rfid, tag_id))):
+                Pub().pub(f"openWB/set/chargepoint/{self.num}/set/manual_lock", False)
+        # Wenn der Ladepunkt nach dem Abstecken gesperrt werden soll, und kein Fahrzeug angeschlossen ist wird gesperrt
+        if self.template.data.disable_after_unplug and self.data.get.plug_state is False:
             Pub().pub(f"openWB/set/chargepoint/{self.num}/set/manual_lock", True)
 
         if self.data.set.manual_lock:
@@ -561,6 +569,7 @@ def hw_bidi_capable(self) -> BidiState:
 
     def set_phases(self, phases: int) -> int:
         charging_ev = self.data.set.charging_ev_data
+        phases = min(phases, self.get_max_phase_hw())
 
         if phases != self.data.get.phases_in_use:
             # Wenn noch kein Eintrag im Protokoll erstellt wurde, wurde noch nicht geladen und die Phase kann noch

packages/control/ev/ev.py

@@ -354,7 +354,10 @@ def auto_phase_switch(self,
                                                           delay)[1])
                     control_parameter.state = ChargepointState.PHASE_SWITCH_DELAY
                 elif condition_msg:
-                    log.debug(f"Keine Phasenumschaltung{condition_msg}")
+                    if condition_msg == self.CURRENT_OUT_OF_NOMINAL_DIFFERENCE:
+                        message = f"Keine Phasenumschaltung{condition_msg}"
+                    else:
+                        log.debug(f"Keine Phasenumschaltung{condition_msg}")
             else:
                 if condition:
                     # Timer laufen lassen

packages/helpermodules/command.py

@@ -81,20 +81,15 @@ def _get_max_ids(self) -> None:
                 max_id = default
                 for topic, payload in received_topics.items():
                     if re.search(topic_str, topic) is not None:
-                        try:
-                            if id_topic == "autolock_plan":
-                                for plan in payload["autolock"]["plans"]:
-                                    max_id = max(plan["id"], max_id)
-                            elif id_topic == "charge_template_scheduled_plan":
-                                for plan in payload["chargemode"]["scheduled_charging"]["plans"]:
-                                    max_id = max(plan["id"], max_id)
-                            elif id_topic == "charge_template_time_charging_plan":
-                                for plan in payload["time_charging"]["plans"]:
-                                    max_id = max(plan["id"], max_id)
-                        except KeyError:
-                            # überspringe Profile, die keinen Eintrag für Pläne haben.
-                            # Da gab es einen Bug beim Kopieren.
-                            pass
+                        if id_topic == "autolock_plan":
+                            for plan in payload["autolock"]["plans"]:
+                                max_id = max(plan["id"], max_id)
+                        elif id_topic == "charge_template_scheduled_plan":
+                            for plan in payload["chargemode"]["scheduled_charging"]["plans"]:
+                                max_id = max(plan["id"], max_id)
+                        elif id_topic == "charge_template_time_charging_plan":
+                            for plan in payload["time_charging"]["plans"]:
+                                max_id = max(plan["id"], max_id)
                 setattr(self, f'max_id_{id_topic}', max_id)
                 Pub().pub("openWB/set/command/max_id/"+id_topic, max_id)
             for id_topic, topic_str, default in self.MAX_IDS["topic"]:
@@ -261,15 +256,7 @@ def setup_added_chargepoint():
             Pub().pub(f'openWB/chargepoint/{new_id}/set/manual_lock', False)
             {Pub().pub(f"openWB/chargepoint/{new_id}/get/"+k, v) for (k, v) in asdict(chargepoint.Get()).items()}
             charge_template = SubData.ev_charge_template_data[f"ct{SubData.ev_data['ev0'].data.charge_template}"]
-            for time_plan in charge_template.data.time_charging.plans:
-                Pub().pub(f'openWB/chargepoint/{new_id}/set/charge_template/time_charging/plans',
-                          dataclass_utils.asdict(time_plan))
-            for scheduled_plan in charge_template.data.chargemode.scheduled_charging.plans:
-                Pub().pub(f'openWB/chargepoint/{new_id}/set/charge_template/chargemode/scheduled_charging/plans',
-                          scheduled_plan)
             charge_template = dataclass_utils.asdict(charge_template.data)
-            charge_template["chargemode"]["scheduled_charging"]["plans"].clear()
-            charge_template["time_charging"]["plans"].clear()
             Pub().pub(f'openWB/chargepoint/{new_id}/set/charge_template', charge_template)
             self.max_id_hierarchy = self.max_id_hierarchy + 1
             Pub().pub("openWB/set/command/max_id/hierarchy", self.max_id_hierarchy)
@@ -352,7 +339,7 @@ def removeChargepoint(self, connection_id: str, payload: dict) -> None:
         """ löscht ein Ladepunkt.
         """
         if self.max_id_hierarchy < payload["data"]["id"]:
-            log.error(
+            pub_user_message(
                 payload, connection_id,
                 f'Die ID \'{payload["data"]["id"]}\' ist größer als die maximal vergebene '
                 f'ID \'{self.max_id_hierarchy}\'.', MessageType.ERROR)
@@ -379,7 +366,7 @@ def addChargepointTemplate(self, connection_id: str, payload: dict) -> None:
                   self.max_id_chargepoint_template)
         # if copying a template, copy autolock plans
         if "data" in payload and "copy" in payload["data"]:
-            for _, plan in data.data.cp_template_data[f'cpt{payload["data"]["copy"]}'].data.autolock.plans.items():
+            for plan in data.data.cp_template_data[f'cpt{payload["data"]["copy"]}'].data.autolock.plans:
                 new_plan = asdict(plan).copy()
                 new_plan["id"] = self.max_id_autolock_plan + 1
                 Pub().pub(f'openWB/set/chargepoint/template/{new_id}/autolock/{new_plan["id"]}', new_plan)

packages/helpermodules/create_debug.py

@@ -173,7 +173,7 @@ def config_and_state():
                                                     "--| Counter_Max_Currents: "
                                                     f"{component_data.data.config.max_currents}\n")
                                 else:
-                                    parsed_data += ("--| Counter_Type: Sonstiger Zähler\nCOUNTER_MAX_CURRENTS: "
+                                    parsed_data += ("--| Counter_Type: Sonstiger Zähler\n--| Counter_Max_Currents: "
                                                     f"{component_data.data.config.max_currents}\n")
                                 parsed_data += (f"--| Counter_Power: {component_data.data.get.power/1000}kW\n"
                                                 f"--| Counter_Currents: {component_data.data.get.currents}A\n"

packages/helpermodules/logger.py

@@ -334,12 +334,15 @@ def mb_to_bytes(megabytes: int) -> int:
     logging.getLogger("uModbus").setLevel(logging.WARNING)
     logging.getLogger("websockets").setLevel(logging.WARNING)
 
-    thread_errors_path = Path(Path(__file__).resolve().parents[2]/"ramdisk"/"thread_errors.log")
+    thread_errors_path = Path(RAMDISK_PATH+"thread_errors.log")
     with thread_errors_path.open("w") as f:
         f.write("")
 
     def threading_excepthook(args):
-        with open(RAMDISK_PATH+"thread_errors.log", "a") as f:
+        if thread_errors_path.exists() and thread_errors_path.stat().st_size > 10_000:
+            with thread_errors_path.open("w") as f:
+                f.write("")
+        with open(thread_errors_path, "a") as f:
             f.write("Uncaught exception in thread:\n")
             f.write(f"Type: {args.exc_type}\n")
             f.write(f"Value: {args.exc_value}\n")
@@ -348,7 +351,10 @@ def threading_excepthook(args):
     threading.excepthook = threading_excepthook
 
     def handle_unhandled_exception(exc_type, exc_value, exc_traceback):
-        with open(RAMDISK_PATH+"thread_errors.log", "a") as f:
+        if thread_errors_path.exists() and thread_errors_path.stat().st_size > 10_000:
+            with thread_errors_path.open("w") as f:
+                f.write("")
+        with open(thread_errors_path, "a") as f:
             f.write("Uncaught exception:\n")
             f.write(f"Type: {exc_type}\n")
             f.write(f"Value: {exc_value}\n")

packages/helpermodules/setdata.py

@@ -549,7 +549,8 @@ def process_chargepoint_get_topics(self, msg):
             self._validate_value(msg, int, [(0, 2)])
         elif ("/get/evse_current" in msg.topic or
               "/get/max_evse_current" in msg.topic):
-            self._validate_value(msg, float, [(float("-inf"), 0), (0, 0), (6, 32), (600, 3200)])
+            # AC-EVSE: 0, 6-32, 600-3200, DC-EVSE 0-500
+            self._validate_value(msg, float, [(0, 3200)])
         elif ("/get/version" in msg.topic or
               "/get/current_branch" in msg.topic or
               "/get/current_commit" in msg.topic):
@@ -717,7 +718,7 @@ def process_general_topic(self, msg: mqtt.MQTTMessage):
             elif "openWB/set/general/chargemode_config/pv_charging/switch_off_threshold" in msg.topic:
                 self._validate_value(msg, float)
             elif "openWB/set/general/chargemode_config/phase_switch_delay" in msg.topic:
-                self._validate_value(msg, int, [(5, 20)])
+                self._validate_value(msg, int, [(5, 60)])
             elif "openWB/set/general/chargemode_config/pv_charging/control_range" in msg.topic:
                 self._validate_value(msg, int, collection=list)
             elif "openWB/set/general/chargemode_config/pv_charging/min_bat_soc" in msg.topic:

packages/helpermodules/subdata.py

@@ -440,6 +440,9 @@ def process_chargepoint_topic(self, var: Dict[str, chargepoint.Chargepoint], msg
                             if var["cp"+index].chargepoint.data.set.charging_ev > -1:
                                 Pub().pub(f'openWB/set/vehicle/{var["cp"+index].chargepoint.data.set.charging_ev}'
                                           '/get/force_soc_update', True)
+                            elif var["cp"+index].chargepoint.data.set.charging_ev_prev > -1:
+                                Pub().pub(f'openWB/set/vehicle/{var["cp"+index].chargepoint.data.set.charging_ev_prev}'
+                                          '/get/force_soc_update', True)
                             self.set_json_payload_class(var["cp"+index].chargepoint.data.get, msg)
                         elif (re.search("/chargepoint/[0-9]+/get/error_timestamp$", msg.topic) is not None and
                               hasattr(var[f"cp{index}"].chargepoint.chargepoint_module, "client_error_context")):

packages/helpermodules/update_config.py

@@ -57,7 +57,7 @@
 
 class UpdateConfig:
 
-    DATASTORE_VERSION = 93
+    DATASTORE_VERSION = 94
 
     valid_topic = [
         "^openWB/bat/config/bat_control_permitted$",
@@ -2425,3 +2425,93 @@ def upgrade(topic: str, payload) -> Optional[dict]:
                 return {topic: payload}
         self._loop_all_received_topics(upgrade)
         self.__update_topic("openWB/system/datastore_version", 93)
+
+    def upgrade_datastore_93(self) -> None:
+        # Pläne die keinen plans Key haben, id=None
+        max_id = -1
+        none_id = False
+        for topic, payload in self.all_received_topics.items():
+            if re.search("openWB/vehicle/template/charge_template/[0-9]+$", topic) is not None:
+                payload = decode_payload(payload)
+                try:
+                    for plan in payload["chargemode"]["scheduled_charging"]["plans"]:
+                        try:
+                            max_id = max(plan["id"], max_id)
+                        except TypeError:
+                            if plan["id"] is None:
+                                none_id = True
+                            else:
+                                raise TypeError(f"Plan {plan} hat keinen Key 'id' und ist kein NoneType.")
+                except KeyError:
+                    payload["chargemode"]["scheduled_charging"].update({"plans": []})
+                    self.all_received_topics[topic] = json.dumps(payload, ensure_ascii=False).encode("utf-8")
+                    Pub().pub(f"openWB/set/vehicle/template/charge_template/{get_index(topic)}", payload)
+        if none_id:
+            for topic, payload in self.all_received_topics.items():
+                if re.search("openWB/vehicle/template/charge_template/[0-9]+$", topic) is not None:
+                    payload = decode_payload(payload)
+                    for plan in payload["chargemode"]["scheduled_charging"]["plans"]:
+                        if plan["id"] is None:
+                            plan["id"] = max_id + 1
+                            max_id += 1
+                    self.all_received_topics[topic] = json.dumps(payload, ensure_ascii=False).encode("utf-8")
+                    Pub().pub(f"openWB/set/vehicle/template/charge_template/{get_index(topic)}", payload)
+
+        max_id = -1
+        none_id = False
+        for topic, payload in self.all_received_topics.items():
+            if re.search("openWB/vehicle/template/charge_template/[0-9]+$", topic) is not None:
+                payload = decode_payload(payload)
+                try:
+                    for plan in payload["time_charging"]["plans"]:
+                        try:
+                            max_id = max(plan["id"], max_id)
+                        except TypeError:
+                            if plan["id"] is None:
+                                none_id = True
+                            else:
+                                raise TypeError(f"Plan {plan} hat keinen Key 'id' und ist kein NoneType.")
+                except KeyError:
+                    payload["time_charging"].update({"plans": []})
+                    self.all_received_topics[topic] = json.dumps(payload, ensure_ascii=False).encode("utf-8")
+                    Pub().pub(f"openWB/set/vehicle/template/charge_template/{get_index(topic)}", payload)
+        if none_id:
+            for topic, payload in self.all_received_topics.items():
+                if re.search("openWB/vehicle/template/charge_template/[0-9]+$", topic) is not None:
+                    payload = decode_payload(payload)
+                    for plan in payload["time_charging"]["plans"]:
+                        if plan["id"] is None:
+                            plan["id"] = max_id + 1
+                            max_id += 1
+                    self.all_received_topics[topic] = json.dumps(payload, ensure_ascii=False).encode("utf-8")
+                    Pub().pub(f"openWB/set/vehicle/template/charge_template/{get_index(topic)}", payload)
+
+        max_id = -1
+        none_id = False
+        for topic, payload in self.all_received_topics.items():
+            if re.search("openWB/chargepoint/template/[0-9]+$", topic) is not None:
+                payload = decode_payload(payload)
+                try:
+                    for plan in payload["autolock"]["plans"]:
+                        try:
+                            max_id = max(plan["id"], max_id)
+                        except TypeError:
+                            if plan["id"] is None:
+                                none_id = True
+                            else:
+                                raise TypeError(f"Plan {plan} hat keinen Key 'id' und ist kein NoneType.")
+                except KeyError:
+                    payload["autolock"].update({"plans": []})
+                    self.all_received_topics[topic] = json.dumps(payload, ensure_ascii=False).encode("utf-8")
+                    Pub().pub(f"openWB/set/chargepoint/template/{get_index(topic)}", payload)
+        if none_id:
+            for topic, payload in self.all_received_topics.items():
+                if re.search("openWB/chargepoint/template/[0-9]+$", topic) is not None:
+                    payload = decode_payload(payload)
+                    for plan in payload["autolock"]["plans"]:
+                        if plan["id"] is None:
+                            plan["id"] = max_id + 1
+                            max_id += 1
+                    self.all_received_topics[topic] = json.dumps(payload, ensure_ascii=False).encode("utf-8")
+                    Pub().pub(f"openWB/set/chargepoint/template/{get_index(topic)}", payload)
+        self.__update_topic("openWB/system/datastore_version", 94)