typo, json config

packages/control/ocpp_test.py

@@ -67,11 +67,11 @@ def test_send_ocpp_data(mock_data, monkeypatch):
     send_heart_beat_mock = Mock()
     monkeypatch.setattr(data.data.optional_data, "send_heart_beat", send_heart_beat_mock)
 
-    data.data.optional_data.ocpp_boot_notification_send = False
+    data.data.optional_data.ocpp_boot_notification_sent = False
 
     data.data.optional_data._transfer_meter_values()
 
     boot_notification_mock.call_args == (("cp1", "mqtt", "123456"),)
     send_heart_beat_mock.call_args == (("cp1",),)
     transfer_values_mock.call_args == (("cp1", 1, 0),)
-    assert data.data.optional_data.ocpp_boot_notification_send is True
+    assert data.data.optional_data.ocpp_boot_notification_sent is True

packages/control/optional.py

@@ -25,7 +25,7 @@ def __init__(self):
             self.et_module: ConfigurableElectricityTariff = None
             self.data.dc_charging = hardware_configuration.get_hardware_configuration_setting("dc_charging")
             Pub().pub("openWB/optional/dc_charging", self.data.dc_charging)
-            self.ocpp_boot_notification_send = False
+            self.ocpp_boot_notification_sent = False
         except Exception:
             log.exception("Fehler im Optional-Modul")
 
@@ -104,13 +104,13 @@ def ocpp_transfer_meter_values(self):
     def _transfer_meter_values(self):
         for cp in data.data.cp_data.values():
             try:
-                if self.ocpp_boot_notification_send is False:
+                if self.ocpp_boot_notification_sent is False:
                     # Boot-Notfification nicht in der init-Funktion aufrufen, da noch nicht alles initialisiert ist
                     self.boot_notification(cp.data.config.ocpp_chargebox_id,
                                            cp.chargepoint_module.fault_state,
                                            cp.chargepoint_module.config.type,
                                            cp.data.get.serial_number)
-                    self.ocpp_boot_notification_send = True
+                    self.ocpp_boot_notification_sent = True
                 if cp.data.set.ocpp_transaction_id is not None:
                     self.send_heart_beat(cp.data.config.ocpp_chargebox_id, cp.chargepoint_module.fault_state)
                     self.transfer_values(cp.data.config.ocpp_chargebox_id,

packages/control/optional_data.py

@@ -1,5 +1,5 @@
 from dataclasses import dataclass, field
-from typing import Dict, Protocol
+from typing import Dict, Optional, Protocol
 
 from dataclass_utils.factories import empty_dict_factory
 from helpermodules.constants import NO_ERROR
@@ -61,7 +61,7 @@ def rfid_factory() -> Rfid:
 @dataclass
 class Ocpp:
     active: bool = False
-    url: str = ""
+    url: Optional[str] = None
     version: str = "ocpp1.6"
 
 

packages/helpermodules/setdata.py

@@ -854,14 +854,11 @@ def process_optional_topic(self, msg: mqtt.MQTTMessage):
                 self._validate_value(msg, int, [(0, 2)])
             elif "openWB/set/optional/et/get/fault_str" in msg.topic:
                 self._validate_value(msg, str)
-            elif "openWB/set/optional/et/provider" in msg.topic:
+            elif ("openWB/set/optional/et/provider" in msg.topic or
+                  "openWB/set/optional/ocpp/config" in msg.topic):
                 self._validate_value(msg, "json")
-            elif ("openWB/set/optional/rfid/active" in msg.topic or
-                  "openWB/set/optional/ocpp/active" in msg.topic):
+            elif "openWB/set/optional/rfid/active" in msg.topic:
                 self._validate_value(msg, bool)
-            elif ("openWB/set/optional/ocpp/url" in msg.topic or
-                  "openWB/set/optional/ocpp/version" in msg.topic):
-                self._validate_value(msg, str)
             elif "openWB/set/optional/int_display/rotation" in msg.topic:
                 self._validate_value(msg, int, [(0, 0), (90, 90), (180, 180), (270, 270)])
             elif "openWB/set/optional/int_display/active" in msg.topic:

packages/helpermodules/subdata.py

@@ -15,6 +15,7 @@
 from control.chargepoint.chargepoint_data import Log
 from control.chargepoint.chargepoint_state_update import ChargepointStateUpdate
 from control.chargepoint.chargepoint_template import CpTemplate, CpTemplateData
+from control.optional_data import Ocpp
 from helpermodules import graph, system
 from helpermodules.abstract_plans import AutolockPlan
 from helpermodules.broker import InternalBrokerClient
@@ -678,6 +679,9 @@ def process_optional_topic(self, var: optional.Optional, msg: mqtt.MQTTMessage):
                             var.et_get_prices()
                     else:
                         self.set_json_payload_class(var.data.et, msg)
+                elif re.search("/optional/ocpp/", msg.topic) is not None:
+                    config_dict = decode_payload(msg.payload)
+                    var.data.ocpp = dataclass_from_dict(Ocpp, config_dict)
                 else:
                     self.set_json_payload_class(var.data, msg)
         except Exception:

packages/helpermodules/update_config.py

@@ -11,6 +11,7 @@
 from control.bat_all import BatConsiderationMode
 from control.chargepoint.charging_type import ChargingType
 from control.general import ChargemodeConfig
+from control.optional_data import Ocpp
 import dataclass_utils
 
 from control.chargepoint.chargepoint_template import get_chargepoint_template_default
@@ -254,9 +255,7 @@ class UpdateConfig:
         "^openWB/optional/int_display/only_local_charge_points",
         "^openWB/optional/led/active$",
         "^openWB/optional/rfid/active$",
-        "^openWB/optional/ocpp/active$",
-        "^openWB/optional/ocpp/url$",
-        "^openWB/optional/ocpp/version$",
+        "^openWB/optional/ocpp/config$",
 
         "^openWB/pv/config/configured$",
         "^openWB/pv/get/exported$",
@@ -504,7 +503,7 @@ class UpdateConfig:
         ("openWB/optional/int_display/theme", dataclass_utils.asdict(CardsDisplayTheme())),
         ("openWB/optional/int_display/only_local_charge_points", False),
         ("openWB/optional/led/active", False),
-        ("openWB/optional/ocpp/active", False),
+        ("openWB/optional/ocpp/config", dataclass_utils.asdict(Ocpp())),
         ("openWB/optional/rfid/active", False),
         ("openWB/system/backup_cloud/config", NO_MODULE),
         ("openWB/system/backup_cloud/backup_before_update", True),