Revert "Feature simplify chargemode (openWB#2276)"

This reverts commit 8df44b8.

Author: LKuemmel

.github/workflows/build_web_theme_koala.yml

@@ -1,4 +1,4 @@
-# openwb-version:19
+# openwb-version:18
 listener 1886 localhost
 allow_anonymous true
 
@@ -22,8 +22,6 @@ 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

data/config/mosquitto/openwb_local.conf

@@ -3,13 +3,3 @@ _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.8)
-
-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 in den Einstellungen geändert wird.

docs/Ladeprofile.md

@@ -9,7 +9,7 @@ openWB hat einen eigenen MQTT-Broker integriert, über den die Kommunikation lä
 
 Als EVU-Zähler können auch Werte über MQTT empfangen werden. Die Integration ist im Abschnitt [Zähler](https://github.com/openWB/core/wiki/Zähler) beschrieben.
 
-## SmartHome
+## Smarthome
 
 ## Steuerbefehle
 
@@ -32,8 +32,8 @@ SoC-Limit auf z.B. 80% setzen
 Zielladen
 `openWB/set/vehicle/template/charge_template/#/chargemode/selected -> scheduled_charging`
 
-Eco
-`openWB/set/vehicle/template/charge_template/#/chargemode/selected -> eco_charging`
+Standby
+`openWB/set/vehicle/template/charge_template/#/chargemode/selected -> standby`
 
 Stop
 `openWB/set/vehicle/template/charge_template/#/chargemode/selected -> stop`
@@ -50,7 +50,7 @@ openWB/vehicle/template/charge_template/1
 Setzen von min_Current für min+PV nachbauen:
 `openWB/set/vehicle/template/charge_template/#/chargemode/pv_charging/min_current`
 
-Setzen des Lademodus: (Werte die zu senden sind: instant_charging, pv_charging, scheduled_charging, eco_charging, stop)
+Setzen des Lademodus: (Werte die zu senden sind: instant_charging, pv_charging, scheduled_charging, standby, stop)
 `openWB/set/vehicle/template/charge_template/#/chargemode/selected`
 
 Ladepunkt sperren für Priosteuerung der LP:

docs/MQTT.md

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

packages/control/algorithm/additional_current_test.py

@@ -61,7 +61,6 @@ 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/algorithm.py

@@ -8,21 +8,19 @@
                (None, Chargemode.TIME_CHARGING, False),
                (Chargemode.INSTANT_CHARGING, Chargemode.INSTANT_CHARGING, True),
                (Chargemode.INSTANT_CHARGING, Chargemode.INSTANT_CHARGING, False),
-               (Chargemode.ECO_CHARGING, Chargemode.INSTANT_CHARGING, True),
-               (Chargemode.ECO_CHARGING, Chargemode.INSTANT_CHARGING, False),
                (Chargemode.PV_CHARGING, Chargemode.INSTANT_CHARGING, True),
                (Chargemode.PV_CHARGING, Chargemode.INSTANT_CHARGING, False),
                (Chargemode.SCHEDULED_CHARGING, Chargemode.PV_CHARGING, True),
                (Chargemode.SCHEDULED_CHARGING, Chargemode.PV_CHARGING, False),
-               (Chargemode.ECO_CHARGING, Chargemode.PV_CHARGING, True),
-               (Chargemode.ECO_CHARGING, Chargemode.PV_CHARGING, False),
                (Chargemode.PV_CHARGING, Chargemode.PV_CHARGING, True),
                (Chargemode.PV_CHARGING, Chargemode.PV_CHARGING, False),
+               (None, Chargemode.STANDBY, True),
+               (None, Chargemode.STANDBY, False),
                (None, Chargemode.STOP, True),
                (None, Chargemode.STOP, False))
 
-CONSIDERED_CHARGE_MODES_SURPLUS = CHARGEMODES[0:2] + CHARGEMODES[6:16]
-CONSIDERED_CHARGE_MODES_PV_ONLY = CHARGEMODES[10:16]
-CONSIDERED_CHARGE_MODES_ADDITIONAL_CURRENT = CHARGEMODES[0:10]
+CONSIDERED_CHARGE_MODES_SURPLUS = CHARGEMODES[0:2] + CHARGEMODES[6:12]
+CONSIDERED_CHARGE_MODES_PV_ONLY = CHARGEMODES[8:12]
+CONSIDERED_CHARGE_MODES_ADDITIONAL_CURRENT = CHARGEMODES[0:8]
 CONSIDERED_CHARGE_MODES_MIN_CURRENT = CHARGEMODES[0:-1]
-CONSIDERED_CHARGE_MODES_NO_CURRENT = CHARGEMODES[16:18]
+CONSIDERED_CHARGE_MODES_NO_CURRENT = CHARGEMODES[12:16]

packages/control/algorithm/chargemodes.py

@@ -7,6 +7,7 @@
 from control.chargemode import Chargemode
 from control import data, loadmanagement
 from control.algorithm.algorithm import Algorithm
+from control.algorithm.algorithm import data as algorithm_data
 from control.chargepoint.chargepoint_template import CpTemplate
 from control.chargepoint.chargepoint_state import ChargepointState
 from dataclass_utils.factories import currents_list_factory
@@ -272,6 +273,8 @@ def test_phase_switch(all_cp_pv_charging_3p, all_cp_charging_3p, monkeypatch):
     data.data.counter_data["counter0"].data.set.raw_power_left = cases_phase_switch[0].raw_power_left
     data.data.counter_data["counter0"].data.set.raw_currents_left = cases_phase_switch[0].raw_currents_left_counter0
     data.data.counter_data["counter6"].data.set.raw_currents_left = cases_phase_switch[0].raw_currents_left_counter6
+    mockget_get_phases_chargemode = Mock(return_value=0)
+    monkeypatch.setattr(algorithm_data.data.general_data, "get_phases_chargemode", mockget_get_phases_chargemode)
     data.data.cp_data[
         "cp3"].data.control_parameter.state = ChargepointState.CHARGING_ALLOWED
     data.data.cp_data[
@@ -293,6 +296,8 @@ def test_phase_switch_1p_3p(all_cp_pv_charging_1p, monkeypatch):
     data.data.counter_data["counter0"].data.set.raw_power_left = cases_phase_switch[1].raw_power_left
     data.data.counter_data["counter0"].data.set.raw_currents_left = cases_phase_switch[1].raw_currents_left_counter0
     data.data.counter_data["counter6"].data.set.raw_currents_left = cases_phase_switch[1].raw_currents_left_counter6
+    mockget_get_phases_chargemode = Mock(return_value=0)
+    monkeypatch.setattr(algorithm_data.data.general_data, "get_phases_chargemode", mockget_get_phases_chargemode)
     data.data.cp_data["cp3"].data.get.currents = [32, 0, 0]
     data.data.cp_data["cp3"].data.get.power = 7360
     data.data.cp_data["cp3"].data.control_parameter.timestamp_last_phase_switch = 1652682252

packages/control/algorithm/integration_test/pv_charging_test.py

@@ -99,9 +99,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.charge_template.data.chargemode.
+        cp_with_feed_in = list(filter(lambda cp: cp.data.set.charging_ev_data.charge_template.data.chargemode.
                                       pv_charging.feed_in_limit is True, chargepoints))
-        cp_without_feed_in = list(filter(lambda cp: cp.data.set.charge_template.data.chargemode.
+        cp_without_feed_in = list(filter(lambda cp: cp.data.set.charging_ev_data.charge_template.data.chargemode.
                                          pv_charging.feed_in_limit is False, chargepoints))
         return cp_with_feed_in, cp_without_feed_in
 
@@ -113,7 +113,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.chargemode_changed or chargepoint.data.get.charge_state is False:
+        if chargepoint.data.set.charging_ev_data.chargemode_changed or chargepoint.data.get.charge_state is False:
             return new_current
         else:
             # Um max. +/- 5A pro Zyklus regeln
@@ -153,56 +153,49 @@ def check_submode_pv_charging(self) -> None:
         evu_counter = data.data.counter_all_data.get_evu_counter()
 
         for cp in get_chargepoints_by_chargemodes(CONSIDERED_CHARGE_MODES_PV_ONLY):
-            try:
-                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.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]
-                            if evu_counter.calc_raw_surplus() - cp.data.set.required_power < threshold:
-                                control_parameter.required_currents = [0]*3
-                                control_parameter.state = ChargepointState.NO_CHARGING_ALLOWED
-                    else:
-                        control_parameter.required_currents = [0]*3
+            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 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]
+                        if evu_counter.calc_raw_surplus() - cp.data.set.required_power < threshold:
+                            control_parameter.required_currents = [0]*3
+                            control_parameter.state = ChargepointState.NO_CHARGING_ALLOWED
                 else:
-                    if ((control_parameter.state == ChargepointState.CHARGING_ALLOWED or
-                            control_parameter.state == ChargepointState.SWITCH_OFF_DELAY) and
-                            phase_switch_necessary() is False):
-                        evu_counter.switch_off_check_threshold(cp)
-                    if control_parameter.state == ChargepointState.SWITCH_OFF_DELAY:
-                        evu_counter.switch_off_check_timer(cp)
-                    if control_parameter.state == ChargepointState.SWITCH_ON_DELAY:
-                        # Wenn charge_state False und set_current > 0, will Auto nicht laden
-                        evu_counter.switch_on_timer_expired(cp)
-                    if control_parameter.state not in CHARGING_STATES:
-                        control_parameter.required_currents = [0]*3
-            except Exception:
-                log.exception(f"Fehler in der PV-gesteuerten Ladung bei {cp.num}")
+                    control_parameter.required_currents = [0]*3
+            else:
+                if ((control_parameter.state == ChargepointState.CHARGING_ALLOWED or
+                        control_parameter.state == ChargepointState.SWITCH_OFF_DELAY) and
+                        phase_switch_necessary() is False):
+                    evu_counter.switch_off_check_threshold(cp)
+                if control_parameter.state == ChargepointState.SWITCH_OFF_DELAY:
+                    evu_counter.switch_off_check_timer(cp)
+                if control_parameter.state == ChargepointState.SWITCH_ON_DELAY:
+                    # Wenn charge_state False und set_current > 0, will Auto nicht laden
+                    evu_counter.switch_on_timer_expired(cp)
+                if control_parameter.state not in CHARGING_STATES:
+                    control_parameter.required_currents = [0]*3
 
     def set_required_current_to_max(self) -> None:
         for cp in get_chargepoints_by_chargemodes(CONSIDERED_CHARGE_MODES_SURPLUS):
-            try:
-                charging_ev_data = cp.data.set.charging_ev_data
-                required_currents = cp.data.control_parameter.required_currents
-                control_parameter = cp.data.control_parameter
+            charging_ev_data = cp.data.set.charging_ev_data
+            required_currents = cp.data.control_parameter.required_currents
+            control_parameter = cp.data.control_parameter
+
+            if control_parameter.phases == 1:
+                max_current = charging_ev_data.ev_template.data.max_current_single_phase
+            else:
+                max_current = charging_ev_data.ev_template.data.max_current_multi_phases
 
+            if cp.template.data.charging_type == ChargingType.AC.value:
                 if control_parameter.phases == 1:
                     max_current = charging_ev_data.ev_template.data.max_current_single_phase
                 else:
                     max_current = charging_ev_data.ev_template.data.max_current_multi_phases
+            else:
+                max_current = charging_ev_data.ev_template.data.dc_max_current
 
-                if cp.template.data.charging_type == ChargingType.AC.value:
-                    if control_parameter.phases == 1:
-                        max_current = charging_ev_data.ev_template.data.max_current_single_phase
-                    else:
-                        max_current = charging_ev_data.ev_template.data.max_current_multi_phases
-                else:
-                    max_current = charging_ev_data.ev_template.data.dc_max_current
-
-                control_parameter.required_currents = [
-                    max_current if required_currents[i] != 0 else 0 for i in range(3)]
-                control_parameter.required_current = max_current
-            except Exception:
-                log.exception(f"Fehler in der PV-gesteuerten Ladung bei {cp.num}")
+            control_parameter.required_currents = [max_current if required_currents[i] != 0 else 0 for i in range(3)]
+            control_parameter.required_current = max_current

packages/control/algorithm/surplus_controlled.py

@@ -11,6 +11,7 @@
 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
 
 
@@ -39,8 +40,10 @@ 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:
-        cp.data = ChargepointData()
-        cp.data.set.charge_template.data.chargemode.pv_charging.feed_in_limit = feed_in_limit
+        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))
         return cp
 
     cp1 = setup_cp(mock_cp1, feed_in_limit_1)