Feature fix charge costs

.gitignore

@@ -16,11 +16,14 @@ data/config/eebus/certs/*
 data/log/*
 data/charge_log/*
 data/daily_log/*
+data/daily_totals/*
 data/monthly_log/*
+data/monthly_totals/*
 data/backup/*.tar.gz
 data/backup/*.openwb-backup*
 data/restore/*.tar.gz
 data/data_migration/*.tar.gz
+data/generate_totals.lock
 ramdisk/*
 web/lastcommit
 !.gitignore 

data/config/mosquitto/public/default-dynamic-security.json

@@ -81,7 +81,7 @@
 	"anonymousGroup": "anonymous",
 	"roles": [
 		{
-			"rolename": "openwb-version:9",
+			"rolename": "openwb-version:10",
 			"textname": "openWB Versionsnummer",
 			"textdescription": "Diese Rolle ist ein Platzhalter für die openWB Versionsnummer und wird automatisch aktualisiert. Sie hat keine direkten Berechtigungen.",
 			"acls": []
@@ -194,6 +194,12 @@
 					"priority": 0,
 					"allow": true
 				},
+				{
+					"acltype": "publishClientReceive",
+					"topic": "openWB/system/log_data_ready",
+					"priority": 0,
+					"allow": true
+				},
 				{
 					"acltype": "publishClientReceive",
 					"topic": "openWB/system/usage_terms_acknowledged",
@@ -500,6 +506,12 @@
 					"topic": "openWB/system/security/access/Status",
 					"priority": 0,
 					"allow": true
+				},
+				{
+					"acltype": "publishClientReceive",
+					"topic": "openWB/counter/get/loadmanagement_prios",
+					"priority": 0,
+					"allow": true
 				}
 			]
 		},
@@ -1686,6 +1698,18 @@
 					"topic": "openWB/chargepoint/+/config",
 					"priority": 0,
 					"allow": true
+				},
+				{
+					"acltype": "publishClientReceive",
+					"topic": "openWB/consumer/+/module",
+					"priority": 0,
+					"allow": true
+				},
+				{
+					"acltype": "publishClientReceive",
+					"topic": "openWB/consumer/+/extra_meter",
+					"priority": 0,
+					"allow": true
 				}
 			]
 		},
@@ -1799,19 +1823,73 @@
 			"acls": [
 				{
 					"acltype": "publishClientSend",
-					"topic": "openWB/consumer/+/config",
+					"topic": "openWB/set/command/+/todo/addConsumer",
 					"priority": 0,
 					"allow": true
 				},
 				{
 					"acltype": "publishClientSend",
-					"topic": "openWB/consumer/+/module",
+					"topic": "openWB/set/command/+/todo/removeConsumer",
 					"priority": 0,
 					"allow": true
 				},
 				{
 					"acltype": "publishClientSend",
-					"topic": "openWB/consumer/+/usage",
+					"topic": "openWB/set/command/+/todo/addConsumerSchedulePlan",
+					"priority": 0,
+					"allow": true
+				},
+				{
+					"acltype": "publishClientSend",
+					"topic": "openWB/set/command/+/todo/removeConsumerSchedulePlan",
+					"priority": 0,
+					"allow": true
+				},
+				{
+					"acltype": "publishClientSend",
+					"topic": "openWB/set/command/+/todo/addConsumerTimePlan",
+					"priority": 0,
+					"allow": true
+				},
+				{
+					"acltype": "publishClientSend",
+					"topic": "openWB/set/command/+/todo/removeConsumerTimePlan",
+					"priority": 0,
+					"allow": true
+				},
+				{
+					"acltype": "publishClientSend",
+					"topic": "openWB/set/consumer/+/config",
+					"priority": 0,
+					"allow": true
+				},
+				{
+					"acltype": "publishClientSend",
+					"topic": "openWB/set/consumer/+/module",
+					"priority": 0,
+					"allow": true
+				},
+				{
+					"acltype": "publishClientSend",
+					"topic": "openWB/set/consumer/+/usage",
+					"priority": 0,
+					"allow": true
+				},
+				{
+					"acltype": "publishClientSend",
+					"topic": "openWB/set/consumer/+/extra_meter",
+					"priority": 0,
+					"allow": true
+				},
+				{
+					"acltype": "publishClientSend",
+					"topic": "openWB/set/general/legacy_smarthome_active",
+					"priority": 0,
+					"allow": true
+				},
+				{
+					"acltype": "publishClientReceive",
+					"topic": "openWB/system/security/access/ConsumerConfiguration",
 					"priority": 0,
 					"allow": true
 				},
@@ -1833,6 +1911,42 @@
 					"priority": 0,
 					"allow": true
 				},
+				{
+					"acltype": "publishClientReceive",
+					"topic": "openWB/consumer/+/extra_meter",
+					"priority": 0,
+					"allow": true
+				},
+				{
+					"acltype": "publishClientReceive",
+					"topic": "openWB/general/extern",
+					"priority": 0,
+					"allow": true
+				},
+				{
+					"acltype": "publishClientReceive",
+					"topic": "openWB/general/legacy_smarthome_active",
+					"priority": 0,
+					"allow": true
+				},
+				{
+					"acltype": "publishClientReceive",
+					"topic": "openWB/counter/get/hierarchy",
+					"priority": 0,
+					"allow": true
+				},
+				{
+					"acltype": "publishClientReceive",
+					"topic": "openWB/system/device/+/config",
+					"priority": 0,
+					"allow": true
+				},
+				{
+					"acltype": "publishClientReceive",
+					"topic": "openWB/system/device/+/component/+/config",
+					"priority": 0,
+					"allow": true
+				},
 				{
 					"acltype": "publishClientReceive",
 					"topic": "openWB/system/configurable/consumers",

packages/control/algorithm/bidi_charging.py

@@ -1,10 +1,17 @@
 import logging
 from control import data
+from control.chargemode import Chargemode
 from control.algorithm.chargemodes import CONSIDERED_CHARGE_MODES_BIDI_DISCHARGE
 from control.algorithm.filter_chargepoints import filtered_loads_to_str, get_loads_by_chargemodes
 from control.chargepoint.chargepoint import Chargepoint
 from helpermodules.phase_handling import voltages_mean
 
+from control.limiting_value import LoadmanagementLimit
+from control.loadmanagement import Loadmanagement
+
+import control.algorithm.common as common
+from typing import List
+
 log = logging.getLogger(__name__)
 
 
@@ -13,33 +20,126 @@ def __init__(self):
         pass
 
     def set_bidi(self):
+        """Setzt den verfügbaren Strom für bidirektionales Laden und Entladen.
+        Dafür gibt es jeweils eine Grenze für das Laden und Entladen
+        (raw_currents_left und raw_exported_currents_left).
+        Entladen erhöht die verfügbare Grenze für das Laden, während Laden
+        die verfügbare Grenze für das Entladen erhöht.
+        Das Lastmanagement stellt sicher, dass die Summe der Ströme die am
+        Zähler verfügbare Leistung nicht überschreitet.
+        """
         grid_counter = data.data.counter_all_data.get_evu_counter()
         log.debug(f"Nullpunktanpassung {grid_counter.data.set.surplus_power_left}W")
-        zero_point_adjustment = grid_counter
+
+        # CPs nach Modus filtern, dann verfügbare Ströme gegen alle relevanten Counter-Limits begrenzen.
+        # -> Um bei mehreren Bidi-CPs das Entladen bei der Nullpunktanpassung gleichmäßig zu verteilen
         preferenced_cps = get_loads_by_chargemodes(CONSIDERED_CHARGE_MODES_BIDI_DISCHARGE)
         if preferenced_cps:
             log.info(f"Verbraucher {filtered_loads_to_str(preferenced_cps)}")
             while len(preferenced_cps):
                 cp: Chargepoint = preferenced_cps[0]
-                zero_point_adjustment = grid_counter.data.set.surplus_power_left / len(preferenced_cps)
-                log.debug(f"Nullpunktanpassung für LP{cp.num}: verbleibende Leistung {zero_point_adjustment}W")
-                missing_currents = [zero_point_adjustment / cp.data.get.phases_in_use /
-                                    230 for i in range(0, cp.data.get.phases_in_use)]
+
+                counts = self.get_counts(cp)
+
+                cp.data.set.target_current = 0
+
+                missing_currents = self.get_missing_currents(preferenced_cps, grid_counter)
+                log.debug(f"Bidi-LP{cp.num}: missing currents {missing_currents}A")
+
+                counters = data.data.counter_all_data.get_counters_to_check(cp.num)
+                for counter in counters:
+                    available_currents, limit = Loadmanagement().get_available_currents_bidi(
+                        missing_currents, voltages_mean(cp.data.get.voltages), data.data.counter_data[counter])
+
+                    if limit.limiting_value is not None:
+                        cp.data.control_parameter.limit = limit
+
+                    available_for_cp = common.available_current_for_load(
+                        cp, counts, available_currents, missing_currents, bidi_mode=True)
+
+                    # Der neue Strom darf nicht höher als der bisher gesetzte Strom sein
+                    current = common.get_current_to_set(
+                        cp.data.set.current, available_for_cp, cp.data.set.target_current)
+
+                    cp.data.set.current = current
+                    log.info(f"LP{cp.num}: Stromstärke {current}A")
+
+                    # Ausgabe LIMIT-MSG
+                    self._set_loadmangement_message(current, limit, cp)
+
+                common.set_current_counterdiff(cp.data.set.target_current, current, cp, surplus=True)
+
+                preferenced_cps.pop(0)
+
+    def _set_loadmangement_message(self,
+                                   current: float,
+                                   limit: LoadmanagementLimit,
+                                   chargepoint: Chargepoint) -> None:
+        # Strom muss an diesem Zähler geändert werden
+        log.debug(
+            f"current {current} target {chargepoint.data.set.target_current} set current {chargepoint.data.set.current}"
+            f" required currents {chargepoint.data.control_parameter.required_currents}")
+        required_currents = chargepoint.data.control_parameter.required_currents
+        required_current = min(required_currents) if current < 0 else max(required_currents)
+        if (limit.message and
+                # Strom erreicht nicht die vorgegebene Stromstärke
+                round(current, 2) != round(required_current, 2)):
+            if current == 0:
+                chargepoint.set_state_and_log(f"Es kann nicht mit der vorgegebenen Stromstärke geladen/entladen werden"
+                                              f"{limit.message}")
+            elif current < 0:
+                chargepoint.set_state_and_log(f"Es kann nicht mit der vorgegebenen Stromstärke entladen werden"
+                                              f"{limit.message}")
+            else:
+                chargepoint.set_state_and_log(f"Es kann nicht mit der vorgegebenen Stromstärke geladen werden"
+                                              f"{limit.message}")
+
+    def get_counts(self, chargepoint: Chargepoint) -> List[int]:
+
+        counts = [0]*3
+        required_currents = chargepoint.data.control_parameter.required_currents
+        for i in range(3):
+            if required_currents[i] != 0:
+                counts[i] += 1
+        return counts
+
+    def get_missing_currents(self, preferenced_cps: List[Chargepoint], grid_counter) -> List[float]:
+        cp = preferenced_cps[0]
+        missing_currents = [0, 0, 0]
+        if cp.data.control_parameter.chargemode == Chargemode.INSTANT_CHARGING:
+            # Entladen im Instant-Charging-Modus
+
+            # cp.control_parameter.required_currents enthält duch self.surplus_controlled.set_required_current_to_max()
+            # in calc_current nur noch die maximalen Ströme
+            dc_current = cp.data.set.charging_ev_data.charge_template.data.chargemode.instant_charging.dc_current
+            if dc_current < 0:
+                # Phasen in use berücksichtigen
+                missing_currents = [dc_current for i in range(0, cp.data.get.phases_in_use)]
                 missing_currents += [0] * (3 - len(missing_currents))
-                if zero_point_adjustment > 0:
-                    if cp.data.set.charging_ev_data.charge_template.bidi_charging_allowed(
-                            cp.data.control_parameter.current_plan, cp.data.set.charging_ev_data.data.get.soc):
-                        for index in range(0, 3):
-                            missing_currents[index] = min(cp.data.control_parameter.required_current,
-                                                          missing_currents[index])
-                    else:
-                        log.info(f"LP{cp.num}: Nur bidirektional entladen erlaubt, da SoC-Limit erreicht.")
-                        missing_currents = [0, 0, 0]
-                else:
+
+                for index in range(0, 3):
+                    missing_currents[index] = cp.check_min_max_current(
+                        missing_currents[index], cp.data.get.phases_in_use)
+
+        else:
+            # Default Nullpunktanpassung
+            zero_point_adjustment = grid_counter.data.set.surplus_power_left / len(preferenced_cps)
+            log.debug(f"Nullpunktanpassung für LP{cp.num}: verbleibende Leistung {zero_point_adjustment}W")
+            missing_currents = [zero_point_adjustment / cp.data.get.phases_in_use /
+                                230 for i in range(0, cp.data.get.phases_in_use)]
+            missing_currents += [0] * (3 - len(missing_currents))
+            if zero_point_adjustment > 0:
+                if cp.data.set.charging_ev_data.charge_template.bidi_charging_allowed(
+                        cp.data.control_parameter.current_plan, cp.data.set.charging_ev_data.data.get.soc):
                     for index in range(0, 3):
-                        missing_currents[index] = cp.check_min_max_current(missing_currents[index],
-                                                                           cp.data.get.phases_in_use)
-                grid_counter.update_surplus_values_left(missing_currents, voltages_mean(cp.data.get.voltages))
-                cp.data.set.current = missing_currents[0]
-                log.info(f"LP{cp.num}: Stromstärke {missing_currents}A")
-                preferenced_cps.pop(0)
+                        missing_currents[index] = min(cp.data.control_parameter.required_current,
+                                                      missing_currents[index])
+                else:
+                    log.info(f"LP{cp.num}: Nur bidirektional entladen erlaubt, da SoC-Limit erreicht.")
+                    missing_currents = [0, 0, 0]
+            else:
+                for index in range(0, 3):
+                    missing_currents[index] = cp.check_min_max_current(missing_currents[index],
+                                                                       cp.data.get.phases_in_use)
+
+        return missing_currents

packages/control/algorithm/chargemodes.py

@@ -2,22 +2,23 @@
 
 # Lademodi in absteigender Priorität
 # Tupel-Inhalt:(eingestellter Modus, tatsächlich genutzter Modus, Priorität)
-CHARGEMODES = ((Chargemode.SCHEDULED_CHARGING, Chargemode.INSTANT_CHARGING),
-               (None, Chargemode.TIME_CHARGING),
-               (Chargemode.INSTANT_CHARGING, Chargemode.INSTANT_CHARGING),
-               (Chargemode.ECO_CHARGING, Chargemode.INSTANT_CHARGING),
-               (Chargemode.PV_CHARGING, Chargemode.INSTANT_CHARGING),
-               (Chargemode.SCHEDULED_CHARGING, Chargemode.PV_CHARGING),
-               (Chargemode.ECO_CHARGING, Chargemode.PV_CHARGING),
-               (Chargemode.PV_CHARGING, Chargemode.PV_CHARGING),
+CHARGEMODES = ((Chargemode.SCHEDULED_CHARGING, Chargemode.INSTANT_CHARGING),  # 0
+               (None, Chargemode.TIME_CHARGING),  # 1
+               (Chargemode.INSTANT_CHARGING, Chargemode.INSTANT_CHARGING),  # 2
+               (Chargemode.ECO_CHARGING, Chargemode.INSTANT_CHARGING),  # 3
+               (Chargemode.PV_CHARGING, Chargemode.INSTANT_CHARGING),  # 4
+               (Chargemode.SCHEDULED_CHARGING, Chargemode.PV_CHARGING),  # 5
+               (Chargemode.ECO_CHARGING, Chargemode.PV_CHARGING),  # 6
+               (Chargemode.PV_CHARGING, Chargemode.PV_CHARGING),  # 7
                # niedrigere Priorität soll nachrangig geladen, aber zuerst entladen werden
-               (Chargemode.SCHEDULED_CHARGING, Chargemode.BIDI_CHARGING),
-               (None, Chargemode.STOP),)
+               (Chargemode.INSTANT_CHARGING, Chargemode.BIDI_CHARGING),  # 8
+               (Chargemode.SCHEDULED_CHARGING, Chargemode.BIDI_CHARGING),  # 9
+               (None, Chargemode.STOP),)  # 10
 
 CONSIDERED_CHARGE_MODES_SURPLUS = (CHARGEMODES[0], *CHARGEMODES[3:8])
 CONSIDERED_CHARGE_MODES_PV_ONLY = CHARGEMODES[5:8]
 CONSIDERED_CHARGE_MODES_ADDITIONAL_CURRENT = CHARGEMODES[0:5]
-CONSIDERED_CHARGE_MODES_MIN_CURRENT = CHARGEMODES[0:-2]
-CONSIDERED_CHARGE_MODES_NO_CURRENT = (CHARGEMODES[9],)
-CONSIDERED_CHARGE_MODES_BIDI_DISCHARGE = (CHARGEMODES[8],)
+CONSIDERED_CHARGE_MODES_MIN_CURRENT = CHARGEMODES[0:-3]
+CONSIDERED_CHARGE_MODES_NO_CURRENT = (CHARGEMODES[10],)
+CONSIDERED_CHARGE_MODES_BIDI_DISCHARGE = (CHARGEMODES[8:10])
 CONSIDERED_CHARGE_MODES_CHARGING = CHARGEMODES[0:8]