Feature dashboard temporary settings (#2218)

* ids in charge and ev template config

* dashboard temporary settings

* topics

* fixes

* flake8

* fix rebase

* update local mqtt bridge

* fix

* draft

* draft

* fixes

* Wiki

* format

* fix rebase

* fix rebase

* test compatibility

* fixes

---------

Co-authored-by: Lutz Bender <github@lutz-bender.de>

Author: LKuemmel

data/config/mosquitto/openwb_local.conf

@@ -22,6 +22,8 @@ topic openWB/chargepoint/+/set/phases_to_use out 2
 topic openWB/chargepoint/+/set/manual_lock out 2
 topic openWB/chargepoint/+/set/autolock_state out 2
 topic openWB/chargepoint/+/set/rfid out 2
+topic openWB/chargepoint/+/set/charge_template out 2
+topic openWB/chargepoint/+/set/charge_template/# out 2
 topic openWB/chargepoint/+/get/# out 2
 topic openWB/chargepoint/+/config/# out 2
 topic openWB/chargepoint/template/# out 2

docs/Ladeprofile.md

@@ -3,3 +3,10 @@ _Einstellungen -> Konfiguration -> Fahrzeuge -> Lade-Profile_
 Unter den Lade-Profilen werden die Einstellungen für das Ladeprofil verwaltet. Die Einstellungen auf der Hauptseite werden aus diesem Profil geladen und dorthin geschrieben. Ist nur ein Fahrzeug vorhanden, so wird in den meisten Fällen nur das Standard-Ladeprofil benötigt. Ausgenommen hiervon ist, wenn per RFID-Tag Ladevorgaben ausgewählt werden.
 
 In den fahrzeugspezifischen Einstellungen wird ein Ladeprofil einem Fahrzeug zugeordnet. Werden zwei Fahrzeuge geladen, empfiehlt es sich dazu ein zweites Ladeprofil anzulegen.
+
+### Temporäre Ladeprofile (ab Version 2.1.7)
+Anpassungen am Ladeprofil, die über die Hauptseite (Web-Themes) oder ein Display (Display-Themes) vorgenommen werden, sind temporär. Die Lade-Profile müssen direkt in den Einstellungen bearbeitet werden.
+Die temporären Einstellungen werden mit dem Ladeprofil aus den Einstellungen überschrieben, wenn  
+... abgesteckt wird.  
+... das Fahrzeug gewechselt wird. Das Lade-Profil des neuen Fahrzeugs wird geladen.  
+... das Ladeprofil geändert wird und kein Fahrzeug angesteckt ist. Ist ein Fahrzeug angesteckt, gelten die temporären Einstellungen bis zum Abstecken und werden dann durch das Ladeprofil überschrieben.  

packages/control/algorithm/additional_current_test.py

@@ -29,7 +29,7 @@
 def test_set_loadmangement_message(set_current, limit, expected_msg, monkeypatch):
     # setup
     ev = Ev(0)
-    ev.charge_template = ChargeTemplate(0)
+    ev.charge_template = ChargeTemplate()
     cp1 = Chargepoint(1, None)
     cp1.data = ChargepointData(set=Set(current=set_current),
                                control_parameter=ControlParameter(required_currents=[8]*3))

packages/control/algorithm/algorithm.py

@@ -62,6 +62,7 @@ def _check_auto_phase_switch_delay(self) -> None:
                         # wurden, wieder zurückgegeben.
                         log.debug(f"Ladepunkt {cp.num}: Prüfen, ob Phasenumschaltung durchgeführt werden soll.")
                         phases, current, message = charging_ev.auto_phase_switch(
+                            cp.data.set.charge_template,
                             cp.data.control_parameter,
                             cp.num,
                             cp.data.get.currents,

packages/control/algorithm/integration_test/pv_charging_test.py

@@ -223,9 +223,9 @@ def test_surplus(params: ParamsSurplus, all_cp_pv_charging_3p, all_cp_charging_3
     data.data.counter_data["counter6"].data.set.raw_currents_left = params.raw_currents_left_counter6
     mockget_component_name_by_id = Mock(return_value="Garage")
     monkeypatch.setattr(loadmanagement, "get_component_name_by_id", mockget_component_name_by_id)
-    data.data.cp_data["cp3"].data.set.charging_ev_data.charge_template.data.chargemode.pv_charging.phases_to_use = 1
-    data.data.cp_data["cp4"].data.set.charging_ev_data.charge_template.data.chargemode.pv_charging.phases_to_use = 1
-    data.data.cp_data["cp5"].data.set.charging_ev_data.charge_template.data.chargemode.pv_charging.phases_to_use = 1
+    data.data.cp_data["cp3"].data.set.charge_template.data.chargemode.pv_charging.phases_to_use = 1
+    data.data.cp_data["cp4"].data.set.charge_template.data.chargemode.pv_charging.phases_to_use = 1
+    data.data.cp_data["cp5"].data.set.charge_template.data.chargemode.pv_charging.phases_to_use = 1
 
     # execution
     Algorithm().calc_current()

packages/control/algorithm/surplus_controlled.py

@@ -95,9 +95,9 @@ def _set_loadmangement_message(self,
 
     # tested
     def filter_by_feed_in_limit(self, chargepoints: List[Chargepoint]) -> Tuple[List[Chargepoint], List[Chargepoint]]:
-        cp_with_feed_in = list(filter(lambda cp: cp.data.set.charging_ev_data.charge_template.data.chargemode.
+        cp_with_feed_in = list(filter(lambda cp: cp.data.set.charge_template.data.chargemode.
                                       pv_charging.feed_in_limit is True, chargepoints))
-        cp_without_feed_in = list(filter(lambda cp: cp.data.set.charging_ev_data.charge_template.data.chargemode.
+        cp_without_feed_in = list(filter(lambda cp: cp.data.set.charge_template.data.chargemode.
                                          pv_charging.feed_in_limit is False, chargepoints))
         return cp_with_feed_in, cp_without_feed_in
 
@@ -109,7 +109,7 @@ def _limit_adjust_current(self, chargepoint: Chargepoint, new_current: float) ->
             MAX_CURRENT = 30
         msg = None
         nominal_difference = chargepoint.data.set.charging_ev_data.ev_template.data.nominal_difference
-        if chargepoint.data.set.charging_ev_data.chargemode_changed or chargepoint.data.get.charge_state is False:
+        if chargepoint.chargemode_changed or chargepoint.data.get.charge_state is False:
             return new_current
         else:
             # Um max. +/- 5A pro Zyklus regeln
@@ -152,7 +152,7 @@ def check_submode_pv_charging(self) -> None:
             def phase_switch_necessary() -> bool:
                 return cp.cp_ev_chargemode_support_phase_switch() and cp.data.get.phases_in_use != 1
             control_parameter = cp.data.control_parameter
-            if cp.data.set.charging_ev_data.chargemode_changed or cp.data.set.charging_ev_data.submode_changed:
+            if cp.chargemode_changed or cp.submode_changed:
                 if control_parameter.state == ChargepointState.CHARGING_ALLOWED:
                     if cp.data.set.charging_ev_data.ev_template.data.prevent_charge_stop is False:
                         threshold = evu_counter.calc_switch_off_threshold(cp)[0]

packages/control/algorithm/surplus_controlled_test.py

@@ -11,7 +11,6 @@
 from control.chargepoint.chargepoint_data import Get, Set
 from control.chargepoint.chargepoint_template import CpTemplate
 from control.chargepoint.control_parameter import ControlParameter
-from control.ev.charge_template import ChargeTemplate
 from control.ev.ev import Ev
 
 
@@ -40,10 +39,8 @@ def test_filter_by_feed_in_limit(feed_in_limit_1: bool,
                                  expected_sorted: int):
     # setup
     def setup_cp(cp: Chargepoint, feed_in_limit: bool) -> Chargepoint:
-        ev = Ev(0)
-        ev.charge_template = ChargeTemplate(0)
-        ev.charge_template.data.chargemode.pv_charging.feed_in_limit = feed_in_limit
-        cp.data = ChargepointData(set=Set(charging_ev_data=ev))
+        cp.data = ChargepointData()
+        cp.data.set.charge_template.data.chargemode.pv_charging.feed_in_limit = feed_in_limit
         return cp
 
     cp1 = setup_cp(mock_cp1, feed_in_limit_1)

packages/control/auto_phase_switch_test.py

@@ -5,6 +5,7 @@
 from control.chargepoint.control_parameter import ControlParameter
 from control.counter import Counter, CounterData, Set
 
+from control.ev.charge_template import ChargeTemplate
 from control.pv_all import PvAll
 from control.bat_all import BatAll
 from control.general import General
@@ -131,7 +132,8 @@ def test_auto_phase_switch(monkeypatch, vehicle: Ev, params: Params):
     control_parameter.state = params.state
 
     # execution
-    phases_to_use, current, message = vehicle.auto_phase_switch(control_parameter,
+    phases_to_use, current, message = vehicle.auto_phase_switch(ChargeTemplate(),
+                                                                control_parameter,
                                                                 0,
                                                                 params.get_currents,
                                                                 params.get_power,