From 6355d538f8152a8cb0b494423f6cee1b60d018cb Mon Sep 17 00:00:00 2001 From: MartinRinas Date: Tue, 2 Nov 2021 22:08:01 +0100 Subject: [PATCH 001/201] =?UTF-8?q?SoC=20Beschreibungstext=20auf=20=C3=9Cb?= =?UTF-8?q?erschreiten=20angepasst?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/settings/pvconfig.html | 4 ++-- web/settings/settings.php | 8 ++++---- web/settings/sofortconfig.php | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/web/settings/pvconfig.html b/web/settings/pvconfig.html index b8091f1fc4..cbd4006118 100644 --- a/web/settings/pvconfig.html +++ b/web/settings/pvconfig.html @@ -332,7 +332,7 @@

Einstellungen für PV-Laden

Parameter in Prozent [%] für den Maximal-SoC am Ladepunkt 1 im Modus PV-Laden. - Definiert einen EV-Maximal-SoC, bis zu dem höchstens geladen wird. Diese Funktion ist nur dafür gedacht wenn mehree Ladepunkte aktiv sind. Setzen auf 100% deaktiviert sie. + Definiert einen EV-Maximal-SoC, bei dessen Überschreitung die Ladung gestoppt wird. Diese Funktion ist nur dafür gedacht wenn mehree Ladepunkte aktiv sind. Setzen auf 100% deaktiviert sie. @@ -364,7 +364,7 @@

Einstellungen für PV-Laden

Parameter in Prozent [%] für den Maximal-SoC am Ladepunkt 2 im Modus PV-Laden. - Definiert einen EV-Maximal-SoC, bis zu dem höchstens geladen wird. Diese Funktion ist nur dafür gedacht wenn mehree Ladepunkte aktiv sind. Setzen auf 100% deaktiviert sie. + Definiert einen EV-Maximal-SoC, bei dessen Überschreitung die Ladung gestoppt wird. Diese Funktion ist nur dafür gedacht wenn mehree Ladepunkte aktiv sind. Setzen auf 100% deaktiviert sie. diff --git a/web/settings/settings.php b/web/settings/settings.php index 71cb0ef5db..69ca6ef9b7 100644 --- a/web/settings/settings.php +++ b/web/settings/settings.php @@ -1117,7 +1117,7 @@ function visibility_schieflastaktiv() { - Wenn SoC Modul vorhanden wird Nachts bis xx% SoC geladen in dem angegebenen Zeitfenster. Das SoC Fenster is von von Sonntag Abend bis Freitag Morgen aktiv. + Wenn SoC Modul vorhanden wird Nachts bis zur Überschreitung von xx% SoC geladen in dem angegebenen Zeitfenster. Das SoC Fenster is von von Sonntag Abend bis Freitag Morgen aktiv.
@@ -1129,7 +1129,7 @@ function visibility_schieflastaktiv() {
- Wenn SoC Modul vorhanden wird Nachts bis xx% SoC geladen in dem angegebenen Zeitfenster. Das SoC Fenster is von von Freitag Morgen bis Sonntag Abend aktiv. + Wenn SoC Modul vorhanden wird Nachts bis zur Überschreitung von xx% SoC geladen in dem angegebenen Zeitfenster. Das SoC Fenster is von von Freitag Morgen bis Sonntag Abend aktiv.
@@ -1303,7 +1303,7 @@ function generateMorningChargeDayOptions($dayName, $dayShortcut) { - Wenn SoC Modul vorhanden wird Nachts bis xx% SoC geladen in dem angegebenen Zeitfenster. Das SoC Fenster is von von Sonntag Abend bis Freitag Morgen aktiv. + Wenn SoC Modul vorhanden wird Nachts in dem angegebenen Zeitfenster bis zur Überschreitung von xx% SoC geladen. Das SoC Fenster is von von Sonntag Abend bis Freitag Morgen aktiv.
@@ -1315,7 +1315,7 @@ function generateMorningChargeDayOptions($dayName, $dayShortcut) {
- Wenn SoC Modul vorhanden wird Nachts bis xx% SoC geladen in dem angegebenen Zeitfenster. Das SoC Fenster is von von Freitag Morgen bis Sonntag Abend aktiv. + Wenn SoC Modul vorhanden wird Nachts in dem angegebenen Zeitfenster bis zur Überschreitung von xx% SoC geladen. Das SoC Fenster is von von Freitag Morgen bis Sonntag Abend aktiv.
diff --git a/web/settings/sofortconfig.php b/web/settings/sofortconfig.php index 8c722a5a73..4b949ab28d 100644 --- a/web/settings/sofortconfig.php +++ b/web/settings/sofortconfig.php @@ -145,7 +145,7 @@ - Parameter in Prozent [%] für die Lademengenbegrenzung im Modus Sofortladen. Definiert den EV-SoC, auf den der Ladevorgang begrenzt werden soll. + Parameter in Prozent [%] für die Lademengenbegrenzung im Modus Sofortladen. Definiert den EV-SoC, bei dessen Überschreitung die Ladung gestoppt wird. Dieser Parameter kann auf der Hauptseite der openWB per Sofortzugriff im Modus Sofortladen jederzeit geändert werden. From dc181dfcd09a81dda0c582c4a8028112297fb6e7 Mon Sep 17 00:00:00 2001 From: MartinRinas Date: Wed, 3 Nov 2021 12:05:41 +0100 Subject: [PATCH 002/201] soc update --- web/settings/pvconfig.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/web/settings/pvconfig.html b/web/settings/pvconfig.html index cbd4006118..5b5aaeecce 100644 --- a/web/settings/pvconfig.html +++ b/web/settings/pvconfig.html @@ -293,7 +293,7 @@

Einstellungen für PV-Laden

- Parameter in Prozent [%] für den Maximal-SoC am LP1 im Modus PV-Laden. Definiert einen EV-Maximal-SoC, bis zu dem höchstens geladen wird. + Parameter in Prozent [%] für den Maximal-SoC am LP1 im Modus PV-Laden. Definiert einen EV-Maximal-SoC, Definiert einen EV-Maximal-SoC, bei dessen Überschreitung die Ladung gestoppt wird. @@ -332,7 +332,7 @@

Einstellungen für PV-Laden

Parameter in Prozent [%] für den Maximal-SoC am Ladepunkt 1 im Modus PV-Laden. - Definiert einen EV-Maximal-SoC, bei dessen Überschreitung die Ladung gestoppt wird. Diese Funktion ist nur dafür gedacht wenn mehree Ladepunkte aktiv sind. Setzen auf 100% deaktiviert sie. + Definiert einen EV-Maximal-SoC, bei dessen Überschreitung die Ladung gestoppt wird. Diese Funktion ist nur dafür gedacht wenn mehere Ladepunkte aktiv sind. Setzen auf 100% deaktiviert sie. @@ -364,7 +364,7 @@

Einstellungen für PV-Laden

Parameter in Prozent [%] für den Maximal-SoC am Ladepunkt 2 im Modus PV-Laden. - Definiert einen EV-Maximal-SoC, bei dessen Überschreitung die Ladung gestoppt wird. Diese Funktion ist nur dafür gedacht wenn mehree Ladepunkte aktiv sind. Setzen auf 100% deaktiviert sie. + Definiert einen EV-Maximal-SoC, bei dessen Überschreitung die Ladung gestoppt wird. Diese Funktion ist nur dafür gedacht wenn mehrere Ladepunkte aktiv sind. Setzen auf 100% deaktiviert sie. From a774ae4976a10e98e745e068436ee3fb1c2718db Mon Sep 17 00:00:00 2001 From: Martin Rinas Date: Sat, 6 Nov 2021 12:03:47 +0100 Subject: [PATCH 003/201] fix typo --- web/settings/pvconfig.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/settings/pvconfig.html b/web/settings/pvconfig.html index 5b5aaeecce..0d3f59508f 100644 --- a/web/settings/pvconfig.html +++ b/web/settings/pvconfig.html @@ -293,7 +293,7 @@

Einstellungen für PV-Laden

- Parameter in Prozent [%] für den Maximal-SoC am LP1 im Modus PV-Laden. Definiert einen EV-Maximal-SoC, Definiert einen EV-Maximal-SoC, bei dessen Überschreitung die Ladung gestoppt wird. + Parameter in Prozent [%] für den Maximal-SoC am LP1 im Modus PV-Laden. Definiert einen EV-Maximal-SoC, bei dessen Überschreitung die Ladung gestoppt wird. From f2a6515004c1ce4a1ef1a3357393c120059effe6 Mon Sep 17 00:00:00 2001 From: LKuemmel Date: Thu, 13 Oct 2022 16:12:16 +0200 Subject: [PATCH 004/201] option for Sungrow SG with WiNet-dongle --- packages/modules/sungrow/counter.py | 29 ++++++++++++++--------------- packages/modules/sungrow/device.py | 4 +++- packages/modules/sungrow/version.py | 7 +++++++ web/settings/modulconfigevu.php | 1 + 4 files changed, 25 insertions(+), 16 deletions(-) create mode 100644 packages/modules/sungrow/version.py diff --git a/packages/modules/sungrow/counter.py b/packages/modules/sungrow/counter.py index 79690e6bc3..725bb5a5db 100644 --- a/packages/modules/sungrow/counter.py +++ b/packages/modules/sungrow/counter.py @@ -10,6 +10,7 @@ from modules.common.simcount import SimCounter from modules.common.store import get_counter_value_store from modules.sungrow.config import SungrowCounterSetup +from modules.sungrow.version import Version class SungrowCounter: @@ -28,30 +29,28 @@ def __init__(self, def update(self): unit = self.__device_modbus_id - if self.component_config.configuration.version == 1: - power = self.__tcp_client.read_input_registers(5082, ModbusDataType.INT_32, - wordorder=Endian.Little, unit=unit) - frequency = self.__tcp_client.read_input_registers(5035, ModbusDataType.UINT_16, unit=unit) / 10 - voltages = self.__tcp_client.read_input_registers(5018, [ModbusDataType.UINT_16] * 3, - wordorder=Endian.Little, unit=unit) - voltages = [voltage / 10 for voltage in voltages] + if self.component_config.configuration.version == Version.SH: + power = self.__tcp_client.read_input_registers(13009, ModbusDataType.INT_32, + wordorder=Endian.Little, unit=unit) * -1 # no valid data for powers per phase - # powers = self.__tcp_client.read_input_registers(5084, [ModbusDataType.UINT_16] * 3, + # powers = self.__tcp_client.read_input_registers(5084, [ModbusDataType.INT_16] * 3, # wordorder=Endian.Little, unit=unit) # powers = [power / 10 for power in powers] # log.info("power: " + str(power) + " powers?: " + str(powers)) else: - power = self.__tcp_client.read_input_registers(13009, ModbusDataType.INT_32, - wordorder=Endian.Little, unit=unit) * -1 - frequency = self.__tcp_client.read_input_registers(5035, ModbusDataType.UINT_16, unit=unit) / 10 - voltages = self.__tcp_client.read_input_registers(5018, [ModbusDataType.UINT_16] * 3, - wordorder=Endian.Little, unit=unit) - voltages = [voltage / 10 for voltage in voltages] + power = self.__tcp_client.read_input_registers(5082, ModbusDataType.INT_32, + wordorder=Endian.Little, unit=unit) + if self.component_config.configuration.version == Version.SG_winet_dongle: + power = power * -1 # no valid data for powers per phase - # powers = self.__tcp_client.read_input_registers(5084, [ModbusDataType.INT_16] * 3, + # powers = self.__tcp_client.read_input_registers(5084, [ModbusDataType.UINT_16] * 3, # wordorder=Endian.Little, unit=unit) # powers = [power / 10 for power in powers] # log.info("power: " + str(power) + " powers?: " + str(powers)) + frequency = self.__tcp_client.read_input_registers(5035, ModbusDataType.UINT_16, unit=unit) / 10 + voltages = self.__tcp_client.read_input_registers(5018, [ModbusDataType.UINT_16] * 3, + wordorder=Endian.Little, unit=unit) + voltages = [voltage / 10 for voltage in voltages] imported, exported = self.__sim_counter.sim_count(power) diff --git a/packages/modules/sungrow/device.py b/packages/modules/sungrow/device.py index 675438d8d9..4457af581f 100644 --- a/packages/modules/sungrow/device.py +++ b/packages/modules/sungrow/device.py @@ -12,6 +12,8 @@ from modules.sungrow import inverter from modules.sungrow.config import (Sungrow, SungrowBatSetup, SungrowCounterConfiguration, SungrowCounterSetup, SungrowInverterSetup) +from modules.sungrow.version import Version + log = logging.getLogger(__name__) @@ -91,7 +93,7 @@ def read_legacy_bat(ip_address: str, port: int, modbus_id: int, num: Optional[in def read_legacy_counter(ip_address: str, port: int, modbus_id: int, version: int): read_legacy(ip_address, port, modbus_id, counter.component_descriptor.configuration_factory( - id=None, configuration=SungrowCounterConfiguration(version=version))) + id=None, configuration=SungrowCounterConfiguration(version=Version(version)))) def read_legacy_inverter(ip_address: str, port: int, modbus_id: int, num: int): diff --git a/packages/modules/sungrow/version.py b/packages/modules/sungrow/version.py new file mode 100644 index 0000000000..6e3607756b --- /dev/null +++ b/packages/modules/sungrow/version.py @@ -0,0 +1,7 @@ +from enum import IntEnum + + +class Version(IntEnum): + SH = 0 + SG = 1 + SG_winet_dongle = 2 diff --git a/web/settings/modulconfigevu.php b/web/settings/modulconfigevu.php index 3291cef114..f0be2ce82a 100644 --- a/web/settings/modulconfigevu.php +++ b/web/settings/modulconfigevu.php @@ -149,6 +149,7 @@ From 16eec84c9b7dca8f4a05867973955c7fe0d0d696 Mon Sep 17 00:00:00 2001 From: MartinRinas Date: Fri, 21 Oct 2022 14:40:55 +0200 Subject: [PATCH 005/201] =?UTF-8?q?Erl=C3=A4uterung=20Regelmodus=20erg?= =?UTF-8?q?=C3=A4nzt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/settings/pvconfig.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/settings/pvconfig.html b/web/settings/pvconfig.html index 155f394ed4..6c58211e32 100644 --- a/web/settings/pvconfig.html +++ b/web/settings/pvconfig.html @@ -63,7 +63,7 @@

Einstellungen für PV- und Min+PV-Laden

manueller Regelpunkt - Auswahl des Regelmodus in beiden Lademodi. Die Auswahl beeinflusst den Regelpunkt und die Berechnung des Ladestroms. + Auswahl des Regelmodus in beiden Lademodi. Die Auswahl beeinflusst den Regelpunkt und die Berechnung des Ladestroms. Es gelingt ja nicht den Übergabepunkt exakt auf 0 zu regeln, mit dieser Einstellung wurd nun konfiguriert ob eher etwas Einspeisung (Netzbezug vermeiden) oder eher etwas Netzbezug (Eigenverbrauch maximieren) erfolgen soll.
From 9539b21602650dcc3a578ad8ab51a4bbc89b9526 Mon Sep 17 00:00:00 2001 From: MartinRinas Date: Sat, 22 Oct 2022 22:46:15 +0200 Subject: [PATCH 006/201] fix typo --- web/settings/pvconfig.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/settings/pvconfig.html b/web/settings/pvconfig.html index 6c58211e32..fcae758192 100644 --- a/web/settings/pvconfig.html +++ b/web/settings/pvconfig.html @@ -63,7 +63,7 @@

Einstellungen für PV- und Min+PV-Laden

manueller Regelpunkt
- Auswahl des Regelmodus in beiden Lademodi. Die Auswahl beeinflusst den Regelpunkt und die Berechnung des Ladestroms. Es gelingt ja nicht den Übergabepunkt exakt auf 0 zu regeln, mit dieser Einstellung wurd nun konfiguriert ob eher etwas Einspeisung (Netzbezug vermeiden) oder eher etwas Netzbezug (Eigenverbrauch maximieren) erfolgen soll. + Auswahl des Regelmodus in beiden Lademodi. Die Auswahl beeinflusst den Regelpunkt und die Berechnung des Ladestroms. Es gelingt ja nicht den Übergabepunkt exakt auf 0 zu regeln, mit dieser Einstellung wird nun konfiguriert ob eher etwas Einspeisung (Netzbezug vermeiden) oder eher etwas Netzbezug (Eigenverbrauch maximieren) erfolgen soll.
From 9e26d68fd80c68943b5f4d65b74bb4f5185bcd0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mo=C3=9Fner?= Date: Wed, 3 Nov 2021 12:22:13 +0100 Subject: [PATCH 007/201] fix/beautify log output --- modules/smarthome/http/on.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/smarthome/http/on.py b/modules/smarthome/http/on.py index f263714443..a28a231078 100644 --- a/modules/smarthome/http/on.py +++ b/modules/smarthome/http/on.py @@ -22,6 +22,6 @@ f = open( file_string , 'a') else: f = open( file_string , 'w') -print ('%s devicenr %s url %s)' % (time_string,devicenumber,url),file=f) +print ('%s devicenr %s url %s' % (time_string,devicenumber,url),file=f) f.close() urllib.request.urlopen(url, timeout=5) \ No newline at end of file From 10050456ad2c82165ea02ad9678143df9ceebf48 Mon Sep 17 00:00:00 2001 From: benderl Date: Thu, 27 Oct 2022 12:06:09 +0200 Subject: [PATCH 008/201] update description "Regelmodus" --- web/settings/pvconfig.html | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/web/settings/pvconfig.html b/web/settings/pvconfig.html index fcae758192..295368f894 100644 --- a/web/settings/pvconfig.html +++ b/web/settings/pvconfig.html @@ -63,7 +63,10 @@

Einstellungen für PV- und Min+PV-Laden

manueller Regelpunkt
- Auswahl des Regelmodus in beiden Lademodi. Die Auswahl beeinflusst den Regelpunkt und die Berechnung des Ladestroms. Es gelingt ja nicht den Übergabepunkt exakt auf 0 zu regeln, mit dieser Einstellung wird nun konfiguriert ob eher etwas Einspeisung (Netzbezug vermeiden) oder eher etwas Netzbezug (Eigenverbrauch maximieren) erfolgen soll. + + Auswahl des Regelmodus in beiden Lademodi. Die Auswahl beeinflusst den Regelpunkt und die Berechnung des Ladestroms. + Es ist technisch nicht möglich, den Übergabepunkt exakt auf 0 zu regeln. Mit dieser Einstellung wird festgelegt, ob eher etwas Einspeisung (Netzbezug vermeiden) oder Netzbezug (Eigenverbrauch maximieren) erfolgen soll. +
From f72ba73d90e3a51cd69b04c9a76828f261589c5f Mon Sep 17 00:00:00 2001 From: Lutz Bender Date: Thu, 27 Oct 2022 12:17:24 +0200 Subject: [PATCH 009/201] fix flake8 color theme --- web/themes/colors/settings.css | 2 +- web/themes/colors/theme.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/web/themes/colors/settings.css b/web/themes/colors/settings.css index 9b05803704..87637b9a85 100644 --- a/web/themes/colors/settings.css +++ b/web/themes/colors/settings.css @@ -84,7 +84,7 @@ pre { body { background-color: var(--color-bg); - color: var(--color-fg); + color: var(--color-fg); } input, select { diff --git a/web/themes/colors/theme.html b/web/themes/colors/theme.html index 05ab7e55f2..66628f2bdd 100644 --- a/web/themes/colors/theme.html +++ b/web/themes/colors/theme.html @@ -1149,4 +1149,4 @@

Lademodus-Auswahl

- \ No newline at end of file + From 50bb28bc534c495fd573d88912f85458b8f32d68 Mon Sep 17 00:00:00 2001 From: LKuemmel Date: Thu, 27 Oct 2022 14:48:23 +0200 Subject: [PATCH 010/201] JSON: fix missing queries --- packages/modules/json/bat.py | 2 +- packages/modules/json/config.py | 11 ++++++++--- packages/modules/json/counter.py | 2 +- packages/modules/json/device.py | 6 ++++-- packages/modules/json/inverter.py | 2 +- 5 files changed, 15 insertions(+), 8 deletions(-) diff --git a/packages/modules/json/bat.py b/packages/modules/json/bat.py index c482f2a47c..3db2b9489b 100644 --- a/packages/modules/json/bat.py +++ b/packages/modules/json/bat.py @@ -29,7 +29,7 @@ def update(self, response) -> None: else: soc = 0 - if config.jq_imported != "" and config.jq_exported != "": + if config.jq_imported is not None and config.jq_exported is not None: imported = jq.compile(config.jq_imported).input(response).first() exported = jq.compile(config.jq_exported).input(response).first() else: diff --git a/packages/modules/json/config.py b/packages/modules/json/config.py index 2905452687..645a58ec18 100644 --- a/packages/modules/json/config.py +++ b/packages/modules/json/config.py @@ -1,3 +1,4 @@ +from typing import Optional from modules.common.component_setup import ComponentSetup @@ -19,7 +20,11 @@ def __init__(self, class JsonBatConfiguration: - def __init__(self, jq_imported=None, jq_exported=None, jq_soc=None, jq_power=None,): + def __init__(self, + jq_imported: Optional[str] = None, + jq_exported: Optional[str] = None, + jq_soc: str = "", + jq_power: str = ""): self.jq_imported = jq_imported self.jq_exported = jq_exported self.jq_soc = jq_soc @@ -36,7 +41,7 @@ def __init__(self, class JsonCounterConfiguration: - def __init__(self, jq_power=None, jq_exported=None, jq_imported=None,): + def __init__(self, jq_power: str = "", jq_exported: Optional[str] = None, jq_imported: Optional[str] = None): self.jq_power = jq_power self.jq_exported = jq_exported self.jq_imported = jq_imported @@ -52,7 +57,7 @@ def __init__(self, class JsonInverterConfiguration: - def __init__(self, jq_power=None, jq_exported=None): + def __init__(self, jq_power: str = "", jq_exported: Optional[str] = None): self.jq_power = jq_power self.jq_exported = jq_exported diff --git a/packages/modules/json/counter.py b/packages/modules/json/counter.py index f0e9e3ef06..ff50844526 100644 --- a/packages/modules/json/counter.py +++ b/packages/modules/json/counter.py @@ -25,7 +25,7 @@ def update(self, response): power = jq.compile(config.jq_power).input(response).first() # ToDo: add current or power per phase - if config.jq_imported == "" or config.jq_exported == "": + if config.jq_exported is None or config.jq_exported is None: imported, exported = self.__sim_counter.sim_count(power) else: imported = jq.compile(config.jq_imported).input(response).first() diff --git a/packages/modules/json/device.py b/packages/modules/json/device.py index a7c11adb72..ca26a41fed 100644 --- a/packages/modules/json/device.py +++ b/packages/modules/json/device.py @@ -86,14 +86,16 @@ def read_legacy_bat(ip_address: str, jq_power: str, jq_soc: str): def read_legacy_counter(ip_address: str, jq_power: str, jq_imported: str, jq_exported: str): - config = JsonCounterConfiguration(jq_power=jq_power, jq_imported=jq_imported, jq_exported=jq_exported) + config = JsonCounterConfiguration(jq_power=jq_power, + jq_imported=None if jq_imported == "" else jq_imported, + jq_exported=None if jq_exported == "" else jq_exported) read_legacy( ip_address, counter.component_descriptor.configuration_factory(id=None, configuration=config)) def read_legacy_inverter(ip_address: str, jq_power: str, jq_exported: str, num: int): - config = JsonInverterConfiguration(jq_power=jq_power, jq_exported=jq_exported) + config = JsonInverterConfiguration(jq_power=jq_power, jq_exported=None if jq_exported == "" else jq_exported) read_legacy(ip_address, inverter.component_descriptor.configuration_factory(id=num, configuration=config)) diff --git a/packages/modules/json/inverter.py b/packages/modules/json/inverter.py index 853405c392..da71d20bec 100644 --- a/packages/modules/json/inverter.py +++ b/packages/modules/json/inverter.py @@ -26,7 +26,7 @@ def update(self, response) -> None: power = float(jq.compile(config.jq_power).input(response).first()) if power >= 0: power = power * -1 - if config.jq_exported == "": + if config.jq_exported is None: _, exported = self.__sim_counter.sim_count(power) else: exported = jq.compile(config.jq_exported).input(response).first() From 2351c4ba311cf9949a39e0d8fe238fed1ba3d147 Mon Sep 17 00:00:00 2001 From: Yannik Hampe Date: Tue, 18 Oct 2022 21:49:09 +0200 Subject: [PATCH 011/201] use ConfigurableDevice for json module to shorten and simplify code --- .github/workflows/github-actions-python.yml | 2 +- .../modules/common/configurable_device.py | 8 +- packages/modules/conftest.py | 1 - packages/modules/json/device.py | 85 ++++++------------- packages/modules/json/device_test.py | 42 +++++++++ 5 files changed, 78 insertions(+), 60 deletions(-) create mode 100644 packages/modules/json/device_test.py diff --git a/.github/workflows/github-actions-python.yml b/.github/workflows/github-actions-python.yml index a13fa9b689..c23407ca82 100644 --- a/.github/workflows/github-actions-python.yml +++ b/.github/workflows/github-actions-python.yml @@ -16,7 +16,7 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip - pip install flake8 pytest paho-mqtt requests-mock + pip install flake8 pytest paho-mqtt requests-mock jq - name: Flake8 with annotations uses: TrueBrain/actions-flake8@v2.1 with: diff --git a/packages/modules/common/configurable_device.py b/packages/modules/common/configurable_device.py index 1e75acb751..5689c7625c 100644 --- a/packages/modules/common/configurable_device.py +++ b/packages/modules/common/configurable_device.py @@ -48,7 +48,13 @@ def __call__(self, component_config: T_COMPONENT_CONFIG) -> T_COMPONENT: raise Exception( "Unknown component type <%s>, known types are: <%s>", e, ','.join(self.__type_to_factory.keys()) ) - required_type, = inspect.getfullargspec(factory).annotations.values() + arg_spec = inspect.getfullargspec(factory) + if len(arg_spec.args) != 1: + raise Exception( + "Expected function with single argument, however factory for %s has args: %s" % + (component_type, arg_spec.args) + ) + required_type = arg_spec.annotations[arg_spec.args[0]] return factory(dataclass_from_dict(required_type, component_config)) diff --git a/packages/modules/conftest.py b/packages/modules/conftest.py index e400df9ed5..865b93fc4b 100644 --- a/packages/modules/conftest.py +++ b/packages/modules/conftest.py @@ -5,7 +5,6 @@ from modules.common import simcount -sys.modules['jq'] = type(sys)('jq') sys.modules['pymodbus'] = type(sys)('pymodbus') module = type(sys)('pymodbus.client.sync') diff --git a/packages/modules/json/device.py b/packages/modules/json/device.py index ca26a41fed..0920939d9c 100644 --- a/packages/modules/json/device.py +++ b/packages/modules/json/device.py @@ -1,13 +1,13 @@ #!/usr/bin/env python3 import logging -from typing import Dict, List, Union +from typing import List, Union, Iterable -from dataclass_utils import dataclass_from_dict from helpermodules.cli import run_using_positional_cli_args from modules.common import req -from modules.common.abstract_device import AbstractDevice, DeviceDescriptor -from modules.common.component_context import MultiComponentUpdateContext +from modules.common.abstract_device import DeviceDescriptor +from modules.common.configurable_device import ConfigurableDevice, ComponentFactoryByType, MultiComponentUpdater from modules.json import bat, counter, inverter +from modules.json.bat import JsonBat from modules.json.config import (Json, JsonBatConfiguration, JsonBatSetup, @@ -16,66 +16,37 @@ JsonCounterSetup, JsonInverterConfiguration, JsonInverterSetup) +from modules.json.counter import JsonCounter +from modules.json.inverter import JsonInverter log = logging.getLogger(__name__) +JsonComponent = Union[JsonBat, JsonCounter, JsonInverter] -json_component_classes = Union[bat.JsonBat, counter.JsonCounter, inverter.JsonInverter] - - -class Device(AbstractDevice): - COMPONENT_TYPE_TO_CLASS = { - "bat": bat.JsonBat, - "counter": counter.JsonCounter, - "inverter": inverter.JsonInverter - } - - def __init__(self, device_config: Union[Dict, Json]) -> None: - self.components = {} # type: Dict[str, json_component_classes] - try: - self.device_config = dataclass_from_dict(Json, device_config) - except Exception: - log.exception("Fehler im Modul "+self.device_config.name) - - def add_component(self, component_config: Union[Dict, JsonBatSetup, JsonCounterSetup, JsonInverterSetup]) -> None: - if isinstance(component_config, Dict): - component_type = component_config["type"] - else: - component_type = component_config.type - component_config = dataclass_from_dict(COMPONENT_TYPE_TO_MODULE[ - component_type].component_descriptor.configuration_factory, component_config) - if component_type in self.COMPONENT_TYPE_TO_CLASS: - self.components["component"+str(component_config.id)] = self.COMPONENT_TYPE_TO_CLASS[component_type]( - self.device_config.id, component_config) - else: - raise Exception( - "illegal component type " + component_type + ". Allowed values: " + - ','.join(self.COMPONENT_TYPE_TO_CLASS.keys()) - ) - - def update(self) -> None: - log.debug("Start device reading " + str(self.components)) - if self.components: - with MultiComponentUpdateContext(self.components): - response = req.get_http_session().get(self.device_config.configuration.url, timeout=5) - for component in self.components: - self.components[component].update(response.json()) - else: - log.warning( - self.device_config.name + - ": Es konnten keine Werte gelesen werden, da noch keine Komponenten konfiguriert wurden." - ) - - -COMPONENT_TYPE_TO_MODULE = { - "bat": bat, - "counter": counter, - "inverter": inverter -} +def create_device(device_config: Json): + def create_bat(component_config: JsonBatSetup) -> JsonBat: + return JsonBat(device_config.id, component_config) + + def create_counter(component_config: JsonCounterSetup) -> JsonCounter: + return JsonCounter(device_config.id, component_config) + + def create_inverter(component_config: JsonInverterSetup) -> JsonInverter: + return JsonInverter(device_config.id, component_config) + + def update_components(components: Iterable[JsonComponent]): + response = req.get_http_session().get(device_config.configuration.url, timeout=5).json() + for component in components: + component.update(response) + + return ConfigurableDevice( + device_config, + component_factory=ComponentFactoryByType(bat=create_bat, counter=create_counter, inverter=create_inverter), + component_updater=MultiComponentUpdater(update_components) + ) def read_legacy(url: str, component_config: Union[JsonBatSetup, JsonCounterSetup, JsonInverterSetup]) -> None: - dev = Device(Json(configuration=JsonConfiguration(url=url))) + dev = create_device(Json(configuration=JsonConfiguration(url=url))) dev.add_component(component_config) dev.update() diff --git a/packages/modules/json/device_test.py b/packages/modules/json/device_test.py new file mode 100644 index 0000000000..c630ee7b72 --- /dev/null +++ b/packages/modules/json/device_test.py @@ -0,0 +1,42 @@ +from unittest.mock import Mock + +import pytest +import requests_mock + +from modules.common.fault_state import FaultState +from modules.json import bat, counter, inverter +from modules.json.config import Json, JsonConfiguration, JsonBatSetup, JsonBatConfiguration, \ + JsonInverterConfiguration, JsonInverterSetup, JsonCounterSetup, JsonCounterConfiguration +from modules.json.device import create_device + + +@pytest.fixture +def mock_value_store(monkeypatch): + mock_value_store = Mock() + mock_value_store_factory = Mock(return_value=mock_value_store) + monkeypatch.setattr(bat, "get_bat_value_store", mock_value_store_factory) + monkeypatch.setattr(counter, "get_counter_value_store", mock_value_store_factory) + monkeypatch.setattr(inverter, "get_inverter_value_store", mock_value_store_factory) + return mock_value_store + + +@pytest.mark.parametrize("component_config,expected_power", [ + pytest.param(JsonBatSetup(configuration=JsonBatConfiguration(jq_power=".some_value")), 42.0, id="bat"), + pytest.param(JsonCounterSetup(configuration=JsonCounterConfiguration(jq_power=".some_value")), 42.0, id="counter"), + pytest.param(JsonInverterSetup(configuration=JsonInverterConfiguration(jq_power=".some_value")), -42.0, id="pv"), +]) +def test_device(monkeypatch, mock_value_store: Mock, requests_mock: requests_mock.Mocker, component_config, + expected_power: float): + # setup + monkeypatch.setattr(FaultState, "store_error", Mock()) + requests_mock.get("http://sample_host/sample_path", json={"some_value": 42}) + device_config = Json(configuration=JsonConfiguration("http://sample_host/sample_path")) + + # execution + device = create_device(device_config) + device.add_component(component_config) + device.update() + + # evaluation + assert len(mock_value_store.set.mock_calls) == 1 + assert mock_value_store.set.call_args[0][0].power == expected_power From 390b49d89189d351aa9b69a293c2f34647965d0c Mon Sep 17 00:00:00 2001 From: okaegi Date: Thu, 27 Oct 2022 18:11:49 +0200 Subject: [PATCH 012/201] Ratiotherm WP und ndeuen Dac type MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Erster openwb driver für die Wärmepumpe ratiotherm. Der Anschluss wird über modbus RTU mit ELFIN-EE11 auf can-ze3 gemacht. Dac driver mit typ ergänzt --- modules/smarthome/nxdacxx/watt.py | 15 ++- modules/smarthome/ratiotherm/off.py | 40 +++++++ modules/smarthome/ratiotherm/on.py | 33 ++++++ modules/smarthome/ratiotherm/watt.py | 107 ++++++++++++++++++ runs/mqttsub.py | 8 +- runs/smarthomemq.py | 3 + runs/usmarthome/smartnxdacxx.py | 10 +- runs/usmarthome/smartratiotherm.py | 51 +++++++++ web/settings/smarthomeconfig.php | 28 ++++- .../topicsToSubscribe_smarthomeconfig.js | 1 + 10 files changed, 283 insertions(+), 13 deletions(-) create mode 100644 modules/smarthome/ratiotherm/off.py create mode 100644 modules/smarthome/ratiotherm/on.py create mode 100644 modules/smarthome/ratiotherm/watt.py create mode 100644 runs/usmarthome/smartratiotherm.py diff --git a/modules/smarthome/nxdacxx/watt.py b/modules/smarthome/nxdacxx/watt.py index 75c7aeef27..9231eb2656 100644 --- a/modules/smarthome/nxdacxx/watt.py +++ b/modules/smarthome/nxdacxx/watt.py @@ -12,6 +12,7 @@ maxpower = int(sys.argv[4]) forcesend = int(sys.argv[5]) port = int(sys.argv[6]) +dactyp = int(sys.argv[7]) # forcesend = 0 default acthor time period applies # forcesend = 1 default overwritten send now # forcesend = 9 default overwritten no send @@ -83,12 +84,18 @@ # modbus write if modbuswrite == 1: client = ModbusTcpClient(ipadr, port=port) - volt = int((neupower * 1000) / maxpower) - rq = client.write_register(1, volt, unit=1) + if dactyp == 0: + # 10 Volts are 1000 + volt = int((neupower * 1000) / maxpower) + rq = client.write_register(1, volt, unit=1) + else: + # 10 volts are 4000 + volt = int((neupower * 4000) / maxpower) + rq = client.write_register(0x01f4, volt, unit=1) if count1 < 3: with open(file_string, 'a') as f: - print('%s devicenr %s ipadr %s Volt %6d written by modbus ' % - (time_string, devicenumber, ipadr, volt), file=f) + print('%s devicenr %s ipadr %s Volt %6d dactyp %d written by modbus ' % + (time_string, devicenumber, ipadr, volt, dactyp), file=f) with open(file_stringcount, 'w') as f: f.write(str(count1)) else: diff --git a/modules/smarthome/ratiotherm/off.py b/modules/smarthome/ratiotherm/off.py new file mode 100644 index 0000000000..98daf177b1 --- /dev/null +++ b/modules/smarthome/ratiotherm/off.py @@ -0,0 +1,40 @@ +#!/usr/bin/python3 +import sys +import os +import time + +named_tuple = time.localtime() # getstruct_time +time_string = time.strftime("%m/%d/%Y, %H:%M:%S ratiotherm off.py", named_tuple) +devicenumber = str(sys.argv[1]) +ipadr = str(sys.argv[2]) +uberschuss = int(sys.argv[3]) +bp = '/var/www/html/openWB/ramdisk/smarthome_device_' +# standard +file_string = bp + str(devicenumber) + '_ratiotherm.log' +file_stringpv = bp + str(devicenumber) + '_pv' +file_stringcount = bp + str(devicenumber) + '_count' +if os.path.isfile(file_string): + pass +else: + with open(file_string, 'w') as f: + print('ratiotherm start log', file=f) +with open(file_string, 'a') as f: + print('%s devicenr %s ipadr %s ueberschuss %6d try to connect (modbus)' + % (time_string, devicenumber, ipadr, uberschuss), file=f) +aktpower = 0 +with open(file_string, 'a') as f: + print('%s devicenr %s ipadr %s Akt Leistung %6d' + % (time_string, devicenumber, ipadr, aktpower), file=f) +pvmodus = 0 +if os.path.isfile(file_stringpv): + with open(file_stringpv, 'r') as f: + pvmodus = int(f.read()) +# wenn vorher pvmodus an, dann watt.py +# signaliseren einmalig 0 ueberschuss zu schicken +if pvmodus == 1: + pvmodus = 99 +with open(file_stringpv, 'w') as f: + f.write(str(pvmodus)) +count1 = 999 +with open(file_stringcount, 'w') as f: + f.write(str(count1)) diff --git a/modules/smarthome/ratiotherm/on.py b/modules/smarthome/ratiotherm/on.py new file mode 100644 index 0000000000..3284482859 --- /dev/null +++ b/modules/smarthome/ratiotherm/on.py @@ -0,0 +1,33 @@ +#!/usr/bin/python3 +import sys +import os +import time +named_tuple = time.localtime() # getstruct_time +time_string = time.strftime("%m/%d/%Y, %H:%M:%S ratiotherm on.py", named_tuple) +devicenumber = str(sys.argv[1]) +ipadr = str(sys.argv[2]) +uberschuss = int(sys.argv[3]) +bp = '/var/www/html/openWB/ramdisk/smarthome_device_' +# standard +# lesen +# own log +file_string = bp + str(devicenumber) + '_ratiotherm.log' +file_stringpv = bp + str(devicenumber) + '_pv' +file_stringcount = bp + str(devicenumber) + '_count' +if os.path.isfile(file_string): + pass +else: + with open(file_string, 'w') as f: + print('ratiotherm start log', file=f) +with open(file_string, 'a') as f: + print('%s devicenr %s ipadr %s ueberschuss %6d try to connect (modbus)' + % (time_string, devicenumber, ipadr, uberschuss), file=f) +aktpower = 0 +with open(file_string, 'a') as f: + print('%s devicenr %s ipadr %s Akt Leistung %6d ' % + (time_string, devicenumber, ipadr, aktpower), file=f) +with open(file_stringpv, 'w') as f: + f.write(str(1)) +count1 = 999 +with open(file_stringcount, 'w') as f: + f.write(str(count1)) diff --git a/modules/smarthome/ratiotherm/watt.py b/modules/smarthome/ratiotherm/watt.py new file mode 100644 index 0000000000..276f1776e8 --- /dev/null +++ b/modules/smarthome/ratiotherm/watt.py @@ -0,0 +1,107 @@ +#!/usr/bin/python3 +import sys +import os +import time +import json +from pymodbus.payload import BinaryPayloadBuilder, Endian +from pymodbus.client.sync import ModbusTcpClient +named_tuple = time.localtime() # getstruct_time +time_string = time.strftime("%m/%d/%Y, %H:%M:%S ratiotherm watty.py", named_tuple) +devicenumber = str(sys.argv[1]) +ipadr = str(sys.argv[2]) +uberschuss = int(sys.argv[3]) +forcesend = int(sys.argv[4]) +# forcesend = 0 default acthor time period applies +# forcesend = 1 default overwritten send now +# forcesend = 9 default overwritten no send +bp = '/var/www/html/openWB/ramdisk/smarthome_device_' +file_string = bp + str(devicenumber) + '_ratiotherm.log' +file_stringpv = bp + str(devicenumber) + '_pv' +file_stringcount = bp + str(devicenumber) + '_count' +file_stringcount5 = bp + str(devicenumber) + '_count5' +count5 = 999 +modbuswrite = 0 +neupower = 0 +if os.path.isfile(file_stringcount5): + with open(file_stringcount5, 'r') as f: + count5 = int(f.read()) +if (forcesend == 0): + count5 = count5 + 1 +elif (forcesend == 1): + count5 = 999 +else: + count5 = 1 +if count5 > 3: + count5 = 0 +with open(file_stringcount5, 'w') as f: + f.write(str(count5)) +# pv modus +pvmodus = 0 +if os.path.isfile(file_stringpv): + with open(file_stringpv, 'r') as f: + pvmodus = int(f.read()) +aktpower = 0 +if count5 == 0: + # log counter + count1 = 999 + if os.path.isfile(file_stringcount): + with open(file_stringcount, 'r') as f: + count1 = int(f.read()) + count1 = count1+1 + if count1 > 80: + count1 = 0 + with open(file_stringcount, 'w') as f: + f.write(str(count1)) + # logik nur schicken bei pvmodus + if pvmodus == 1: + modbuswrite = 1 + neupower = uberschuss + if neupower < 0: + neupower = 0 + if neupower > 32767: + neupower = 32767 + # wurde ratiotherm gerade ausgeschaltet ? (pvmodus == 99 ?) + # dann 0 schicken wenn kein pvmodus mehr + # und pv modus ausschalten + if pvmodus == 99: + modbuswrite = 1 + neupower = 0 + pvmodus = 0 + with open(file_stringpv, 'w') as f: + f.write(str(pvmodus)) + if count1 < 3: + if os.path.isfile(file_string): + pass + else: + with open(file_string, 'w') as f: + print('ratiotherm start log', file=f) + with open(file_string, 'a') as f: + print('%s Nr %s ipadr %s ueberschuss %6d Akt Leistung %6d' + % (time_string, devicenumber, ipadr, uberschuss, aktpower), + file=f) + print('%s Nr %s ipadr %s neupower %6d pvmodus %1d modbusw %1d' + % (time_string, devicenumber, ipadr, neupower, pvmodus, + modbuswrite), file=f) + # modbus write + if modbuswrite == 1: + # andernfalls absturz bei negativen Zahlen + builder = BinaryPayloadBuilder(byteorder=Endian.Big) + builder.reset() + builder.add_16bit_int(neupower) + pay = builder.to_registers() + client = ModbusTcpClient(ipadr, port=502) + client.write_register(100, pay[0], unit=1) + if count1 < 3: + with open(file_string, 'a') as f: + print('%s devicenr %s ipadr %s written %6d %#4X' % + (time_string, devicenumber, ipadr, pay[0], pay[0]), + file=f) +else: + if pvmodus == 99: + pvmodus = 0 +answer = '{"power":' + str(aktpower) + ',"powerc":0' +answer += ',"send":' + str(modbuswrite) + ',"sendpower":' + str(neupower) +answer += ',"on":' + str(pvmodus) + '}' +with open('/var/www/html/openWB/ramdisk/smarthome_device_ret' + + str(devicenumber), 'w') as f1: + json.dump(answer, f1) diff --git a/runs/mqttsub.py b/runs/mqttsub.py index 4cafcfad81..4135eb2f22 100755 --- a/runs/mqttsub.py +++ b/runs/mqttsub.py @@ -140,6 +140,11 @@ def on_message(client, userdata, msg): if ( 1 <= int(devicenumb) <= numberOfSupportedDevices and 0 <= int(msg.payload) <= 6): writetoconfig(shconfigfile,'smarthomedevices','device_chan_'+str(devicenumb),msg.payload.decode("utf-8")) client.publish("openWB/config/get/SmartHome/Devices/"+str(devicenumb)+"/device_chan", msg.payload.decode("utf-8"), qos=0, retain=True) + if (( "openWB/config/set/SmartHome/Device" in msg.topic) and ("device_nxdacxxtype" in msg.topic)): + devicenumb=re.sub(r'\D', '', msg.topic) + if ( 1 <= int(devicenumb) <= numberOfSupportedDevices and 0 <= int(msg.payload) <= 2): + writetoconfig(shconfigfile,'smarthomedevices','device_nxdacxxtype_'+str(devicenumb),msg.payload.decode("utf-8")) + client.publish("openWB/config/get/SmartHome/Devices/"+str(devicenumb)+"/device_nxdacxxtype", msg.payload.decode("utf-8"), qos=0, retain=True) if (( "openWB/config/set/SmartHome/Device" in msg.topic) and ("device_measchan" in msg.topic)): devicenumb=re.sub(r'\D', '', msg.topic) if ( 1 <= int(devicenumb) <= numberOfSupportedDevices and 0 <= int(msg.payload) <= 6): @@ -179,7 +184,8 @@ def on_message(client, userdata, msg): client.publish("openWB/config/get/SmartHome/Devices/"+str(devicenumb)+"/device_name", msg.payload.decode("utf-8"), qos=0, retain=True) if (( "openWB/config/set/SmartHome/Device" in msg.topic) and ("device_type" in msg.topic)): devicenumb=re.sub(r'\D', '', msg.topic) - validDeviceTypes = ['none','shelly','tasmota','acthor','lambda','elwa','idm','vampair','stiebel','http','avm','mystrom','viessmann','mqtt','NXDACXX','pyt'] # 'pyt' is deprecated and will be removed! + validDeviceTypes = ['none','shelly','tasmota','acthor','lambda','elwa','idm','vampair','stiebel','http','avm','mystrom','viessmann','mqtt','NXDACXX', + 'ratiotherm','pyt'] # 'pyt' is deprecated and will be removed! if ( 1 <= int(devicenumb) <= numberOfSupportedDevices and len(str(msg.payload.decode("utf-8"))) > 2): try: # just check vor payload in list, deviceTypeIndex is not used diff --git a/runs/smarthomemq.py b/runs/smarthomemq.py index 9e20f9e757..af4cd6400b 100755 --- a/runs/smarthomemq.py +++ b/runs/smarthomemq.py @@ -21,6 +21,7 @@ from usmarthome.smartlambda import Slambda from usmarthome.smarttasmota import Stasmota from usmarthome.smartviessmann import Sviessmann +from usmarthome.smartratiotherm import Sratiotherm mqtt_cache = {} mydevices = [] @@ -343,6 +344,8 @@ def update_devices(): mydevice = Svampair() elif (device_type == 'lambda'): mydevice = Slambda() + elif (device_type == 'ratiotherm'): + mydevice = Sratiotherm() elif (device_type == 'tasmota'): mydevice = Stasmota() elif (device_type == 'avm'): diff --git a/runs/usmarthome/smartnxdacxx.py b/runs/usmarthome/smartnxdacxx.py index a0a0d654cd..6025a7bce6 100644 --- a/runs/usmarthome/smartnxdacxx.py +++ b/runs/usmarthome/smartnxdacxx.py @@ -11,6 +11,7 @@ def __init__(self): print('__init__ Snxdacxx executed') self._smart_paramadd = {} self._device_nxdacxxueb = 0 + self._device_nxdacxxtype = 0 self.device_nummer = 0 self._dynregel = 1 @@ -28,6 +29,8 @@ def updatepar(self, input_param): pass elif (key == 'device_nxdacxxueb'): self._device_nxdacxxueb = valueint + elif (key == 'device_nxdacxxtype'): + self._device_nxdacxxtype = valueint else: log.warning("(" + str(self.device_nummer) + ") " + __class__.__name__ + " überlesen " + key + @@ -40,7 +43,8 @@ def getwatt(self, uberschuss, uberschussoffset): str(self.device_nummer), str(self._device_ip), str(self.devuberschuss), str(self._device_nxdacxxueb), str(forcesend), - str(self._device_dacport)] + str(self._device_dacport), + str(self._device_nxdacxxtype)] try: self.proc = subprocess.Popen(argumentList) self.proc.communicate() @@ -52,7 +56,7 @@ def getwatt(self, uberschuss, uberschussoffset): except Exception as e1: log.warning("(" + str(self.device_nummer) + ") Leistungsmessung %s %d %s Fehlermeldung: %s " - % ('n4dac02 ', self.device_nummer, + % (' Dac ', self.device_nummer, str(self._device_ip), str(e1))) self.postwatt() @@ -71,5 +75,5 @@ def turndevicerelais(self, zustand, ueberschussberechnung, updatecnt): except Exception as e1: log.warning("(" + str(self.device_nummer) + ") on / off %s %d %s Fehlermeldung: %s " - % ('n4dac02 ', self.device_nummer, + % ('Dac ', self.device_nummer, str(self._device_ip), str(e1))) diff --git a/runs/usmarthome/smartratiotherm.py b/runs/usmarthome/smartratiotherm.py new file mode 100644 index 0000000000..b424dc4baf --- /dev/null +++ b/runs/usmarthome/smartratiotherm.py @@ -0,0 +1,51 @@ +#!/usr/bin/python3 +from usmarthome.smartbase import Sbase +from usmarthome.global0 import log +import subprocess + + +class Sratiotherm(Sbase): + def __init__(self): + # setting + super().__init__() + print('__init__ Sratiotherm executed') + + def getwatt(self, uberschuss, uberschussoffset): + self.prewatt(uberschuss, uberschussoffset) + forcesend = self.checkbefsend() + argumentList = ['python3', self._prefixpy + 'ratiotherm/watt.py', + str(self.device_nummer), str(self._device_ip), + str(self.devuberschuss), + str(forcesend)] + try: + self.proc = subprocess.Popen(argumentList) + self.proc.communicate() + self.answer = self.readret() + self.newwatt = int(self.answer['power']) + self.newwattk = int(self.answer['powerc']) + self.relais = int(self.answer['on']) + self.checksend(self.answer) + except Exception as e1: + log.warning("(" + str(self.device_nummer) + + ") Leistungsmessung %s %d %s Fehlermeldung: %s " + % ('ratiotherm', self.device_nummer, + str(self._device_ip), str(e1))) + self.postwatt() + + def turndevicerelais(self, zustand, ueberschussberechnung, updatecnt): + self.preturn(zustand, ueberschussberechnung, updatecnt) + if (zustand == 1): + pname = "/on.py" + else: + pname = "/off.py" + argumentList = ['python3', self._prefixpy + 'ratiotherm' + pname, + str(self.device_nummer), str(self._device_ip), + str(self.devuberschuss)] + try: + self.proc = subprocess.Popen(argumentList) + self.proc.communicate() + except Exception as e1: + log.warning("(" + str(self.device_nummer) + + ") on / off %s %d %s Fehlermeldung: %s " + % ('ratiotherm', self.device_nummer, + str(self._device_ip), str(e1))) diff --git a/web/settings/smarthomeconfig.php b/web/settings/smarthomeconfig.php index 2a4b4f9fd0..4cb4ddb551 100644 --- a/web/settings/smarthomeconfig.php +++ b/web/settings/smarthomeconfig.php @@ -85,8 +85,9 @@ - + + @@ -131,10 +132,15 @@ openWB/SmartHome/set/Devices/4/Ueberschuss = in Watt
- N4DAC02 angesteuert über Lan. Der anliegende Überschuss wird in eine Voltzahl zwischen 0.01V und 10.0V umgewandelt. Bezug wird als 0 Volt übertragen. + DAC angesteuert über Lan. Der anliegende Überschuss wird in eine Voltzahl zwischen 0.01V und 10.0V umgewandelt. Bezug wird als 0 Volt übertragen. Wenn die Einschaltbedingung erreicht ist wird alle 30 Sekunden der gerechnete Überschuss übertragen.
+ Der konkrete Dac Typ wird im Type definiert
Mit dem Parameter Updategerät kann eine abweichende Sekundenzahl angegeben werden.
 + + Ratiothem Wärmepumpe. Anschluss via Modbus RTU (Elfin-EE11) auf CAN-EZ3. + Das Feature befindet sich noch in der Entwicklung! + Vitalcal 200-s Wärmepumpe mit LON Kommunikationsmodul und Vitogate 300. Wenn die Einschaltbedingung erreicht ist wird Komfortfunktion "Einmalige Warmwasserbereitung" außerhalb des Zeitprogramms gestartet. Für die "Einmalige Warmwasserbereitung" wird der Warmwassertemperatur-Sollwert 2 genutzt. In der Wp kann eingestellt werden, ob für diese Funktion die Elektroheizung (Heizstab) benutzt werden soll. @@ -154,7 +160,7 @@ Die Ausschaltschwelle/ Ausschaltverzögerung in OpenWB ist sinnvoll zu wählen (z.B. 500 / 3) um die Regelung von IDM nicht zu stören. - Wärmepumpe der Firma Stiebel mit ISG Plus (Servicewelt über Modbus) und SG Ready Eingang.
+ Wärmepumpe der Firma Stiebel mit ISG (Servicewelt über Modbus) und SG Ready Eingang.
Im ISG web muss unter "Einstellungen / Energiemanagement" der Parameter "SGREADY = Ein" gesetzt werden. Wenn die Einschaltbedingung erreicht ist wird der Sg Ready Eingang von Betriebszustand 2 auf Betriebszustand 3 geschaltet. Wenn die Ausbedingung erreicht ist wird der Sg Ready Eingang von Betriebszustand 3 auf Betriebszustand 2 geschaltet. @@ -224,6 +230,18 @@ Maximaler Überschuss in Watt = v10.0. Es wird kein grösserer Wert übertragen.
+
+ +
+ + + Hier ist das installierte Modell auszuwählen. + +
+
@@ -234,7 +252,7 @@
-
+
@@ -349,7 +367,7 @@
-
+
diff --git a/web/settings/topicsToSubscribe_smarthomeconfig.js b/web/settings/topicsToSubscribe_smarthomeconfig.js index 971a0ab613..8dbded9fd7 100644 --- a/web/settings/topicsToSubscribe_smarthomeconfig.js +++ b/web/settings/topicsToSubscribe_smarthomeconfig.js @@ -74,6 +74,7 @@ var topicsToSubscribe = [ ["openWB/config/get/SmartHome/Devices/+/device_chan", 0], ["openWB/config/get/SmartHome/Devices/+/device_setauto", 0], ["openWB/config/get/SmartHome/Devices/+/device_lambdaueb", 0], + ["openWB/config/get/SmartHome/Devices/+/device_nxdacxxtype", 0], ["openWB/config/get/SmartHome/Devices/+/device_nxdacxxueb", 0], ["openWB/config/get/SmartHome/Devices/+/device_measuresmaage", 0] From 4f27a79725f82e1399976a2b9c09edbaf13abdcf Mon Sep 17 00:00:00 2001 From: okaegi Date: Thu, 27 Oct 2022 18:17:53 +0200 Subject: [PATCH 013/201] update spaces --- web/settings/smarthomeconfig.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/web/settings/smarthomeconfig.php b/web/settings/smarthomeconfig.php index 4cb4ddb551..6f8facdff9 100644 --- a/web/settings/smarthomeconfig.php +++ b/web/settings/smarthomeconfig.php @@ -245,10 +245,10 @@
- - - Standardeinstellungen:8899
- + + + Standardeinstellungen:8899
+
From 18e86267b75d3638260dc3658e6548a6674525ac Mon Sep 17 00:00:00 2001 From: okaegi Date: Thu, 27 Oct 2022 18:23:07 +0200 Subject: [PATCH 014/201] updated spaces..(2) --- web/settings/smarthomeconfig.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/web/settings/smarthomeconfig.php b/web/settings/smarthomeconfig.php index 6f8facdff9..8b348d3458 100644 --- a/web/settings/smarthomeconfig.php +++ b/web/settings/smarthomeconfig.php @@ -535,7 +535,7 @@ -
@@ -577,7 +577,7 @@ -
-
+
jede volle Stunde / jede halbe Stunde prüfen oder ausschalten -
From 40c09d349af8977d2fbc555f43250251ffd72e17 Mon Sep 17 00:00:00 2001 From: LKuemmel Date: Mon, 31 Oct 2022 09:17:20 +0100 Subject: [PATCH 016/201] fix pv power if dc power is 0 --- packages/modules/solaredge/device.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/modules/solaredge/device.py b/packages/modules/solaredge/device.py index 9219f819cc..59a24537d6 100644 --- a/packages/modules/solaredge/device.py +++ b/packages/modules/solaredge/device.py @@ -219,7 +219,10 @@ def create_inverter(modbus_id: int) -> SolaredgeInverter: with dev.client: for inv in inverters: state = inv.read_state() - total_power += state.power + if state.dc_power == 0: + total_power += 0 + else: + total_power += state.power total_energy += state.exported total_currents = list(map(add, total_currents, state.currents)) From 42141a6ae855488157330394cf2f1d2b853ad03b Mon Sep 17 00:00:00 2001 From: Yannik Hampe Date: Mon, 31 Oct 2022 11:18:30 +0100 Subject: [PATCH 017/201] json module: make sure values retrieved are float. Be fail-fast if not. --- packages/modules/json/bat.py | 8 ++++---- packages/modules/json/counter.py | 6 +++--- packages/modules/json/inverter.py | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/modules/json/bat.py b/packages/modules/json/bat.py index 3db2b9489b..e1ab2c95e4 100644 --- a/packages/modules/json/bat.py +++ b/packages/modules/json/bat.py @@ -23,15 +23,15 @@ def __init__(self, device_id: int, component_config: Union[Dict, JsonBatSetup]) def update(self, response) -> None: config = self.component_config.configuration - power = jq.compile(config.jq_power).input(response).first() + power = float(jq.compile(config.jq_power).input(response).first()) if config.jq_soc != "": - soc = jq.compile(config.jq_soc).input(response).first() + soc = float(jq.compile(config.jq_soc).input(response).first()) else: soc = 0 if config.jq_imported is not None and config.jq_exported is not None: - imported = jq.compile(config.jq_imported).input(response).first() - exported = jq.compile(config.jq_exported).input(response).first() + imported = float(jq.compile(config.jq_imported).input(response).first()) + exported = float(jq.compile(config.jq_exported).input(response).first()) else: imported, exported = self.__sim_counter.sim_count(power) diff --git a/packages/modules/json/counter.py b/packages/modules/json/counter.py index ff50844526..93345362de 100644 --- a/packages/modules/json/counter.py +++ b/packages/modules/json/counter.py @@ -23,13 +23,13 @@ def __init__(self, device_id: int, component_config: Union[Dict, JsonCounterSetu def update(self, response): config = self.component_config.configuration - power = jq.compile(config.jq_power).input(response).first() + power = float(jq.compile(config.jq_power).input(response).first()) # ToDo: add current or power per phase if config.jq_exported is None or config.jq_exported is None: imported, exported = self.__sim_counter.sim_count(power) else: - imported = jq.compile(config.jq_imported).input(response).first() - exported = jq.compile(config.jq_exported).input(response).first() + imported = float(jq.compile(config.jq_imported).input(response).first()) + exported = float(jq.compile(config.jq_exported).input(response).first()) counter_state = CounterState( imported=imported, diff --git a/packages/modules/json/inverter.py b/packages/modules/json/inverter.py index da71d20bec..ab3c66c380 100644 --- a/packages/modules/json/inverter.py +++ b/packages/modules/json/inverter.py @@ -29,7 +29,7 @@ def update(self, response) -> None: if config.jq_exported is None: _, exported = self.__sim_counter.sim_count(power) else: - exported = jq.compile(config.jq_exported).input(response).first() + exported = float(jq.compile(config.jq_exported).input(response).first()) inverter_state = InverterState( power=power, From 9d0d82e5801effc2dcbeb2ba602f551ef348abbf Mon Sep 17 00:00:00 2001 From: LKuemmel Date: Mon, 31 Oct 2022 12:06:03 +0100 Subject: [PATCH 018/201] fix: cp num changes after daemon start --- runs/isss.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/runs/isss.py b/runs/isss.py index 58458ab48e..0d2b178577 100755 --- a/runs/isss.py +++ b/runs/isss.py @@ -49,11 +49,11 @@ class UpdateValues: def __init__(self, local_charge_point_num: int) -> None: self.local_charge_point_num_str = str(local_charge_point_num) - self.cp_num_str = str(Isss.get_cp_num(local_charge_point_num)) self.old_counter_state = None def update_values(self, counter_state: ChargepointState) -> None: self.parent_wb = Isss.get_parent_wb() + self.cp_num_str = str(Isss.get_cp_num(int(self.local_charge_point_num_str))) if self.old_counter_state: # iterate over counterstate vars_old_counter_state = vars(self.old_counter_state) @@ -242,7 +242,7 @@ def detect_modbus_usb_port(self) -> str: return "/dev/serial0" @staticmethod - def get_cp_num(local_charge_point_num) -> int: + def get_cp_num(local_charge_point_num: int) -> int: try: if local_charge_point_num == 1: return int(re.sub(r'\D', '', ramdisk_read("parentCPlp1"))) @@ -263,7 +263,7 @@ def get_parent_wb() -> str: class IsssChargepoint: - def __init__(self, serial_client, local_charge_point_num) -> None: + def __init__(self, serial_client: ModbusSerialClient_, local_charge_point_num: int) -> None: self.local_charge_point_num = local_charge_point_num if local_charge_point_num == 1: try: @@ -278,7 +278,7 @@ def __init__(self, serial_client, local_charge_point_num) -> None: self.update_state = UpdateState(self.module) self.old_plug_state = False - def update(self): + def update(self) -> None: def __thread_active(thread: Optional[threading.Thread]) -> bool: if thread: return thread.is_alive() From f867b3517c3549509e444f3cd8f49ad22d694b85 Mon Sep 17 00:00:00 2001 From: LKuemmel Date: Mon, 31 Oct 2022 12:32:37 +0100 Subject: [PATCH 019/201] Fix openWB Pro cp 4-8 --- loadvars.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/loadvars.sh b/loadvars.sh index e7af10f0a7..94f3c574ce 100755 --- a/loadvars.sh +++ b/loadvars.sh @@ -719,7 +719,7 @@ loadvars(){ if [[ "$evseconlp4" == "extopenwb" ]]; then timeout 3 modules/extopenwb/main.sh 4 "$chargep4ip" "$chargep4cp" || true elif [[ "$evseconlp4" == "owbpro" ]]; then - timeout 3 modules/owbpro/main.sh 4 "$chargep4ip" || true + timeout 3 modules/owbpro/main.sh 4 "$owbpro4ip" || true else timeout 3 modules/mpm3pmlllp4/main.sh || true fi @@ -759,7 +759,7 @@ loadvars(){ if [[ "$evseconlp5" == "extopenwb" ]]; then timeout 3 modules/extopenwb/main.sh 5 "$chargep5ip" "$chargep5cp" || true elif [[ "$evseconlp5" == "owbpro" ]]; then - timeout 3 modules/owbpro/main.sh 5 "$chargep5ip" || true + timeout 3 modules/owbpro/main.sh 5 "$owbpro5ip" || true else timeout 3 modules/mpm3pmlllp5/main.sh || true fi @@ -799,7 +799,7 @@ loadvars(){ if [[ "$evseconlp6" == "extopenwb" ]]; then timeout 3 modules/extopenwb/main.sh 6 "$chargep6ip" "$chargep6cp" || true elif [[ "$evseconlp6" == "owbpro" ]]; then - timeout 3 modules/owbpro/main.sh 6 "$chargep6ip" || true + timeout 3 modules/owbpro/main.sh 6 "$owbpro6ip" || true else timeout 3 modules/mpm3pmlllp6/main.sh || true fi @@ -839,7 +839,7 @@ loadvars(){ if [[ "$evseconlp7" == "extopenwb" ]]; then timeout 3 modules/extopenwb/main.sh 7 "$chargep7ip" "$chargep7cp" || true elif [[ "$evseconlp7" == "owbpro" ]]; then - timeout 3 modules/owbpro/main.sh 7 "$chargep7ip" || true + timeout 3 modules/owbpro/main.sh 7 "$owbpro7ip" || true else timeout 3 modules/mpm3pmlllp7/main.sh || true fi @@ -878,7 +878,7 @@ loadvars(){ if [[ "$evseconlp8" == "extopenwb" ]]; then timeout 3 modules/extopenwb/main.sh 8 "$chargep8ip" "$chargep8cp" || true elif [[ "$evseconlp8" == "owbpro" ]]; then - timeout 3 modules/owbpro/main.sh 8 "$chargep8ip" || true + timeout 3 modules/owbpro/main.sh 8 "$owbpro8ip" || true else timeout 3 modules/mpm3pmlllp8/main.sh || true fi From 2448e8bf21f2893dad7abc4418ef85d57cc99934 Mon Sep 17 00:00:00 2001 From: okaegi Date: Mon, 31 Oct 2022 18:06:05 +0100 Subject: [PATCH 020/201] =?UTF-8?q?logging=20=C3=BCber=20python=20logger?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Es wurde das für ratiotherm das python logging modul verwendet. Sofern die Anwendung okay ist, kann ich die anderen Geräte auch umstellen. Dafür habe ich ein zentrales SmartUtils.py geschrieben, welches dann in allen Smarthomegeräten angewendet wird. Da der PYTHONPATH bereits auf ..openWB/packages/ verweist, habe ich die smartutils.py im Verzeichnis ..openWB/packages/modules/common abgelegt so dass es im gesamten .../Smarthome/... Folder importiert werden kann --- modules/smarthome/ratiotherm/off.py | 23 +++++++------------- modules/smarthome/ratiotherm/on.py | 22 ++++++-------------- modules/smarthome/ratiotherm/watt.py | 30 +++++++++------------------ packages/modules/common/smartutils.py | 13 ++++++++++++ 4 files changed, 36 insertions(+), 52 deletions(-) create mode 100644 packages/modules/common/smartutils.py diff --git a/modules/smarthome/ratiotherm/off.py b/modules/smarthome/ratiotherm/off.py index 98daf177b1..b346440aa2 100644 --- a/modules/smarthome/ratiotherm/off.py +++ b/modules/smarthome/ratiotherm/off.py @@ -1,30 +1,21 @@ #!/usr/bin/python3 -import sys import os -import time +import sys +import logging +from modules.common.smartutils import initlog -named_tuple = time.localtime() # getstruct_time -time_string = time.strftime("%m/%d/%Y, %H:%M:%S ratiotherm off.py", named_tuple) devicenumber = str(sys.argv[1]) ipadr = str(sys.argv[2]) uberschuss = int(sys.argv[3]) bp = '/var/www/html/openWB/ramdisk/smarthome_device_' # standard -file_string = bp + str(devicenumber) + '_ratiotherm.log' file_stringpv = bp + str(devicenumber) + '_pv' file_stringcount = bp + str(devicenumber) + '_count' -if os.path.isfile(file_string): - pass -else: - with open(file_string, 'w') as f: - print('ratiotherm start log', file=f) -with open(file_string, 'a') as f: - print('%s devicenr %s ipadr %s ueberschuss %6d try to connect (modbus)' - % (time_string, devicenumber, ipadr, uberschuss), file=f) +initlog("ratiotherm", devicenumber) +log = logging.getLogger("ratiotherm") aktpower = 0 -with open(file_string, 'a') as f: - print('%s devicenr %s ipadr %s Akt Leistung %6d' - % (time_string, devicenumber, ipadr, aktpower), file=f) +log.info(" off devicenr %s ipadr %s ueberschuss %6d Akt Leistung %6d" + % (devicenumber, ipadr, uberschuss, aktpower)) pvmodus = 0 if os.path.isfile(file_stringpv): with open(file_stringpv, 'r') as f: diff --git a/modules/smarthome/ratiotherm/on.py b/modules/smarthome/ratiotherm/on.py index 3284482859..162cf435e3 100644 --- a/modules/smarthome/ratiotherm/on.py +++ b/modules/smarthome/ratiotherm/on.py @@ -1,9 +1,7 @@ #!/usr/bin/python3 import sys -import os -import time -named_tuple = time.localtime() # getstruct_time -time_string = time.strftime("%m/%d/%Y, %H:%M:%S ratiotherm on.py", named_tuple) +import logging +from modules.common.smartutils import initlog devicenumber = str(sys.argv[1]) ipadr = str(sys.argv[2]) uberschuss = int(sys.argv[3]) @@ -11,21 +9,13 @@ # standard # lesen # own log -file_string = bp + str(devicenumber) + '_ratiotherm.log' +initlog("ratiotherm", devicenumber) +log = logging.getLogger("ratiotherm") file_stringpv = bp + str(devicenumber) + '_pv' file_stringcount = bp + str(devicenumber) + '_count' -if os.path.isfile(file_string): - pass -else: - with open(file_string, 'w') as f: - print('ratiotherm start log', file=f) -with open(file_string, 'a') as f: - print('%s devicenr %s ipadr %s ueberschuss %6d try to connect (modbus)' - % (time_string, devicenumber, ipadr, uberschuss), file=f) aktpower = 0 -with open(file_string, 'a') as f: - print('%s devicenr %s ipadr %s Akt Leistung %6d ' % - (time_string, devicenumber, ipadr, aktpower), file=f) +log.info(" on devicenr %s ipadr %s ueberschuss %6d Akt Leistung %6d" + % (devicenumber, ipadr, uberschuss, aktpower)) with open(file_stringpv, 'w') as f: f.write(str(1)) count1 = 999 diff --git a/modules/smarthome/ratiotherm/watt.py b/modules/smarthome/ratiotherm/watt.py index 276f1776e8..f16052ee71 100644 --- a/modules/smarthome/ratiotherm/watt.py +++ b/modules/smarthome/ratiotherm/watt.py @@ -1,21 +1,21 @@ #!/usr/bin/python3 import sys import os -import time import json from pymodbus.payload import BinaryPayloadBuilder, Endian from pymodbus.client.sync import ModbusTcpClient -named_tuple = time.localtime() # getstruct_time -time_string = time.strftime("%m/%d/%Y, %H:%M:%S ratiotherm watty.py", named_tuple) +import logging +from modules.common.smartutils import initlog devicenumber = str(sys.argv[1]) ipadr = str(sys.argv[2]) uberschuss = int(sys.argv[3]) forcesend = int(sys.argv[4]) +initlog("ratiotherm", devicenumber) +log = logging.getLogger("ratiotherm") # forcesend = 0 default acthor time period applies # forcesend = 1 default overwritten send now # forcesend = 9 default overwritten no send bp = '/var/www/html/openWB/ramdisk/smarthome_device_' -file_string = bp + str(devicenumber) + '_ratiotherm.log' file_stringpv = bp + str(devicenumber) + '_pv' file_stringcount = bp + str(devicenumber) + '_count' file_stringcount5 = bp + str(devicenumber) + '_count5' @@ -70,18 +70,10 @@ with open(file_stringpv, 'w') as f: f.write(str(pvmodus)) if count1 < 3: - if os.path.isfile(file_string): - pass - else: - with open(file_string, 'w') as f: - print('ratiotherm start log', file=f) - with open(file_string, 'a') as f: - print('%s Nr %s ipadr %s ueberschuss %6d Akt Leistung %6d' - % (time_string, devicenumber, ipadr, uberschuss, aktpower), - file=f) - print('%s Nr %s ipadr %s neupower %6d pvmodus %1d modbusw %1d' - % (time_string, devicenumber, ipadr, neupower, pvmodus, - modbuswrite), file=f) + log.info(" watt devicenr %s ipadr %s ueberschuss %6d Akt Leistung %6d" + % (devicenumber, ipadr, uberschuss, aktpower)) + log.info(" watt devicenr %s ipadr %s neupower %6d pvmodus %1d modbusw %1d" + % (devicenumber, ipadr, neupower, pvmodus, modbuswrite)) # modbus write if modbuswrite == 1: # andernfalls absturz bei negativen Zahlen @@ -92,10 +84,8 @@ client = ModbusTcpClient(ipadr, port=502) client.write_register(100, pay[0], unit=1) if count1 < 3: - with open(file_string, 'a') as f: - print('%s devicenr %s ipadr %s written %6d %#4X' % - (time_string, devicenumber, ipadr, pay[0], pay[0]), - file=f) + log.info(" watt devicenr %s ipadr %s written %6d %#4X" + % (devicenumber, ipadr, pay[0], pay[0])) else: if pvmodus == 99: pvmodus = 0 diff --git a/packages/modules/common/smartutils.py b/packages/modules/common/smartutils.py new file mode 100644 index 0000000000..7ced74baf2 --- /dev/null +++ b/packages/modules/common/smartutils.py @@ -0,0 +1,13 @@ +import logging + + +def initlog(name, devicenumber): + log = logging.getLogger(name) + formatter = logging.Formatter('%(asctime)s %(levelname)s %(message)s') + log.setLevel(logging.DEBUG) + fname = '/var/www/html/openWB/ramdisk/smarthome_device_' + fname += str(devicenumber) + '_' + str(name) + '.log' + fh = logging.FileHandler(fname, encoding='utf8') + fh.setLevel(logging.DEBUG) + fh.setFormatter(formatter) + log.addHandler(fh) From f741687235ace4d367ac87034ce99ab55fe09f0e Mon Sep 17 00:00:00 2001 From: DetMoerk <76627235+DetMoerk@users.noreply.github.com> Date: Tue, 1 Nov 2022 09:58:24 +0100 Subject: [PATCH 021/201] Change for new Mercedes EQ Logins https://developer.mercedes-benz.com/content-page/migration_2022 --- modules/soc_eq/auth.py | 3 ++- modules/soc_eq/soc.py | 8 +++++--- web/settings/modulconfiglp.php | 4 ++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/modules/soc_eq/auth.py b/modules/soc_eq/auth.py index b8068c1773..834a44cff0 100755 --- a/modules/soc_eq/auth.py +++ b/modules/soc_eq/auth.py @@ -54,7 +54,8 @@ def printHtml(message): fd.close() -tok_url = "https://id.mercedes-benz.com/as/token.oauth2" +#tok_url = "https://id.mercedes-benz.com/as/token.oauth2" +tok_url = "https://ssoalpha.dvb.corpinter.net/v1/token" data = {'grant_type': 'authorization_code', 'code': str(code), 'redirect_uri': callback} #call API to get Access/Refresh tokens diff --git a/modules/soc_eq/soc.py b/modules/soc_eq/soc.py index 1bef889237..e962481682 100755 --- a/modules/soc_eq/soc.py +++ b/modules/soc_eq/soc.py @@ -19,7 +19,7 @@ Debug = int(os.environ.get('debug')) myPid = str(os.getpid()) -tok_url = "https://id.mercedes-benz.com/as/token.oauth2" +tok_url = "https://ssoalpha.dvb.corpinter.net/v1/token" soc_url = "https://api.mercedes-benz.com/vehicledata/v2/vehicles/"+VIN+"/containers/electricvehicle" @@ -94,7 +94,7 @@ def handleResponse(what, status_code, text): expires_in = tok['expires_in'] fd.close() -#socDebugLog("Expire in: " str((int(expires_in)-int(time.time()))) +socDebugLog("Token expires in: " +str((int(expires_in)-int(time.time())))+"s") if int(expires_in) < int(time.time()): #Access Token is exired @@ -125,11 +125,13 @@ def handleResponse(what, status_code, text): access_token = tok['access_token'] refresh_token = tok['refresh_token'] expires_in = tok['expires_in'] - 60 + int(time.time()) + id_token = tok['id_token'] + token_type = tok['token_type'] #write new tokens fd = open(moduledir + 'soc_eq_acc_lp' + str(ChargePoint),'w') - json.dump({'expires_in' : expires_in, 'refresh_token' : refresh_token, 'access_token' : access_token}, fd) + json.dump({'expires_in' : expires_in, 'refresh_token' : refresh_token, 'access_token' : access_token, 'id_token' : id_token, 'token_type' : token_type}, fd) fd.close() else: handleResponse("Refresh",ref.status_code,ref.text) diff --git a/web/settings/modulconfiglp.php b/web/settings/modulconfiglp.php index 5a6cbf7b97..aad19ba314 100644 --- a/web/settings/modulconfiglp.php +++ b/web/settings/modulconfiglp.php @@ -1953,7 +1953,7 @@ function visibility_psa_soccalclp1() {
Wichtig: Nach dem Eintragen der Werte müssen diese gespeichert werden und danach einmalig der folgende Link aufgerufen werden: - " target="_blank" rel="noopener noreferrer">HIER bei Mercedes Me anmelden + " target="_blank" rel="noopener noreferrer">HIER bei Mercedes Me anmelden
@@ -3644,7 +3644,7 @@ function visibility_psa_soccalclp2() {
Wichtig: Nach dem Eintragen der Werte müssen diese gespeichert werden und danach einmalig der folgende Link aufgerufen werden
- " target="_blank" rel="noopener noreferrer">HIER bei Mercedes Me anmelden + " target="_blank" rel="noopener noreferrer">HIER bei Mercedes Me anmelden
From 03aa116deea051f981d2a8294dd00cdfcf3afb4d Mon Sep 17 00:00:00 2001 From: DetMoerk <76627235+DetMoerk@users.noreply.github.com> Date: Tue, 1 Nov 2022 18:42:52 +0100 Subject: [PATCH 022/201] fixing indentication switch to 4 spaces --- modules/soc_eq/auth.py | 50 ++++---- modules/soc_eq/soc.py | 254 ++++++++++++++++++++--------------------- 2 files changed, 152 insertions(+), 152 deletions(-) diff --git a/modules/soc_eq/auth.py b/modules/soc_eq/auth.py index 834a44cff0..68c2bfe331 100755 --- a/modules/soc_eq/auth.py +++ b/modules/soc_eq/auth.py @@ -34,23 +34,23 @@ def printHtml(message): #get SoC module config from openWB cofig fd = open('/var/www/html/openWB/openwb.conf','r') for line in fd: - try: - printDebug("owb Conf: " + line,2 ) - (key, val) = line.rstrip().split("=") - if key == "debug": - Debug = int(val) - if key == "soc_eq_client_id_lp" + str(ChargePoint): - printDebug("Found Client ID: " + val ,1) - client_id = val - if key == "soc_eq_client_secret_lp" + str(ChargePoint): - printDebug("Found Client Secret: " + val ,1) - client_secret = val - if key == "soc_eq_cb_lp" + str(ChargePoint): - printDebug("Found callback URL: " + val ,1) - callback = val.replace("'","") - except: + try: + printDebug("owb Conf: " + line,2 ) + (key, val) = line.rstrip().split("=") + if key == "debug": + Debug = int(val) + if key == "soc_eq_client_id_lp" + str(ChargePoint): + printDebug("Found Client ID: " + val ,1) + client_id = val + if key == "soc_eq_client_secret_lp" + str(ChargePoint): + printDebug("Found Client Secret: " + val ,1) + client_secret = val + if key == "soc_eq_cb_lp" + str(ChargePoint): + printDebug("Found callback URL: " + val ,1) + callback = val.replace("'","") + except: - val = "" + val = "" fd.close() @@ -64,17 +64,17 @@ def printHtml(message): printDebug(act.url,1) if act.status_code == 200: - #valid Response - toks = json.loads(act.text) - access_token = toks['access_token'] - refresh_token = toks['refresh_token'] - expires_in = int(time.time()) + #valid Response + toks = json.loads(act.text) + access_token = toks['access_token'] + refresh_token = toks['refresh_token'] + expires_in = int(time.time()) - #write tokens to files + #write tokens to files - fd = open(moddir + 'soc_eq_acc_lp' + str(ChargePoint),'w') - json.dump({'expires_in' : expires_in, 'refresh_token' : refresh_token, 'access_token' : access_token}, fd) - fd.close() + fd = open(moddir + 'soc_eq_acc_lp' + str(ChargePoint),'w') + json.dump({'expires_in' : expires_in, 'refresh_token' : refresh_token, 'access_token' : access_token}, fd) + fd.close() if act.status_code == 200: printHtml( "Anmeldung erfolgreich!" ) diff --git a/modules/soc_eq/soc.py b/modules/soc_eq/soc.py index e962481682..03e7182ec1 100755 --- a/modules/soc_eq/soc.py +++ b/modules/soc_eq/soc.py @@ -27,69 +27,69 @@ range = None def socDebugLog(message): - local_time = datetime.now(timezone.utc).astimezone() - print(local_time.strftime(format = "%Y-%m-%d %H:%M:%S") +": Lp" +ChargePoint + ": PID:"+ myPid + ": " + message) + local_time = datetime.now(timezone.utc).astimezone() + print(local_time.strftime(format = "%Y-%m-%d %H:%M:%S") +": Lp" +ChargePoint + ": PID:"+ myPid + ": " + message) def handleResponse(what, status_code, text): - if status_code == 204: - # this is not an error code. Nothing to fetch so nothing to update and no reason to exit(1) - socDebugLog(what + " Request Code: " + str(status_code) + " (no data is available for the resource)") - socDebugLog(text) - elif status_code == 400: - socDebugLog(what + " Request fehlgeschlagen Code: " + str(status_code) + " (Bad Request)") - socDebugLog(text) - exit(1) - elif status_code == 401: - socDebugLog(what + " Request fehlgeschlagen Code: " + str(status_code) + " (Invalid or missing authorization in header)") - socDebugLog(text) - exit(1) - elif status_code == 402: - socDebugLog(what + " Request fehlgeschlagen Code: " + str(status_code) + " (Payment required)") - socDebugLog(text) - exit(1) - elif status_code == 403: - socDebugLog(what + " Request fehlgeschlagen Code: " + str(status_code) + " (Forbidden)") - socDebugLog(text) - exit(1) - elif status_code == 404: - socDebugLog(what + " Request fehlgeschlagen Code: " + str(status_code) + " (The requested resource was not found, e.g.: the selected vehicle could not be found)") - socDebugLog(text) - exit(1) - elif status_code == 429: - socDebugLog(what + " Request fehlgeschlagen Code: " + str(status_code) + " (The service received too many requests in a given amount of time)") - socDebugLog(text) - exit(1) - elif status_code == 500: - socDebugLog(what + " Request fehlgeschlagen Code: " + str(status_code) + " (The service received too many requests in a given amount of time)") - socDebugLog(text) - exit(1) - elif status_code == 503: - socDebugLog(what + " Request fehlgeschlagen Code: " + str(status_code) + " (The server is unable to service the request due to a temporary unavailability condition)") - socDebugLog(text) - exit(1) - else: - socDebugLog(what + " Request fehlgeschlagen unbekannter Code: " + str(status_code)) - socDebugLog(text) - exit(1) + if status_code == 204: + # this is not an error code. Nothing to fetch so nothing to update and no reason to exit(1) + socDebugLog(what + " Request Code: " + str(status_code) + " (no data is available for the resource)") + socDebugLog(text) + elif status_code == 400: + socDebugLog(what + " Request fehlgeschlagen Code: " + str(status_code) + " (Bad Request)") + socDebugLog(text) + exit(1) + elif status_code == 401: + socDebugLog(what + " Request fehlgeschlagen Code: " + str(status_code) + " (Invalid or missing authorization in header)") + socDebugLog(text) + exit(1) + elif status_code == 402: + socDebugLog(what + " Request fehlgeschlagen Code: " + str(status_code) + " (Payment required)") + socDebugLog(text) + exit(1) + elif status_code == 403: + socDebugLog(what + " Request fehlgeschlagen Code: " + str(status_code) + " (Forbidden)") + socDebugLog(text) + exit(1) + elif status_code == 404: + socDebugLog(what + " Request fehlgeschlagen Code: " + str(status_code) + " (The requested resource was not found, e.g.: the selected vehicle could not be found)") + socDebugLog(text) + exit(1) + elif status_code == 429: + socDebugLog(what + " Request fehlgeschlagen Code: " + str(status_code) + " (The service received too many requests in a given amount of time)") + socDebugLog(text) + exit(1) + elif status_code == 500: + socDebugLog(what + " Request fehlgeschlagen Code: " + str(status_code) + " (The service received too many requests in a given amount of time)") + socDebugLog(text) + exit(1) + elif status_code == 503: + socDebugLog(what + " Request fehlgeschlagen Code: " + str(status_code) + " (The server is unable to service the request due to a temporary unavailability condition)") + socDebugLog(text) + exit(1) + else: + socDebugLog(what + " Request fehlgeschlagen unbekannter Code: " + str(status_code)) + socDebugLog(text) + exit(1) if Debug >= 1: - socDebugLog("Debug Level: " + str(Debug)) + socDebugLog("Debug Level: " + str(Debug)) if Debug >= 1: - socDebugLog("client: " + client_id) + socDebugLog("client: " + client_id) if Debug >= 2: - socDebugLog("SOC URL: " + soc_url) + socDebugLog("SOC URL: " + soc_url) #Get Access token from file fd = open(moduledir + 'soc_eq_acc_lp' + str(ChargePoint),'r') try: - tok = json.load(fd) - access_token = tok['access_token'] + tok = json.load(fd) + access_token = tok['access_token'] except ValueError: - socDebugLog("ERROR: Access Token not found. Please use Link 'HIER bei Mercedes Me' anmelden in LP Configuration") - exit(3) + socDebugLog("ERROR: Access Token not found. Please use Link 'HIER bei Mercedes Me' anmelden in LP Configuration") + exit(3) refresh_token = tok['refresh_token'] expires_in = tok['expires_in'] fd.close() @@ -97,103 +97,103 @@ def handleResponse(what, status_code, text): socDebugLog("Token expires in: " +str((int(expires_in)-int(time.time())))+"s") if int(expires_in) < int(time.time()): - #Access Token is exired - if Debug >= 1: - socDebugLog("Acc Token Expired") + #Access Token is exired + if Debug >= 1: + socDebugLog("Acc Token Expired") - #get new Access Token with referesh token - data = {'grant_type': 'refresh_token', 'refresh_token': refresh_token } - ref = requests.post(tok_url, data=data, verify=True, allow_redirects=False, auth=(client_id, client_secret), timeout=req_timeout) - if Debug >= 1: - socDebugLog("Refresh Token Call:" + str(ref.status_code)) - socDebugLog("Refresh Token Text:" + str(ref.text)) - - - #write HTTP reponse code to file - try: - fd = open(ramdiskdir + 'soc_eq_lastresp','w') - fd.write(str(ref.status_code)) - fd.close() - except: - fd.close() - - - if ref.status_code == 200: - #valid response - tok = json.loads(ref.text) - - access_token = tok['access_token'] - refresh_token = tok['refresh_token'] - expires_in = tok['expires_in'] - 60 + int(time.time()) - id_token = tok['id_token'] - token_type = tok['token_type'] - - #write new tokens - - fd = open(moduledir + 'soc_eq_acc_lp' + str(ChargePoint),'w') - json.dump({'expires_in' : expires_in, 'refresh_token' : refresh_token, 'access_token' : access_token, 'id_token' : id_token, 'token_type' : token_type}, fd) - fd.close() - else: - handleResponse("Refresh",ref.status_code,ref.text) + #get new Access Token with referesh token + data = {'grant_type': 'refresh_token', 'refresh_token': refresh_token } + ref = requests.post(tok_url, data=data, verify=True, allow_redirects=False, auth=(client_id, client_secret), timeout=req_timeout) + if Debug >= 1: + socDebugLog("Refresh Token Call:" + str(ref.status_code)) + socDebugLog("Refresh Token Text:" + str(ref.text)) + + + #write HTTP reponse code to file + try: + fd = open(ramdiskdir + 'soc_eq_lastresp','w') + fd.write(str(ref.status_code)) + fd.close() + except: + fd.close() + + + if ref.status_code == 200: + #valid response + tok = json.loads(ref.text) + + access_token = tok['access_token'] + refresh_token = tok['refresh_token'] + expires_in = tok['expires_in'] - 60 + int(time.time()) + id_token = tok['id_token'] + token_type = tok['token_type'] + + #write new tokens + + fd = open(moduledir + 'soc_eq_acc_lp' + str(ChargePoint),'w') + json.dump({'expires_in' : expires_in, 'refresh_token' : refresh_token, 'access_token' : access_token, 'id_token' : id_token, 'token_type' : token_type}, fd) + fd.close() + else: + handleResponse("Refresh",ref.status_code,ref.text) #call API for SoC header = {'authorization': 'Bearer ' + access_token} try: - req_soc = requests.get(soc_url, headers=header, verify=True) - #req_soc = requests.get(soc_url, headers=header, verify=True, timeout=req_timeout) + req_soc = requests.get(soc_url, headers=header, verify=True) + #req_soc = requests.get(soc_url, headers=header, verify=True, timeout=req_timeout) except Timeout: - socDebugLog("Soc Request Timed Out") - exit(2) + socDebugLog("Soc Request Timed Out") + exit(2) except RequestException: - socDebugLog("Soc Request Request Exception occured " + soc_url) - exit(2) + socDebugLog("Soc Request Request Exception occured " + soc_url) + exit(2) if Debug >= 1: - socDebugLog("SOC Request: " + str(req_soc.status_code)) - socDebugLog("SOC Response: " + req_soc.text) + socDebugLog("SOC Request: " + str(req_soc.status_code)) + socDebugLog("SOC Response: " + req_soc.text) #write HTTP reponse code to file try: - fd = open(ramdiskdir + 'soc_eq_lastresp','w') - fd.write(str(req_soc.status_code)) - fd.close() + fd = open(ramdiskdir + 'soc_eq_lastresp','w') + fd.write(str(req_soc.status_code)) + fd.close() except: - fd.close() + fd.close() if req_soc.status_code == 200: - #valid Response - try: - res = json.loads(req_soc.text) - except JSONDecodeError: - socDebugLog("Soc Response NO VALID JSON " + req_soc.text) - exit(2) - - #Extract SoC value and write to file - for entry in res: - for values in entry: - if values == "soc": - soc = entry[values]['value'] - elif values == "rangeelectric": - range = entry[values]['value'] - else: - socDebugLog("unknown entry: " + entry) - if not soc: - socDebugLog("SoC Value not filled " + req_soc.text) - soc = "0" - if not range: - socDebugLog("RangeElectric Value not filled " + req_soc.text) - range = "0" - socDebugLog("SOC: " + soc + " RANGE: " + range) - fd = open(soc_file,'w') - fd.write(str(soc)) - fd.close() - + #valid Response + try: + res = json.loads(req_soc.text) + except JSONDecodeError: + socDebugLog("Soc Response NO VALID JSON " + req_soc.text) + exit(2) + + #Extract SoC value and write to file + for entry in res: + for values in entry: + if values == "soc": + soc = entry[values]['value'] + elif values == "rangeelectric": + range = entry[values]['value'] + else: + socDebugLog("unknown entry: " + entry) + if not soc: + socDebugLog("SoC Value not filled " + req_soc.text) + soc = "0" + if not range: + socDebugLog("RangeElectric Value not filled " + req_soc.text) + range = "0" + socDebugLog("SOC: " + soc + " RANGE: " + range) + fd = open(soc_file,'w') + fd.write(str(soc)) + fd.close() + else: - handleResponse("SoC",req_soc.status_code,req_soc.text) + handleResponse("SoC",req_soc.status_code,req_soc.text) if Debug >= 2: - socDebugLog("SoC EQ Ende ohne Fehler") + socDebugLog("SoC EQ Ende ohne Fehler") exit(0) From d47290cb17b6eeb5a9244d51856f728d28bacf42 Mon Sep 17 00:00:00 2001 From: DetMoerk <76627235+DetMoerk@users.noreply.github.com> Date: Tue, 1 Nov 2022 19:08:35 +0100 Subject: [PATCH 023/201] fix indent --- web/settings/modulconfiglp.php | 44 +++++++++++++++++----------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/web/settings/modulconfiglp.php b/web/settings/modulconfiglp.php index aad19ba314..d0ac655e91 100644 --- a/web/settings/modulconfiglp.php +++ b/web/settings/modulconfiglp.php @@ -388,7 +388,7 @@ function visibility_twcmanagerlp1_connection() { visibility_twcmanagerlp1_connection(); }); - visibility_twcmanagerlp1_connection(); + visibility_twcmanagerlp1_connection(); }); @@ -1142,28 +1142,28 @@ function visibility_kia_advanced() {
-
-
- Anmeldedaten fuer den Aiways U5 -
-
- -
- - - Aiways Account Name (nicht die E-Mail-Adresse) - -
-
-
- -
+
+
+ Anmeldedaten fuer den Aiways U5 +
+
+ +
+ + + Aiways Account Name (nicht die E-Mail-Adresse) + +
+
+
+ +
- - Aiways Passwort - -
-
+ + Aiways Passwort + +
+
From 676096230715c79c3107c1480e2f48eb1400985e Mon Sep 17 00:00:00 2001 From: DetMoerk <76627235+DetMoerk@users.noreply.github.com> Date: Tue, 1 Nov 2022 19:17:27 +0100 Subject: [PATCH 024/201] fix indent --- web/settings/modulconfiglp.php | 56 +++++++++++++++++----------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/web/settings/modulconfiglp.php b/web/settings/modulconfiglp.php index d0ac655e91..6a25314645 100644 --- a/web/settings/modulconfiglp.php +++ b/web/settings/modulconfiglp.php @@ -1165,25 +1165,25 @@ function visibility_kia_advanced() {
- -
- - - VIN des Fahrzeugs - -
-
-
- -
+ +
+ + + VIN des Fahrzeugs + +
+
+
+ +
- - Verkürzt das Abfrageintervall beim Laden auf xx Minuten - -
-
-
-
+ + Verkürzt das Abfrageintervall beim Laden auf xx Minuten + +
+
+ +
@@ -3134,16 +3134,16 @@ function visibility_twcmanagerlp2_connection() {
-
-
- -
- - - Aiways Account Name (nicht die E-Mail-Adresse) - -
-
+
+
+ +
+ + + Aiways Account Name (nicht die E-Mail-Adresse) + +
+
From e01328842e111b6bc924127b6dd836d840807ff9 Mon Sep 17 00:00:00 2001 From: DetMoerk <76627235+DetMoerk@users.noreply.github.com> Date: Tue, 1 Nov 2022 19:23:10 +0100 Subject: [PATCH 025/201] fix indent --- web/settings/modulconfiglp.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/web/settings/modulconfiglp.php b/web/settings/modulconfiglp.php index 6a25314645..c059494b59 100644 --- a/web/settings/modulconfiglp.php +++ b/web/settings/modulconfiglp.php @@ -2301,8 +2301,8 @@ function display_socmodul() { showSection('#socmkia'); } if($('#socmodul').val() == 'soc_aiways') { - showSection('#socaiways'); - } + showSection('#socaiways'); + } if($('#socmodul').val() == 'soc_audi') { showSection('#socoldevccwarning'); showSection('#socmaudi'); @@ -3172,7 +3172,7 @@ function visibility_twcmanagerlp2_connection() {
-
+
@@ -4090,7 +4090,7 @@ function display_lp2() { case "openwb series1/2 duo v2": showSection('#openwb12s1v2'); break; - default: + default: showSection('#evseconmbs1'); showSection('#llmodullp2'); display_llmp2(); @@ -5030,7 +5030,7 @@ function display_lastmanagementlp() {
- Sie befinden sich hier: Einstellungen/Modulkonfiguration + Sie befinden sich hier: Einstellungen/Modulkonfiguration
From fad8528ad71033db1bf986cb7cfb106aae90d398 Mon Sep 17 00:00:00 2001 From: benderl Date: Wed, 2 Nov 2022 08:05:46 +0100 Subject: [PATCH 026/201] Update on.py fix newline at end of file --- modules/smarthome/http/on.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/smarthome/http/on.py b/modules/smarthome/http/on.py index a28a231078..8888301446 100644 --- a/modules/smarthome/http/on.py +++ b/modules/smarthome/http/on.py @@ -24,4 +24,4 @@ f = open( file_string , 'w') print ('%s devicenr %s url %s' % (time_string,devicenumber,url),file=f) f.close() -urllib.request.urlopen(url, timeout=5) \ No newline at end of file +urllib.request.urlopen(url, timeout=5) From 31c18769adb1fa1090127c6906d8047fc8dd0568 Mon Sep 17 00:00:00 2001 From: DetMoerk <76627235+DetMoerk@users.noreply.github.com> Date: Wed, 2 Nov 2022 14:46:27 +0100 Subject: [PATCH 027/201] Mercedes New Authentication fix for LP2 --- web/settings/modulconfiglp.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/settings/modulconfiglp.php b/web/settings/modulconfiglp.php index c059494b59..7a1cd78467 100644 --- a/web/settings/modulconfiglp.php +++ b/web/settings/modulconfiglp.php @@ -3644,7 +3644,7 @@ function visibility_psa_soccalclp2() {
Wichtig: Nach dem Eintragen der Werte müssen diese gespeichert werden und danach einmalig der folgende Link aufgerufen werden
- " target="_blank" rel="noopener noreferrer">HIER bei Mercedes Me anmelden + " target="_blank" rel="noopener noreferrer">HIER bei Mercedes Me anmelden
From 37a4184c0d4d98ad204f2a2043c9bab72f1cdd44 Mon Sep 17 00:00:00 2001 From: okaegi Date: Wed, 2 Nov 2022 17:23:23 +0100 Subject: [PATCH 028/201] gemeinsames Smarthome Verzeichniss MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Neu wird das ...packages\smarthome\ Verzeichnis für gemeinsame import files verwendet. --- modules/smarthome/ratiotherm/off.py | 3 +-- modules/smarthome/ratiotherm/on.py | 2 +- modules/smarthome/ratiotherm/watt.py | 2 +- .../{modules/common/smartutils.py => smarthome/smartlog.py} | 0 4 files changed, 3 insertions(+), 4 deletions(-) rename packages/{modules/common/smartutils.py => smarthome/smartlog.py} (100%) diff --git a/modules/smarthome/ratiotherm/off.py b/modules/smarthome/ratiotherm/off.py index b346440aa2..677503eb2b 100644 --- a/modules/smarthome/ratiotherm/off.py +++ b/modules/smarthome/ratiotherm/off.py @@ -2,8 +2,7 @@ import os import sys import logging -from modules.common.smartutils import initlog - +from smarthome.smartlog import initlog devicenumber = str(sys.argv[1]) ipadr = str(sys.argv[2]) uberschuss = int(sys.argv[3]) diff --git a/modules/smarthome/ratiotherm/on.py b/modules/smarthome/ratiotherm/on.py index 162cf435e3..568eec1c30 100644 --- a/modules/smarthome/ratiotherm/on.py +++ b/modules/smarthome/ratiotherm/on.py @@ -1,7 +1,7 @@ #!/usr/bin/python3 import sys import logging -from modules.common.smartutils import initlog +from smarthome.smartlog import initlog devicenumber = str(sys.argv[1]) ipadr = str(sys.argv[2]) uberschuss = int(sys.argv[3]) diff --git a/modules/smarthome/ratiotherm/watt.py b/modules/smarthome/ratiotherm/watt.py index f16052ee71..8dce8efa36 100644 --- a/modules/smarthome/ratiotherm/watt.py +++ b/modules/smarthome/ratiotherm/watt.py @@ -5,7 +5,7 @@ from pymodbus.payload import BinaryPayloadBuilder, Endian from pymodbus.client.sync import ModbusTcpClient import logging -from modules.common.smartutils import initlog +from smarthome.smartlog import initlog devicenumber = str(sys.argv[1]) ipadr = str(sys.argv[2]) uberschuss = int(sys.argv[3]) diff --git a/packages/modules/common/smartutils.py b/packages/smarthome/smartlog.py similarity index 100% rename from packages/modules/common/smartutils.py rename to packages/smarthome/smartlog.py From 4e66d3a65265cffe9dd8fa74fae0398aeb30da7f Mon Sep 17 00:00:00 2001 From: LKuemmel Date: Thu, 3 Nov 2022 08:13:38 +0100 Subject: [PATCH 029/201] Fix fault topic --- packages/modules/common/fault_state.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/modules/common/fault_state.py b/packages/modules/common/fault_state.py index fec941f5c3..e87fd7d93d 100644 --- a/packages/modules/common/fault_state.py +++ b/packages/modules/common/fault_state.py @@ -51,7 +51,7 @@ def store_error(self, component_info: ComponentInfo) -> None: else: prefix += str(component_info.id) + "/fault" else: - prefix += "f" + prefix += "fault" pub.pub_single(prefix + "Str", self.fault_str, hostname=component_info.hostname) pub.pub_single(prefix + "State", self.fault_state.value, hostname=component_info.hostname) if "chargepoint" in component_info.type: From dbede0ef61f1646fcfe87a2000edfdedd43e0800 Mon Sep 17 00:00:00 2001 From: Lutz Bender Date: Thu, 3 Nov 2022 11:13:07 +0100 Subject: [PATCH 030/201] recreate log file if missing --- runs/atreboot.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/runs/atreboot.sh b/runs/atreboot.sh index 7623eba9de..65eb722946 100755 --- a/runs/atreboot.sh +++ b/runs/atreboot.sh @@ -1,6 +1,12 @@ #!/bin/bash OPENWBBASEDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd) LOGFILE="/var/log/openWB.log" +# always check for existing log file! +if [[ ! -f $LOGFILE ]]; then + sudo touch $LOGFILE + sudo chmod 777 $LOGFILE +fi + . "$OPENWBBASEDIR/helperFunctions.sh" at_reboot() { From 4e31a5d8ff1bba8fceb289aec745ae8315eff910 Mon Sep 17 00:00:00 2001 From: okaegi <72255431+okaegi@users.noreply.github.com> Date: Fri, 11 Nov 2022 14:38:28 +0100 Subject: [PATCH 031/201] =?UTF-8?q?E3dc=20nun=20komplett=20auf=20openwb=20?= =?UTF-8?q?V2.0=20umgestellt,=20ersetzt=20E3dc0010=20Branch=20vollst=C3=A4?= =?UTF-8?q?ndig=20(#2485)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * E3dc nun komplett auf openwb V2.0 umgestellt, ersetzt E3DC0010 branch Vorschläge von Yannik umgesetzt, neuen Branch eröffnet, ersetzt den E3dc0010 * update... Yanniks Anregungen umgesetzt * korrektur... Yanniks Anregungen umgesetzt.... * Korrektur Vorschläge umgesetzt.... * Korrektur * Korrektur.. * Korrektur.. --- modules/bezug_e3dc/e3dc.py | 44 ---------- modules/bezug_e3dc/main.sh | 2 +- modules/speicher_e3dc/e3dc.py | 78 ------------------ modules/speicher_e3dc/main.sh | 2 +- packages/modules/e3dc/bat.py | 48 +++++++++++ packages/modules/e3dc/config.py | 71 ++++++++++++++++ packages/modules/e3dc/counter.py | 53 ++++++++++++ packages/modules/e3dc/device.py | 133 ++++++++++++++++++++++++++++++ packages/modules/e3dc/inverter.py | 67 +++++++++++++++ 9 files changed, 374 insertions(+), 124 deletions(-) delete mode 100755 modules/bezug_e3dc/e3dc.py delete mode 100755 modules/speicher_e3dc/e3dc.py create mode 100644 packages/modules/e3dc/bat.py create mode 100644 packages/modules/e3dc/config.py create mode 100644 packages/modules/e3dc/counter.py create mode 100644 packages/modules/e3dc/device.py create mode 100644 packages/modules/e3dc/inverter.py diff --git a/modules/bezug_e3dc/e3dc.py b/modules/bezug_e3dc/e3dc.py deleted file mode 100755 index eff90a573f..0000000000 --- a/modules/bezug_e3dc/e3dc.py +++ /dev/null @@ -1,44 +0,0 @@ -#!/usr/bin/python -import logging -from typing import List - -from pymodbus.constants import Endian - -from helpermodules.cli import run_using_positional_cli_args -from modules.common.component_state import CounterState -from modules.common.modbus import ModbusTcpClient_, ModbusDataType -from modules.common.simcount import sim_count -from modules.common.store import get_counter_value_store - -log = logging.getLogger("E3DC EVU") - - -def update(ipaddress: str): - log.debug("Beginning update") - with ModbusTcpClient_(ipaddress, port=502) as client: - # 40074 EVU Punkt negativ -> Einspeisung in Watt - power_all = client.read_holding_registers(40073, ModbusDataType.INT_32, wordorder=Endian.Little, unit=1) - # 40130 Phasenleistung in Watt - # max 6 Leistungsmesser verbaut ab 410105, typ 1 ist evu - # bei den meisten e3dc auf 40128 - # for i in range (40104,40132,4): - for i in range(40128, 40103, -4): - # powers = client.read_holding_registers(40129, [ModbusDataType.INT_16] * 3, unit=1) - powers = client.read_holding_registers(i, [ModbusDataType.INT_16] * 4, unit=1) - log.debug("I: %d, p[0] typ %d p[1] a1 %d p[2] a2 %d p[3] a3 %d", - i, powers[0], powers[1], powers[2], powers[3]) - if powers[0] == 1: - log.debug("Evu Leistungsmessung gefunden") - break - counter_import, counter_export = sim_count(power_all, prefix="bezug") - get_counter_value_store(1).set(CounterState( - imported=counter_import, - exported=counter_export, - power=power_all, - powers=powers[1:] - )) - log.debug("Update completed successfully") - - -def main(argv: List[str]): - run_using_positional_cli_args(update, argv) diff --git a/modules/bezug_e3dc/main.sh b/modules/bezug_e3dc/main.sh index e07b72d7e8..70999d8fdf 100755 --- a/modules/bezug_e3dc/main.sh +++ b/modules/bezug_e3dc/main.sh @@ -10,7 +10,7 @@ else MYLOGFILE="${RAMDISKDIR}/evu.log" fi -bash "$OPENWBBASEDIR/packages/legacy_run.sh" "bezug_e3dc.e3dc" "${e3dcip}" >>"${MYLOGFILE}" 2>&1 +bash "$OPENWBBASEDIR/packages/legacy_run.sh" "modules.e3dc.device" "counter" "$e3dcip" "1">>"${MYLOGFILE}" 2>&1 ret=$? openwbDebugLog ${DMOD} 2 "EVU RET: ${ret}" diff --git a/modules/speicher_e3dc/e3dc.py b/modules/speicher_e3dc/e3dc.py deleted file mode 100755 index 8ebf01d9f6..0000000000 --- a/modules/speicher_e3dc/e3dc.py +++ /dev/null @@ -1,78 +0,0 @@ -#!/usr/bin/python3 -import logging -from typing import Iterable, List - -from pymodbus.constants import Endian - -from helpermodules.cli import run_using_positional_cli_args -from modules.common.component_context import SingleComponentUpdateContext -from modules.common.component_state import InverterState, BatState -from modules.common.fault_state import ComponentInfo -from modules.common.modbus import ModbusTcpClient_, ModbusDataType -from modules.common.simcount import sim_count -from modules.common.store import get_inverter_value_store, get_bat_value_store -from modules.common.store.ramdisk import files - -log = logging.getLogger("E3DC Battery") - - -def update_e3dc_battery(addresses: Iterable[str], read_external: int, pv_other: bool): - soc = 0 - count = 0 - battery_power = 0 - # pv_external - > pv Leistung die als externe Produktion an e3dc angeschlossen ist - # nur auslesen wenn als relevant parametrisiert (read_external = 1) , sonst doppelte Auslesung - pv_external = 0 - # pv -> pv Leistung die direkt an e3dc angeschlossen ist - pv = 0 - for address in addresses: - log.debug("Battery Ip: %s, read_external %d pv_other %s", address, read_external, pv_other) - count += 1 - with ModbusTcpClient_(address, port=502) as client: - # 40082 SoC - soc += client.read_holding_registers(40082, ModbusDataType.INT_16, unit=1) - # 40069 Speicherleistung - battery_power += client.read_holding_registers(40069, - ModbusDataType.INT_32, wordorder=Endian.Little, unit=1) - # 40067 PV Leistung - pv += (client.read_holding_registers(40067, ModbusDataType.INT_32, wordorder=Endian.Little, unit=1) * -1) - if read_external == 1: - # 40075 externe PV Leistung - pv_external += client.read_holding_registers(40075, - ModbusDataType.INT_32, wordorder=Endian.Little, unit=1) - soc = soc / count - log.debug("Battery soc %d battery_power %d pv %d pv_external %d count ip %d", - soc, battery_power, pv, pv_external, count) - counter_import, counter_export = sim_count(battery_power, prefix="speicher") - get_bat_value_store(1).set(BatState(power=battery_power, soc=soc, imported=counter_import, exported=counter_export)) - # pv_other sagt aus, ob WR definiert ist, und dessen PV Leistung auch gilt - # wenn 0 gilt nur PV und pv_external aus e3dc - pv_total = pv + pv_external - # Wenn wr1 nicht definiert ist, gilt nur die PV Leistung die hier im Modul ermittelt wurde - # als gesamte PV Leistung für wr1 - if not pv_other or pv_total != 0: - # Wenn wr1 definiert ist, gilt die bestehende PV Leistung aus Wr1 und das was hier im Modul ermittelt wurde - # als gesamte PV Leistung für wr1 - if pv_other: - try: - pv_total = pv_total + files.pv[0].power.read() - except: - pass - log.debug("wr update pv_other %s pv_total %d", pv_other, pv_total) - _, counter_pv = sim_count(pv_total, prefix="pv") - get_inverter_value_store(1).set(InverterState(exported=counter_pv, power=pv_total)) - - -def update(address1: str, address2: str, read_external: int, pvmodul: str): - # read_external is 0 or 1 - log.debug("Beginning update") - addresses = [address for address in [address1, address2] if address != "none"] - pv_other = pvmodul != "none" - bat_info = ComponentInfo(None, "E3DC", "bat") - with SingleComponentUpdateContext(bat_info): - update_e3dc_battery(addresses, read_external, pv_other) - log.debug("Update completed successfully") - - -def main(argv: List[str]): - run_using_positional_cli_args(update, argv) diff --git a/modules/speicher_e3dc/main.sh b/modules/speicher_e3dc/main.sh index 3506bf4550..ad3fc9e01b 100755 --- a/modules/speicher_e3dc/main.sh +++ b/modules/speicher_e3dc/main.sh @@ -10,7 +10,7 @@ else MYLOGFILE="${RAMDISKDIR}/bat.log" fi -bash "$OPENWBBASEDIR/packages/legacy_run.sh" "speicher_e3dc.e3dc" "$e3dcip" "$e3dc2ip" "$e3dcextprod" "$pvwattmodul" >>"${MYLOGFILE}" 2>&1 +bash "$OPENWBBASEDIR/packages/legacy_run.sh" "modules.e3dc.device" "bat" "$e3dcip" "$e3dc2ip" "$e3dcextprod" "$pvwattmodul" "1">>"${MYLOGFILE}" 2>&1 ret=$? openwbDebugLog "${DMOD}" 2 "BAT RET: ${ret}" diff --git a/packages/modules/e3dc/bat.py b/packages/modules/e3dc/bat.py new file mode 100644 index 0000000000..048e5643d4 --- /dev/null +++ b/packages/modules/e3dc/bat.py @@ -0,0 +1,48 @@ +#!/usr/bin/env python3 +import logging +from typing import Tuple +from modules.common import modbus +from modules.common.component_state import BatState +from modules.common.component_type import ComponentDescriptor +from modules.common.modbus import ModbusDataType, Endian +from modules.common.fault_state import ComponentInfo +from modules.common.store import get_bat_value_store +from modules.common.simcount._simcounter import SimCounter +from modules.e3dc.config import E3dcBatSetup + + +log = logging.getLogger(__name__) + + +def read_bat(client: modbus.ModbusTcpClient_) -> Tuple[int, int]: + # 40082 SoC + soc = client.read_holding_registers(40082, ModbusDataType.INT_16, unit=1) + # 40069 Speicherleistung + power = client.read_holding_registers(40069, ModbusDataType.INT_32, wordorder=Endian.Little, unit=1) + return soc, power + + +class E3dcBat: + def __init__(self, + device_id: int, + component_config: E3dcBatSetup) -> None: + self.component_config = component_config + # bat + self.sim_counter = SimCounter(device_id, self.component_config.id, prefix="speicher") + self.__store = get_bat_value_store(self.component_config.id) + self.component_info = ComponentInfo.from_component_config(self.component_config) + + def update(self, client: modbus.ModbusTcpClient_) -> None: + + soc, power = read_bat(client) + imported, exported = self.sim_counter.sim_count(power) + bat_state = BatState( + power=power, + soc=soc, + imported=imported, + exported=exported + ) + self.__store.set(bat_state) + + +component_descriptor = ComponentDescriptor(configuration_factory=E3dcBatSetup) diff --git a/packages/modules/e3dc/config.py b/packages/modules/e3dc/config.py new file mode 100644 index 0000000000..d6e9645fca --- /dev/null +++ b/packages/modules/e3dc/config.py @@ -0,0 +1,71 @@ +from modules.common.component_setup import ComponentSetup +from helpermodules.auto_str import auto_str + + +@auto_str +class E3dcConfiguration: + def __init__(self, address: str = None): + self.address = address + + +@auto_str +class E3dc: + def __init__(self, + name: str = "e3dc", + type: str = "e3dc", + id: int = 0, + configuration: E3dcConfiguration = None) -> None: + self.name = name + self.type = type + self.id = id + self.configuration = configuration or E3dcConfiguration() + + +@auto_str +class E3dcBatConfiguration: + def __init__(self): + pass + + +@auto_str +class E3dcBatSetup(ComponentSetup[E3dcBatConfiguration]): + def __init__(self, + name: str = "e3dc Speicher", + type: str = "bat", + id: int = 0, + configuration: E3dcBatConfiguration = None) -> None: + super().__init__(name, type, id, configuration + or E3dcBatConfiguration()) + + +@auto_str +class E3dcCounterConfiguration: + def __init__(self): + pass + + +@auto_str +class E3dcCounterSetup(ComponentSetup[E3dcCounterConfiguration]): + def __init__(self, + name: str = "e3dc Zähler", + type: str = "counter", + id: int = 0, + configuration: E3dcCounterConfiguration = None) -> None: + super().__init__(name, type, id, configuration or + E3dcCounterConfiguration()) + + +@auto_str +class E3dcInverterConfiguration: + def __init__(self, read_ext: int = 0): + self.read_ext = read_ext + + +@auto_str +class E3dcInverterSetup(ComponentSetup[E3dcInverterConfiguration]): + def __init__(self, + name: str = "E3dc Wechselrichter", + type: str = "inverter", + id: int = 0, + configuration: E3dcInverterConfiguration = None) -> None: + super().__init__(name, type, id, configuration or E3dcInverterConfiguration()) diff --git a/packages/modules/e3dc/counter.py b/packages/modules/e3dc/counter.py new file mode 100644 index 0000000000..01c60ce4b1 --- /dev/null +++ b/packages/modules/e3dc/counter.py @@ -0,0 +1,53 @@ +#!/usr/bin/env python3 +import logging +from typing import Tuple, List + +from modules.common import modbus +from modules.common.component_state import CounterState +from modules.common.component_type import ComponentDescriptor +from modules.common.fault_state import ComponentInfo +from modules.common.simcount._simcounter import SimCounter +from modules.common.modbus import ModbusDataType, Endian +from modules.common.store import get_counter_value_store +from modules.e3dc.config import E3dcCounterSetup + +log = logging.getLogger(__name__) + + +def read_counter(client: modbus.ModbusTcpClient_) -> Tuple[int, List[int]]: + log.debug("Beginning EVU update") + power = client.read_holding_registers(40073, ModbusDataType.INT_32, wordorder=Endian.Little, unit=1) + # 40130,40131, 40132 je Phasenleistung in Watt + # max 7 Leistungsmesser verbaut ab 40105, typ 1 ist evu + # Modbus dokumentation Leistungsmesser von #0 bis #6 + # bei den meisten e3dc auf 40128 + meters = client.read_holding_registers(40104, [ModbusDataType.INT_16] * 28, unit=1) + log.debug("power: %d, meters: %s", power, meters) + powers = next(meters[i+1:i+4] for i in reversed(range(0, len(meters), 4)) if meters[i] == 1) + log.debug("powers %s", powers) + return power, powers + + +class E3dcCounter: + def __init__(self, + device_id: int, + component_config: E3dcCounterSetup) -> None: + self.component_config = component_config + self.sim_counter = SimCounter(device_id, self.component_config.id, prefix="bezug") + self.__store = get_counter_value_store(self.component_config.id) + self.component_info = ComponentInfo.from_component_config(self.component_config) + + def update(self, client: modbus.ModbusTcpClient_): + power, powers = read_counter(client) + imported, exported = self.sim_counter.sim_count(power) + counter_state = CounterState( + imported=imported, + exported=exported, + powers=powers, + power=power + ) + self.__store.set(counter_state) + log.debug("Update completed successfully") + + +component_descriptor = ComponentDescriptor(configuration_factory=E3dcCounterSetup) diff --git a/packages/modules/e3dc/device.py b/packages/modules/e3dc/device.py new file mode 100644 index 0000000000..8dce9b5f8f --- /dev/null +++ b/packages/modules/e3dc/device.py @@ -0,0 +1,133 @@ +#!/usr/bin/env python3 +import logging +from typing import List, Union, Iterable + +from helpermodules.cli import run_using_positional_cli_args +from modules.common.abstract_device import DeviceDescriptor +from modules.common.configurable_device import ConfigurableDevice, ComponentFactoryByType, SingleComponentUpdateContext +from modules.common import modbus +from modules.e3dc.bat import E3dcBat, read_bat +from modules.e3dc.inverter import E3dcInverter, read_inverter +from modules.e3dc.counter import E3dcCounter +from modules.e3dc.config import E3dc, E3dcConfiguration +from modules.e3dc.config import E3dcBatSetup +from modules.e3dc.config import E3dcCounterSetup, E3dcCounterConfiguration +from modules.e3dc.config import E3dcInverterSetup +from modules.common.store.ramdisk import files +from modules.common.simcount import sim_count +from modules.common.store import get_inverter_value_store, get_bat_value_store +from modules.common.component_state import InverterState, BatState + + +log = logging.getLogger(__name__) + + +def create_device(device_config: E3dc): + def create_bat_component(component_config: E3dcBatSetup): + return E3dcBat(device_config.id, + component_config) + + def create_counter_component(component_config: E3dcCounterSetup): + return E3dcCounter(device_config.id, + component_config) + + def create_inverter_component(component_config: E3dcInverterSetup): + return E3dcInverter(device_config.id, + component_config) + + def update_components(components: Iterable[Union[E3dcBat, E3dcCounter, E3dcInverter]]): + with modbus.ModbusTcpClient_(device_config.configuration.address, 502) as client: + log.debug('reading: %s', device_config.configuration.address) + for component in components: + with SingleComponentUpdateContext(component.component_info): + component.update(client) + + return ConfigurableDevice( + device_config=device_config, + component_factory=ComponentFactoryByType( + bat=create_bat_component, + counter=create_counter_component, + inverter=create_inverter_component, + ), + component_updater=update_components + ) + + +def run_device_legacy(device_config: E3dc, component_config: Union[E3dcBatSetup, E3dcCounterSetup, E3dcBatSetup]): + device = create_device(device_config) + device.add_component(component_config) + log.debug("E3dc Configuration: %s, Component Configuration: %s", device_config, component_config) + device.update() + + +def create_legacy_device_config(address: str, + num: int) -> E3dc: + device_config = E3dc(configuration=E3dcConfiguration(address=address), + id=num) + log.debug("Config: %s", device_config) + return device_config + + +def read_legacy_counter(address1: str, + num: int): + component_config = E3dcCounterSetup(configuration=E3dcCounterConfiguration()) + component_config.id = num + run_device_legacy(create_legacy_device_config(address1, + num), component_config) + + +def read_legacy_bat(address1: str, + address2: str, read_ext: int, + pv_module: str, + num: int) -> None: + # für openwbv19 können mit der bisherigen parametrisierung zwei ip_addressen + # ausgelesen werden + # ebenso wird bei Speicheraufruf beides (Speicher und PV ausgelesen + # in openwb v2.0 geht nur noch eine IP adresse und die Pv muss + # separate ausgelesen werden + addresses = [address for address in [address1, address2] if address != "none"] + log.debug('e3dc IP-Adresse1: %s', address1) + log.debug('e3dc IP-Adresse2: %s', address2) + log.debug('e3dc read_ext: %d', read_ext) + log.debug('e3dc pv_module: %s', pv_module) + log.debug('e3dc id: %d', num) + soc = 0 # type: Union[int, float] + power = 0 + pv_external = 0 + pv = 0 + pv_other = pv_module != "none" + for address in addresses: + log.debug("Ip: %s, read_external %d pv_other %s", address, read_ext, pv_other) + with modbus.ModbusTcpClient_(address, port=502) as client: + soc_tmp, power_tmp = read_bat(client) + soc += soc_tmp + power += power_tmp + pv_tmp, pv_external_tmp = read_inverter(client, read_ext) + pv += pv_tmp + pv_external += pv_external_tmp + soc /= len(addresses) + log.debug("Soc %d power %d pv %d pv_external %d", + soc, power, pv, pv_external) + counter_import, counter_export = sim_count(power, prefix="speicher") + get_bat_value_store(1).set(BatState(power=power, soc=soc, imported=counter_import, exported=counter_export)) + # pv_other sagt aus, ob WR definiert ist, und dessen PV Leistung auch gilt + # wenn 0 gilt nur PV und pv_external aus e3dc + pv_total = pv + pv_external + # Wenn wr1 nicht definiert ist, gilt nur die PV Leistung die hier im Modul ermittelt wurde + # als gesamte PV Leistung für wr1 + # Wenn wr1 definiert ist, gilt die bestehende PV Leistung aus Wr1 und das was hier im Modul ermittelt wurde + # als gesamte PV Leistung für wr1 + if pv_other: + pv_total = pv_total + files.pv[0].power.read() + log.debug("wr update pv_other %s pv_total %d", pv_other, pv_total) + _, exported_pv = sim_count(pv_total, prefix="pv") + get_inverter_value_store(num).set(InverterState(exported=exported_pv, power=pv_total)) + + +def main(argv: List[str]): + run_using_positional_cli_args( + {"bat": read_legacy_bat, "counter": read_legacy_counter}, argv + ) + + +device_descriptor = DeviceDescriptor(configuration_factory=E3dc) diff --git a/packages/modules/e3dc/inverter.py b/packages/modules/e3dc/inverter.py new file mode 100644 index 0000000000..4364f1375a --- /dev/null +++ b/packages/modules/e3dc/inverter.py @@ -0,0 +1,67 @@ +#!/usr/bin/env python3 +from typing import Tuple +import logging + +from modules.common import modbus +from modules.common.component_state import InverterState +from modules.common.component_type import ComponentDescriptor +from modules.common.modbus import ModbusDataType, Endian +from modules.common.fault_state import ComponentInfo +from modules.common.store import get_inverter_value_store +from modules.common.simcount._simcounter import SimCounter +from modules.e3dc.config import E3dcInverterSetup + + +log = logging.getLogger(__name__) + + +def read_inverter(client: modbus.ModbusTcpClient_, read_ext) -> Tuple[int, int]: + # 40067 PV Leistung + pv = client.read_holding_registers(40067, ModbusDataType.INT_32, + wordorder=Endian.Little, unit=1) * -1 + if read_ext == 1: + # 40075 externe PV Leistung + pv_external = client.read_holding_registers(40075, ModbusDataType.INT_32, + wordorder=Endian.Little, unit=1) + else: + pv_external = 0 + return pv, pv_external + + +class E3dcInverter: + def __init__(self, + device_id: int, + component_config: E3dcInverterSetup) -> None: + self.component_config = component_config + self.sim_counter = SimCounter(device_id, self.component_config.id, prefix="pv") + self.__store = get_inverter_value_store(self.component_config.id) + self.component_info = ComponentInfo.from_component_config(self.component_config) + + def update(self, client: modbus.ModbusTcpClient_) -> None: + + pv, pv_external = read_inverter(client, self.component_config.configuration.read_ext) + # pv_external - > pv Leistung + # die als externe Produktion an e3dc angeschlossen ist + # nur auslesen wenn als relevant parametrisiert + # (read_external = 1) , sonst doppelte Auslesung + # pv -> pv Leistung die direkt an e3dc angeschlossen ist + log.debug("read_ext %d", self.component_config.configuration.read_ext) + log.debug("pv %d pv_external %d", pv, pv_external) + # pv_other sagt aus, ob WR definiert ist, + # und dessen PV Leistung auch gilt + # wenn 0 gilt nur PV und pv_external aus e3dc + pv_total = pv + pv_external + # Wenn wr1 nicht definiert ist, + # gilt nur die PV Leistung die hier im Modul ermittelt wurde + # als gesamte PV Leistung für wr1 + # Im gegensatz zu v1.9 implementierung wird nicht mehr die PV + # leistung vom WR1 gelesen, da die durch v2.0 separat gehandelt wird + _, pv_exported = self.sim_counter.sim_count(pv_total) + inverter_state = InverterState( + power=pv_total, + exported=pv_exported + ) + self.__store.set(inverter_state) + + +component_descriptor = ComponentDescriptor(configuration_factory=E3dcInverterSetup) From dff82d50af3b0bf278d6e4c72ee7e56487221aa4 Mon Sep 17 00:00:00 2001 From: "cshagen@hagens.ch" Date: Sat, 12 Nov 2022 13:04:41 +0100 Subject: [PATCH 032/201] show PV Charged energy in colors theme --- web/themes/colors/powerdata.js | 11 +- web/themes/colors/powergraph.js | 125 ++++--- web/themes/colors/processAllMqttMsg.js | 16 +- web/themes/colors/yieldmeter.js | 478 ++++++++++++++----------- 4 files changed, 356 insertions(+), 274 deletions(-) diff --git a/web/themes/colors/powerdata.js b/web/themes/colors/powerdata.js index 8db1c70507..ebab76fe52 100644 --- a/web/themes/colors/powerdata.js +++ b/web/themes/colors/powerdata.js @@ -46,7 +46,8 @@ class WbData { "charging": { name: "Laden", power: 0, energy: 0, color: "white" }, "devices": { name: "Geräte", power: 0, energy: 0, color: "white" }, "batIn": { name: "> Bat", power: 0, energy: 0, color: "white" }, - "house": { name: "Haus", power: 0, energy: 0, color: "white" } + "house": { name: "Haus", power: 0, energy: 0, color: "white" }, + "chargingPv": { name: "PVCharge", power: 0, energy: 0, color: "white"} }; this.historicSummary = { @@ -58,6 +59,7 @@ class WbData { "batIn": { name: "> Bat", power: 0, energy: 0, color: "white" }, "house": { name: "Haus", power: 0, energy: 0, color: "white" }, "devices": { name: "Geräte", power: 0, energy: 0, color: "white" }, + "chargingPv": {name: "PVCharge", power: 0, energy: 0, color: "white"} }; this.usageDetails = [this.usageSummary.evuOut]; @@ -82,6 +84,8 @@ class WbData { this.usageSummary.devices.color = 'var(--color-devices)'; this.usageSummary.batIn.color = 'var(--color-battery)'; this.usageSummary.house.color = 'var(--color-house)'; + this.usageSummary.chargingPv.color = 'var(--color-charging)'; + var i; for (i = 0; i < 8; i++) { this.chargePoint[i].color = 'var(--color-lp' + (i + 1) + ')'; @@ -102,6 +106,7 @@ class WbData { this.historicSummary.devices.color = 'var(--color-devices)'; this.historicSummary.batIn.color = 'var(--color-battery)'; this.historicSummary.house.color = 'var(--color-house)'; + this.historicSummary.chargingPv.color = 'var(--color-charging)'; evuCol = style.getPropertyValue('--evuCol'); xgridCol = style.getPropertyValue('--xgridCol'); tickCol = style.getPropertyValue('--tickCol'); @@ -338,7 +343,8 @@ class WbData { this.usageSummary.charging] .concat(this.shDevice.filter(row => (row.configured && row.showInGraph))) .concat(this.consumer.filter(row => (row.configured))) - .concat([this.usageSummary.batIn, this.usageSummary.house]); + .concat([this.usageSummary.batIn, this.usageSummary.house]) + .concat([this.usageSummary.chargingPv]); } updateConsumerSummary(cat) { @@ -551,6 +557,7 @@ function shiftRight() { wbdata.persistGraphPreferences(); d3.select("button#graphLeftButton").classed("disabled", false) d3.select("button#graphRightButton").classed("disabled", true) + yieldMeter.update() } else { // currently looking at a previous day wbdata.graphDate.setTime(wbdata.graphDate.getTime() + 86400000); const nd = wbdata.graphDate; diff --git a/web/themes/colors/powergraph.js b/web/themes/colors/powergraph.js index 7ed072be7b..2e1999dc13 100644 --- a/web/themes/colors/powergraph.js +++ b/web/themes/colors/powergraph.js @@ -70,7 +70,6 @@ class PowerGraph { .on("click", changeStack) d3.select("button#gridChangeButton") .on("click", toggleGrid) - } activateLive() { @@ -146,6 +145,7 @@ class PowerGraph { } catch (err) { //on initial run of activate, subscribeDayGraph is not yet initialized. // the error can be ignored + console.error("subscribeMonthGraph failed") } this.updateHeading(); } @@ -251,7 +251,7 @@ class PowerGraph { if (segment[0] == "") { segment = []; } - const serialNo = topic.substring(28, topic.length); + const serialNo = topic.substring(29, topic.length); if (serialNo != "") { if (typeof (this.staging[+serialNo - 1]) === 'undefined') { this.staging[+serialNo - 1] = segment; @@ -261,13 +261,23 @@ class PowerGraph { if (this.initCounter == 12) {// Initialization complete unsubscribeMonthGraph(); this.initCounter = 0; - this.staging.map(segment => - segment.map(line => this.rawData.push(line)) - ) + this.staging.map((segment, i) => { + if (i == 3) { + segment.map((line, i) => { + if (line.length > 1) { this.rawData.push(line) } + }) + } + }) this.rawData.map((line, i, a) => { if (i > 0) { - const values = this.extractMonthValues(line, a[i - 1]); - this.graphData.push(values); + if (line != "0" && line != "") { + const values = this.extractMonthValues(line, a[i - 1]); + if ((values.date.getFullYear() == wbdata.graphMonth.year) + && ((values.date.getMonth() == wbdata.graphMonth.month) + || ((values.date.getMonth() == (wbdata.graphMonth.month +1)) && (values.date.getDate == 1)) + ) + ) { this.graphData.push(values); } + } } else { // const values = this.extractValues(line, []); } @@ -293,7 +303,7 @@ class PowerGraph { let deviceIndex = (wbdata.graphMode == 'day') ? 26 : 19; for (var i = 0; i < 9; i++) { deviceEnergy = (endValues[deviceIndex + i] - startValues[deviceIndex + i]) / 1000; - if (deviceEnergy < 0) {deviceEnergy = 0} + if (deviceEnergy < 0) { deviceEnergy = 0 } deviceEnergySum = deviceEnergySum + deviceEnergy wbdata.historicSummary['sh' + i].energy = deviceEnergy } @@ -303,8 +313,13 @@ class PowerGraph { wbdata.historicSummary.batIn.energy = (endValues[8] - startValues[8]) / 1000; wbdata.historicSummary.house.energy = wbdata.historicSummary.evuIn.energy + wbdata.historicSummary.pv.energy + wbdata.historicSummary.batOut.energy - wbdata.historicSummary.evuOut.energy - wbdata.historicSummary.batIn.energy - wbdata.historicSummary.charging.energy - wbdata.historicSummary.devices.energy; + + let pvCharged = this.graphData.reduce((prev, cur) => { + return prev + (cur.chargingPv / 12); + }, 0) + wbdata.historicSummary.chargingPv.energy = pvCharged / 1000; + wbdata.usageSummary.chargingPv.energy = pvCharged / 1000; } - // console.log (wbdata.historicSummary) } extractLiveValues(payload) { const elements = payload.split(","); @@ -397,6 +412,8 @@ class PowerGraph { for (i = 3; i < 8; i++) { values["lp" + i] = this.calcValue(12 + i, elements, oldElements); } + values.lpSum = this.calcValue(7, elements, oldElements); + values.lpSumPv = this.calcValue(29, elements, oldElements); values.soc1 = +elements[21]; values.soc2 = +elements[22]; // smart home @@ -421,49 +438,57 @@ class PowerGraph { if (values.housePower < 0) { values.housePower = 0; }; values.selfUsage = values.solarPower - values.gridPush; if (values.selfUsage < 0) { values.selfUsage = 0; }; + if ((values.solarPower + values.gridPull + values.batOut - values.gridPush - values.batIn) > 0) { + values.chargingPv = values.charging * values.solarPower / (values.solarPower + values.gridPull + values.batOut - values.gridPush - values.batIn) + } else { + values.chargingPv = 0; + } return values; } extractMonthValues(payload, oldPayload) { - const elements = payload.split(","); - const oldElements = oldPayload.split(","); - var values = {}; - values.date = new Date(d3.timeParse("%Y%m%d%H%M")(oldElements[0] + '1200')); - // evu - values.gridPull = this.calcMonthlyValue(1, elements, oldElements); - values.gridPush = this.calcMonthlyValue(2, elements, oldElements); - // pv - values.solarPower = this.calcMonthlyValue(3, elements, oldElements); - values.inverter = 0; - // charge points - values.charging = this.calcMonthlyValue(7, elements, oldElements); - var i; - for (i = 0; i < 3; i++) { - values["lp" + i] = this.calcMonthlyValue(4 + i, elements, oldElements); - } - for (i = 3; i < 8; i++) { - values["lp" + i] = this.calcMonthlyValue(12 + i - 3, elements, oldElements); - } - values.soc1 = +elements[21]; - values.soc2 = +elements[22]; - // smart home - for (i = 0; i < 10; i++) { - values["sh" + i] = this.calcMonthlyValue(19 + i, elements, oldElements); - } - //consumers - values.co0 = this.calcMonthlyValue(10, elements, oldElements); - values.co1 = this.calcMonthlyValue(12, elements, oldElements); - //battery - values.batIn = this.calcMonthlyValue(17, elements, oldElements); - values.batOut = this.calcMonthlyValue(18, elements, oldElements); - values.batterySoc = +elements[20]; - // calculated values - values.housePower = values.gridPull + values.solarPower + values.batOut - - values.gridPush - values.batIn - values.charging - values.co0 - values.co1 - - values.sh0 - values.sh1 - values.sh2 - values.sh3 - values.sh4 - values.sh5 - values.sh6 - values.sh7 - values.sh8 - values.sh9; if (values.housePower < 0) { values.housePower = 0; }; - values.selfUsage = values.solarPower - values.gridPush; - if (values.selfUsage < 0) { values.selfUsage = 0; }; - return values; + if (payload != "0") { + const elements = payload.split(","); + const oldElements = oldPayload.split(","); + var values = {}; + values.date = new Date(d3.timeParse("%Y%m%d%H%M")(oldElements[0] + '1200')); + // evu + values.gridPull = this.calcMonthlyValue(1, elements, oldElements); + values.gridPush = this.calcMonthlyValue(2, elements, oldElements); + // pv + values.solarPower = this.calcMonthlyValue(3, elements, oldElements); + values.inverter = 0; + // charge points + values.charging = this.calcMonthlyValue(7, elements, oldElements); + values.chargingPv = this.calcMonthlyValue(29, elements, oldElements); + var i; + for (i = 0; i < 3; i++) { + values["lp" + i] = this.calcMonthlyValue(4 + i, elements, oldElements); + } + for (i = 3; i < 8; i++) { + values["lp" + i] = this.calcMonthlyValue(12 + i - 3, elements, oldElements); + } + values.soc1 = +elements[21]; + values.soc2 = +elements[22]; + // smart home + for (i = 0; i < 10; i++) { + values["sh" + i] = this.calcMonthlyValue(19 + i, elements, oldElements); + } + //consumers + values.co0 = this.calcMonthlyValue(10, elements, oldElements); + values.co1 = this.calcMonthlyValue(12, elements, oldElements); + //battery + values.batIn = this.calcMonthlyValue(17, elements, oldElements); + values.batOut = this.calcMonthlyValue(18, elements, oldElements); + values.batterySoc = +elements[20]; + // calculated values + values.housePower = values.gridPull + values.solarPower + values.batOut + - values.gridPush - values.batIn - values.charging - values.co0 - values.co1 + - values.sh0 - values.sh1 - values.sh2 - values.sh3 - values.sh4 - values.sh5 - values.sh6 - values.sh7 - values.sh8 - values.sh9; if (values.housePower < 0) { values.housePower = 0; }; + values.selfUsage = values.solarPower - values.gridPush; + if (values.selfUsage < 0) { values.selfUsage = 0; }; + return values; + } else return {} } reset() { this.resetLiveGraph(); @@ -477,6 +502,8 @@ class PowerGraph { this.initialGraphData = []; this.graphData = []; this.graphRefreshCounter = 0; + wbdata.historicSummary.chargingPv.energy = 0; + wbdata.usageSummary.chargingPv.energy = 0; } resetDayGraph() { @@ -495,8 +522,6 @@ class PowerGraph { this.graphData = []; } - - calcValue(i, array, oldArray) { var val = (array[i] - oldArray[i]) * 12; if (val < 0 || val > 150000) { diff --git a/web/themes/colors/processAllMqttMsg.js b/web/themes/colors/processAllMqttMsg.js index 35b5307198..d2da5e4869 100644 --- a/web/themes/colors/processAllMqttMsg.js +++ b/web/themes/colors/processAllMqttMsg.js @@ -37,6 +37,7 @@ function getIndex(topic) { function handlevar(mqttmsg, mqttpayload) { // receives all messages and calls respective function to process them + if (mqttmsg.match(/^openwb\/graph\//i)) { processGraphMessages(mqttmsg, mqttpayload); } else if (mqttmsg.match(/^openwb\/evu\//i)) { processEvuMessages(mqttmsg, mqttpayload); } else if (mqttmsg.match(/^openwb\/global\/awattar\//i)) { processETProviderMessages(mqttmsg, mqttpayload); } @@ -53,7 +54,7 @@ function handlevar(mqttmsg, mqttpayload) { else if (mqttmsg.match(/^openwb\/SmartHome\/Status\//i)) { processSmartHomeDevicesStatusMessages(mqttmsg, mqttpayload); } else if (mqttmsg.match(/^openwb\/config\/get\/sofort\/lp\//i)) { processSofortConfigMessages(mqttmsg, mqttpayload); } else if (mqttmsg.match(/^openwb\/config\/get\/pv\//i)) { processPvConfigMessages(mqttmsg, mqttpayload); } -} // end handlevar + } // end handlevar function processETProviderMessages(mqttmsg, mqttpayload) { // processes mqttmsg for topic openWB/global @@ -647,7 +648,7 @@ function processSystemMessages(mqttmsg, mqttpayload) { else if (mqttmsg.match(/^openwb\/system\/daygraphdata[1-9][0-9]*$/i)) { powerGraph.updateDay(mqttmsg, mqttpayload); } - else if (mqttmsg.match(/^openwb\/system\/monthgraphdata[1-9][0-9]*$/i)) { + else if (mqttmsg.match(/^openwb\/system\/monthgraphdatan[1-9][0-9]*$/i)) { powerGraph.updateMonth(mqttmsg, mqttpayload); } } @@ -1288,19 +1289,22 @@ function unsubscribeDayGraph() { } function subscribeMonthGraph(date) { - // var today = new Date(); var mm = String(date.month + 1).padStart(2, '0'); //January is 0! var yyyy = date.year; graphdate = yyyy + mm; for (var segment = 1; segment < 13; segment++) { - var topic = "openWB/system/MonthGraphData" + segment; + var topic = "openWB/system/MonthGraphDatan" + segment; client.subscribe(topic, { qos: 0 }); } - publish(graphdate, "openWB/set/graph/RequestMonthGraph"); + publish(graphdate, "openWB/set/graph/RequestMonthGraphv1"); } function unsubscribeMonthGraph() { - publish("0", "openWB/set/graph/RequestMonthGraph"); + for (var segment = 1; segment < 13; segment++) { + var topic = "openWB/system/MonthGraphDatan" + segment; + client.unsubscribe(topic); + } + publish("0", "openWB/set/graph/RequestMonthGraphv1"); } function makeInt(message) { diff --git a/web/themes/colors/yieldmeter.js b/web/themes/colors/yieldmeter.js index 4550220818..1a0cd777d9 100644 --- a/web/themes/colors/yieldmeter.js +++ b/web/themes/colors/yieldmeter.js @@ -5,222 +5,268 @@ */ class YieldMeter { - bardata; - xScale; - yScale; - svg; - - constructor() { - this.width = 500; - this.height = 500; - this.margin = { - top: 25, bottom: 30, left: 25, right: 0 - }; - this.labelfontsize = 16; - this.axisFontSize = 12; - this.textLength = 12; - } - - // to be called when the document is loaded - init() { - const figure = d3.select("figure#energymeter"); - this.svg = figure.append("svg") - .attr("viewBox", `0 0 500 500`); - const style = getComputedStyle(document.body); - this.houseColor = 'var(--color-house)'; - this.pvColor = 'var(--color-pv)'; - this.exportColor = 'var(--color-export)'; - this.evuColor = 'var(--color-evu)'; - this.bgColor = 'var(--color-bg)'; - this.chargeColor = 'var(--color-charging)'; - this.axisColor = 'var(--color-axis)'; - this.gridColor = 'var(--color-grid)'; - d3.select("button#energyLeftButton") - .on("click", shiftLeft) - d3.select("button#energyRightButton") - .on("click", shiftRight) - d3.select("button#calendarButton") - .on("click", toggleMonthView) - } - - // to be called when values have changed - update() { - switch (wbdata.graphMode) { - case 'live': - this.plotdata = Object.values(wbdata.sourceSummary) - .filter((row) => (row.energy > 0)) - .concat(wbdata.usageDetails - .filter((row) => (row.energy > 0))); - break; - case 'day': - if (wbdata.showTodayGraph) { - this.plotdata = Object.values(wbdata.sourceSummary) - .filter((row) => (row.energy > 0)) - .concat(wbdata.usageDetails - .filter((row) => (row.energy > 0))); - } else { - this.plotdata = Object.values(wbdata.historicSummary) - .filter((row) => (row.energy > 0)); - } - break; - case 'month': - this.plotdata = Object.values(wbdata.historicSummary) - .filter((row) => (row.energy > 0)); - break; - default: break; - } - this.adjustLabelSize() - const svg = this.createOrUpdateSvg(); - this.drawChart(svg); - this.updateHeading(); - }; - - createOrUpdateSvg() { - this.svg.selectAll("*").remove(); - const g = this.svg.append("g") - .attr("transform", "translate(" + this.margin.left + "," + this.margin.top + ")"); - this.xScale = d3.scaleBand() - .range([0, this.width - this.margin.left - this.margin.right]) - .padding(0.4); - this.yScale = d3.scaleLinear() - .range([this.height - this.margin.bottom - this.margin.top, 0]); - return g; - } - - drawChart(svg) { - const ymax = d3.max(this.plotdata, (d) => d.energy); - this.xScale.domain(this.plotdata.map((d) => d.name)); - this.yScale.domain([0, Math.ceil(ymax)]); - const bargroups = svg - .selectAll(".bar") - .data(this.plotdata) - .enter() - .append("g"); - bargroups - .append("rect") - .attr("class", "bar") - .attr("x", (d) => this.xScale(d.name)) - .attr("y", (d) => this.yScale(d.energy)) - .attr("width", this.xScale.bandwidth()) - .attr("height", (d) => this.height - this.yScale(d.energy) - this.margin.top - this.margin.bottom) - .attr("fill", (d) => d.color); - - const yAxisGenerator = d3.axisLeft(this.yScale) - .tickFormat(function (d) { - return ((d > 0) ? d : ""); - }) - .ticks(8) - .tickSizeInner(-this.width); - - const yAxis = svg.append("g") - .attr("class", "axis") - .attr("transform", "translate(0," + 0 + ")") - .call(yAxisGenerator); - - yAxis.append("text") - .attr("y", 6) - .attr("dy", "0.71em") - .attr("text-anchor", "end") - .text("energy"); - - yAxis.selectAll(".tick").attr("font-size", this.axisFontSize); - if (wbdata.showGrid) { - yAxis.selectAll(".tick line") - .attr("stroke", this.gridColor) - .attr("stroke-width", "0.5"); - } else { - yAxis.selectAll(".tick line").attr("stroke", this.bgColor); - } - yAxis.select(".domain") - .attr("stroke", this.bgcolor); - - svg.append("text") - .attr("x", -this.margin.left) - .attr("y", -15) - .style("fill", this.axisColor) - .attr("font-size", this.axisFontSize) - .text("kWh") - ; - const labels = svg.selectAll(".label") - .data(this.plotdata) - .enter() - .append("g"); - labels - .append("text") - .attr("x", (d) => this.xScale(d.name) + this.xScale.bandwidth() / 2) - .attr("y", (d) => this.yScale(d.energy) - 10) - .attr("font-size", this.labelfontsize) - .attr("text-anchor", "middle") - .attr("fill", (d) => d.color) - .text((d) => (formatWattH(d.energy * 1000))); - - const categories = svg.selectAll(".category") - .data(this.plotdata) - .enter() - .append("g"); - labels - .append("text") - .attr("x", (d) => this.xScale(d.name) + this.xScale.bandwidth() / 2) - .attr("y", this.height - this.margin.bottom - 5) - .attr("font-size", this.labelfontsize) - .attr("text-anchor", "middle") - .attr("fill", (d) => d.color) - .text((d) => (this.truncateCategory(d.name))); - } - - updateHeading() { - var heading = "Energie "; - - switch (wbdata.graphMode) { - case 'live': - heading = heading + " heute"; - break; - case 'day': - if (wbdata.showTodayGraph) { - heading = heading + " heute"; - } else { - heading = heading + wbdata.graphDate.getDate() + "." + (wbdata.graphDate.getMonth() + 1) + "."; - } - break; - case 'month': - heading = "Monatswerte " + formatMonth(wbdata.graphMonth.month, wbdata.graphMonth.year); - break; - default: break; - } - d3.select("h3#energyheading").text(heading); - } - - adjustLabelSize() { - let xCount = this.plotdata.length - if (xCount <= 5) { - this.maxTextLength = 12; - this.labelfontsize = 16 - } else if (xCount == 6) { - this.maxTextLength = 11; - this.labelfontsize = 14 - } else if (xCount > 6 && xCount <= 8) { - this.maxTextLength = 8; - this.labelfontsize = 13 - } else if (xCount == 9) { - this.maxTextLength = 8; - this.labelfontsize = 11; - } else if (xCount == 10) { - this.maxTextLength = 7; - this.labelfontsize = 10; - } - else { - this.maxTextLength = 6; - this.labelfontsize = 9 - } - } - - truncateCategory(name) { - if (name.length > this.maxTextLength) { - return name.substr(0, this.maxTextLength) + "." - } else { - return name - } - } + bardata; + xScale; + yScale; + svg; + + constructor() { + this.width = 500; + this.height = 500; + this.margin = { + top: 25, bottom: 30, left: 25, right: 0 + }; + this.labelfontsize = 16; + this.axisFontSize = 12; + this.textLength = 12; + } + + // to be called when the document is loaded + init() { + const figure = d3.select("figure#energymeter"); + this.svg = figure.append("svg") + .attr("viewBox", `0 0 500 500`); + const style = getComputedStyle(document.body); + this.houseColor = 'var(--color-house)'; + this.pvColor = 'var(--color-pv)'; + this.exportColor = 'var(--color-export)'; + this.evuColor = 'var(--color-evu)'; + this.bgColor = 'var(--color-bg)'; + this.chargeColor = 'var(--color-charging)'; + this.axisColor = 'var(--color-axis)'; + this.gridColor = 'var(--color-grid)'; + d3.select("button#energyLeftButton") + .on("click", shiftLeft) + d3.select("button#energyRightButton") + .on("click", shiftRight) + d3.select("button#calendarButton") + .on("click", toggleMonthView) + } + + // to be called when values have changed + update() { + switch (wbdata.graphMode) { + case 'live': + this.plotdata = Object.values(wbdata.sourceSummary) + .filter((row) => (row.energy > 0)) + .concat(wbdata.usageDetails + .filter((row) => (row.energy > 0))); + break; + case 'day': + if (wbdata.showTodayGraph) { + this.plotdata = Object.values(wbdata.sourceSummary) + .filter((row) => (row.energy > 0)) + .concat(wbdata.usageDetails + .filter((row) => (row.energy > 0))); + } else { + this.plotdata = Object.values(wbdata.historicSummary) + .filter((row) => (row.energy > 0)); + } + break; + case 'month': + this.plotdata = Object.values(wbdata.historicSummary) + .filter((row) => (row.energy > 0)); + break; + default: break; + } + this.adjustLabelSize() + const svg = this.createOrUpdateSvg(); + this.drawChart(svg); + this.updateHeading(); + }; + + createOrUpdateSvg() { + this.svg.selectAll("*").remove(); + const g = this.svg.append("g") + .attr("transform", "translate(" + this.margin.left + "," + this.margin.top + ")"); + this.xScale = d3.scaleBand() + .range([0, this.width - this.margin.left - this.margin.right]) + .padding(0.4); + this.yScale = d3.scaleLinear() + .range([this.height - this.margin.bottom - this.margin.top, 10]); + return g; + } + + drawChart(svg) { + let pvcdata = this.plotdata.filter(d => (d.name == "PVCharge")) + let chargedata = this.plotdata.filter(d => d.name == "Laden") + this.plotdata = this.plotdata.filter(d => (d.name != "PVCharge")) + const ymax = d3.max(this.plotdata, (d) => d.energy); + this.xScale.domain(this.plotdata.map((d) => d.name)); + this.yScale.domain([0, Math.ceil(ymax)]); + + // Draw the bars + const bargroups = svg + .selectAll(".bar") + .data(this.plotdata) + .enter() + .append("g"); + bargroups + .append("rect") + .attr("class", "bar") + .attr("x", (d) => this.xScale(d.name)) + .attr("y", (d) => this.yScale(d.energy)) + .attr("width", this.xScale.bandwidth()) + .attr("height", (d) => (this.height - this.yScale(d.energy) - this.margin.top - this.margin.bottom)) + .attr("fill", (d) => d.color); + + // Display the PV Charging inner bar + if ((pvcdata.length > 0) && (chargedata.length > 0) && (chargedata[0].energy > 0)) { + const pvcBargroup = svg + .selectAll(".pvcBar") + .data(pvcdata) + .enter() + .append("g") + pvcBargroup + .append("rect") + .attr("class", "bar") + .attr("x", (d) => this.xScale("Laden") + this.xScale.bandwidth() / 6) + .attr("y", (d) => this.yScale(d.energy)) + .attr("width", this.xScale.bandwidth() * 2 / 3) + .attr("height", (d) => (this.height - this.yScale(d.energy) - this.margin.top - this.margin.bottom)) + .attr("fill", this.pvColor) + .attr("fill-opacity", "66%"); + } + const yAxisGenerator = d3.axisLeft(this.yScale) + .tickFormat(function (d) { + return ((d > 0) ? d : ""); + }) + .ticks(8) + .tickSizeInner(-this.width); + + const yAxis = svg.append("g") + .attr("class", "axis") + .attr("transform", "translate(0," + 0 + ")") + .call(yAxisGenerator); + + yAxis.append("text") + .attr("y", 6) + .attr("dy", "0.71em") + .attr("text-anchor", "end") + .text("energy"); + + yAxis.selectAll(".tick").attr("font-size", this.axisFontSize); + if (wbdata.showGrid) { + yAxis.selectAll(".tick line") + .attr("stroke", this.gridColor) + .attr("stroke-width", "0.5"); + } else { + yAxis.selectAll(".tick line").attr("stroke", this.bgColor); + } + yAxis.select(".domain") + .attr("stroke", this.bgcolor); + + svg.append("text") + .attr("x", -this.margin.left) + .attr("y", -15) + .style("fill", this.axisColor) + .attr("font-size", this.axisFontSize) + .text("kWh") + ; + + // add value labels to the bars + const labels = svg.selectAll(".label") + .data(this.plotdata) + .enter() + .append("g"); + labels + .append("text") + .attr("x", (d) => this.xScale(d.name) + this.xScale.bandwidth() / 2) + .attr("y", (d) => { + if (d.name == "Laden" && pvcdata.length > 0) { + return this.yScale(d.energy) - 25 + } else { + return this.yScale(d.energy) - 10 + } + }) + .attr("font-size", this.labelfontsize) + .attr("text-anchor", "middle") + .attr("fill", (d) => d.color) + .text((d) => (formatWattH(d.energy * 1000))); + + // add a PV percentage tag to the charging bar + if ((pvcdata.length > 0) && (chargedata.length > 0) && (chargedata[0].energy > 0)) { + let pvRatio = Math.round (pvcdata[0].energy / chargedata[0].energy * 100) + + const pvtags = svg.selectAll(".pvtag") + .data(chargedata) + .enter() + .append("g"); + pvtags + .append("text") + .attr("x", (d) => this.xScale(d.name) + this.xScale.bandwidth() / 2) + .attr("y", (d) => this.yScale(d.energy) - 10) + .attr("font-size", this.labelfontsize - 2) + .attr("text-anchor", "middle") + .attr("fill", (d) => this.pvColor) + .text((d) => ("(PV: " + pvRatio.toLocaleString(undefined) + " %)")); + } + + // Add category labels + labels + .append("text") + .attr("x", (d) => this.xScale(d.name) + this.xScale.bandwidth() / 2) + .attr("y", this.height - this.margin.bottom - 5) + .attr("font-size", this.labelfontsize) + .attr("text-anchor", "middle") + .attr("fill", (d) => d.color) + .text((d) => (this.truncateCategory(d.name))); + + } + + updateHeading() { + var heading = "Energie "; + + switch (wbdata.graphMode) { + case 'live': + heading = heading + " heute"; + break; + case 'day': + if (wbdata.showTodayGraph) { + heading = heading + " heute"; + } else { + heading = heading + wbdata.graphDate.getDate() + "." + (wbdata.graphDate.getMonth() + 1) + "."; + } + break; + case 'month': + heading = "Monatswerte " + formatMonth(wbdata.graphMonth.month, wbdata.graphMonth.year); + break; + default: break; + } + d3.select("h3#energyheading").text(heading); + } + + adjustLabelSize() { + let xCount = this.plotdata.length + if (xCount <= 5) { + this.maxTextLength = 12; + this.labelfontsize = 16 + } else if (xCount == 6) { + this.maxTextLength = 11; + this.labelfontsize = 14 + } else if (xCount > 6 && xCount <= 8) { + this.maxTextLength = 8; + this.labelfontsize = 13 + } else if (xCount == 9) { + this.maxTextLength = 8; + this.labelfontsize = 11; + } else if (xCount == 10) { + this.maxTextLength = 7; + this.labelfontsize = 10; + } + else { + this.maxTextLength = 6; + this.labelfontsize = 9 + } + } + + truncateCategory(name) { + if (name.length > this.maxTextLength) { + return name.substr(0, this.maxTextLength) + "." + } else { + return name + } + } } From 867aecfed0a91808088db9f98672634e81cf5d52 Mon Sep 17 00:00:00 2001 From: "cshagen@hagens.ch" Date: Sat, 12 Nov 2022 13:13:11 +0100 Subject: [PATCH 033/201] change indentation from spaces to tabs --- web/themes/colors/powergraph.js | 1796 +++++++++++++++---------------- 1 file changed, 898 insertions(+), 898 deletions(-) diff --git a/web/themes/colors/powergraph.js b/web/themes/colors/powergraph.js index 2e1999dc13..445bcda1e1 100644 --- a/web/themes/colors/powergraph.js +++ b/web/themes/colors/powergraph.js @@ -1,906 +1,906 @@ class PowerGraph { - svg; - xScale; - - constructor() { - this.graphData = []; - this.initCounter = 0; - this.staging = []; - this.rawData = []; - this.graphdata = [] - this.initialGraphData = []; - this.initialized = false; - this.colors = []; - this.gridColors = {}; - this.bgcolor = ""; - this.axiscolor = ""; - this.chargeColor = ""; - this.lp1color = ""; - this.lp2color = ""; - this.batteryColor = ""; - this.batSocColor = ""; - this.graphRefreshCounter = 0; - this.width = 500; - this.height = 500; - this.margin = { top: 10, right: 20, bottom: 10, left: 25 }; - this.liveGraphMinutes = 0; - wbdata.usageStackOrder = 2; - } - - init() { - var style = getComputedStyle(document.body); - this.colors.housePower = 'var(--color-house)'; - this.colors.batIn = 'var(--color-battery)'; - this.colors.inverter = 'var(--color-pv)'; - this.gridColors[0] = 'var(--color-battery)'; - this.colors.batOut = 'var(--color-battery)'; - this.gridColors[1] = 'var(--color-pv)'; - this.colors.selfUsage = 'var(--color-pv)'; - this.gridColors[2] = 'var(--color-export)'; - this.colors.gridPush = 'var(--color-export)'; - this.gridColors[3] = 'var(--color-evu)'; - this.colors.gridPull = 'var(--color-evu)'; - this.bgcolor = 'var(--color-bg)'; - this.chargeColor = 'var(--color-charging)'; - this.axiscolor = 'var(--color-axis)'; - this.gridcolor = 'var(--color-grid)'; - this.lp1color = 'var(--color-lp1)'; - this.lp2color = 'var(--color-lp2)'; - this.batteryColor = 'var(--color-battery)'; - this.batSocColor = 'var(--color-title)'; - var i; - for (i = 0; i < 8; i++) { - this.colors["lp" + i] = wbdata.chargePoint[i].color; - } - for (i = 0; i < 8; i++) { - this.colors["sh" + i] = wbdata.shDevice[i].color; - } - this.colors.co0 = 'var(--color-co1)'; - this.colors.co1 = 'var(--color-co2)'; - - var figure = d3.select("figure#powergraph"); - this.svg = figure.append("svg") - .attr("viewBox", `0 0 500 500`); - - d3.select("button#graphLeftButton") - .on("click", shiftLeft) - d3.select("button#graphRightButton") - .on("click", shiftRight) - d3.select("button#graphChangeButton") - .on("click", changeStack) - d3.select("button#gridChangeButton") - .on("click", toggleGrid) - } - - activateLive() { - try { - this.resetLiveGraph(); - subscribeMqttGraphSegments(); - subscribeGraphUpdates(); - } catch (err) { - // on initial invocation this method is not existing - } - this.updateHeading(); - } - - deactivateLive() { - try { - unsubscribeMqttGraphSegments(); - unsubscribeGraphUpdates(); - } catch (err) { - // on initial run this method is not existing - } - } - - activateDay() { - if (wbdata.graphMode == 'day') { - if (wbdata.showTodayGraph) { - wbdata.graphDate = new Date(); // ensure we update todays date if day changes during display - } - this.resetDayGraph(); - try { - subscribeDayGraph(wbdata.graphDate); - } catch (err) { - //on initial run of activate, subscribeDayGraph is not yet initialized. - // the error can be ignored - } - this.updateHeading(); - } - } - - updateHeading() { - var heading = "Leistung / Ladestand "; - switch (wbdata.graphMode) { - case 'live': - heading = heading + this.liveGraphMinutes + " min"; - break; - case 'day': - const today = new Date(); - if (today.getDate() == wbdata.graphDate.getDate() && today.getMonth() == wbdata.graphDate.getMonth() && today.getFullYear() == wbdata.graphDate.getFullYear()) { - heading = heading + "heute"; - } else { - heading = heading + wbdata.graphDate.getDate() + "." + (wbdata.graphDate.getMonth() + 1) + "."; - } - break; - case 'month': - heading = "Tageswerte " + formatMonth(wbdata.graphMonth.month, wbdata.graphMonth.year); - break; - default: break; - } - d3.select("h3#graphheading").text(heading); - } - - deactivateDay() { - try { - unsubscribeDayGraph(); - } catch (err) { - // ignore error - } - } - - activateMonth() { - this.resetMonthGraph(); - try { - subscribeMonthGraph(wbdata.graphMonth); - } catch (err) { - //on initial run of activate, subscribeDayGraph is not yet initialized. - // the error can be ignored - console.error("subscribeMonthGraph failed") - } - this.updateHeading(); - } - - deactivateMonth() { - try { - unsubscribeMonthGraph(); - } catch (err) { - // ignore error - } - } - - updateLive(topic, payload) { - if (wbdata.graphMode == 'live') { // only update if live graph is active - if (this.initialized) { // steady state - if (topic === "openWB/graph/lastlivevalues") { - const values = this.extractLiveValues(payload.toString()); - this.graphRefreshCounter++; - this.graphData.push(values); - this.updateGraph(); - if (this.graphRefreshCounter > 60) { - this.resetLiveGraph(); - subscribeMqttGraphSegments(); - } - } - } else { // init phase - const t = topic; - if (t.substring(t.length - 13, t.length) === "alllivevalues") { - // init message - const serialNo = t.substring(13, t.length - 13); - var bulkdata = payload.toString().split("\n"); - if (bulkdata.length <= 1) { - bulkdata = []; - } - if (serialNo != "") { - if (typeof (this.initialGraphData[+serialNo - 1]) === 'undefined') { - this.initialGraphData[+serialNo - 1] = bulkdata; - this.initCounter++; - } - } - if (this.initCounter == 16) {// Initialization complete - this.initialized = true; - this.initialGraphData.map(bulkdata => { - bulkdata.map((line) => { - const values = this.extractLiveValues(line); - this.graphData.push(values); - }); - }); - const startTime = this.graphData[0].date; - const endTime = this.graphData[this.graphData.length - 1].date; - this.liveGraphMinutes = Math.round((endTime - startTime) / 60000); - this.updateHeading(); - this.updateGraph(); - unsubscribeMqttGraphSegments(); - } - } - } - } - } - - updateDay(topic, payload) { - var segment; - if (payload == 'empty') { - segment = []; - } else { - segment = payload.toString().split("\n"); - if (segment[0] == "") { - segment = []; - } - const serialNo = topic.substring(26, topic.length); - if (serialNo != "") { - if (typeof (this.staging[+serialNo - 1]) === 'undefined') { - this.staging[+serialNo - 1] = segment; - this.initCounter++; - } - } - } - if (this.initCounter == 12) {// Initialization complete - unsubscribeDayGraph(); - - this.initCounter = 0; - this.staging.map(segment => - segment.map(line => this.rawData.push(line)) - ) - this.rawData.map((line, i, a) => { - if (i > 0) { - const values = this.extractDayValues(line, a[i - 1]); - this.graphData.push(values); - } else { - // const values = this.extractValues(line, []); - } - }); - this.updateGraph(); - this.updateEnergyValues(); - wbdata.dayGraphUpdated(); - setTimeout(() => this.activateDay(), 300000) - } - } - - updateMonth(topic, payload) { - if (payload != 'empty') { - var segment = payload.toString().split("\n"); - if (segment[0] == "") { - segment = []; - } - const serialNo = topic.substring(29, topic.length); - if (serialNo != "") { - if (typeof (this.staging[+serialNo - 1]) === 'undefined') { - this.staging[+serialNo - 1] = segment; - this.initCounter++; - } - } - if (this.initCounter == 12) {// Initialization complete - unsubscribeMonthGraph(); - this.initCounter = 0; - this.staging.map((segment, i) => { - if (i == 3) { - segment.map((line, i) => { - if (line.length > 1) { this.rawData.push(line) } - }) - } - }) - this.rawData.map((line, i, a) => { - if (i > 0) { - if (line != "0" && line != "") { - const values = this.extractMonthValues(line, a[i - 1]); - if ((values.date.getFullYear() == wbdata.graphMonth.year) - && ((values.date.getMonth() == wbdata.graphMonth.month) - || ((values.date.getMonth() == (wbdata.graphMonth.month +1)) && (values.date.getDate == 1)) - ) - ) { this.graphData.push(values); } - } - } else { - // const values = this.extractValues(line, []); - } - }); - this.updateGraph(); - this.updateEnergyValues(); - wbdata.monthGraphUpdated(); - // setTimeout(() => this.activateDay(), 300000) - } - } - } - updateEnergyValues() { - if (this.rawData.length) { - const startValues = this.rawData[0].split(','); - const endValues = this.rawData[this.rawData.length - 1].split(','); - wbdata.historicSummary.pv.energy = (endValues[3] - startValues[3]) / 1000; - wbdata.historicSummary.evuIn.energy = (endValues[1] - startValues[1]) / 1000; - wbdata.historicSummary.batOut.energy = (endValues[9] - startValues[9]) / 1000; - wbdata.historicSummary.evuOut.energy = (endValues[2] - startValues[2]) / 1000; - wbdata.historicSummary.charging.energy = (endValues[7] - startValues[7]) / 1000; - var deviceEnergySum = 0; - var deviceEnergy = 0; - let deviceIndex = (wbdata.graphMode == 'day') ? 26 : 19; - for (var i = 0; i < 9; i++) { - deviceEnergy = (endValues[deviceIndex + i] - startValues[deviceIndex + i]) / 1000; - if (deviceEnergy < 0) { deviceEnergy = 0 } - deviceEnergySum = deviceEnergySum + deviceEnergy - wbdata.historicSummary['sh' + i].energy = deviceEnergy - } - deviceEnergySum = deviceEnergySum + (endValues[10] - startValues[10]) / 1000; - deviceEnergySum = deviceEnergySum + (endValues[12] - startValues[12]) / 1000; - wbdata.historicSummary.devices.energy = deviceEnergySum; - wbdata.historicSummary.batIn.energy = (endValues[8] - startValues[8]) / 1000; - wbdata.historicSummary.house.energy = wbdata.historicSummary.evuIn.energy + wbdata.historicSummary.pv.energy + wbdata.historicSummary.batOut.energy - - wbdata.historicSummary.evuOut.energy - wbdata.historicSummary.batIn.energy - wbdata.historicSummary.charging.energy - wbdata.historicSummary.devices.energy; - - let pvCharged = this.graphData.reduce((prev, cur) => { - return prev + (cur.chargingPv / 12); - }, 0) - wbdata.historicSummary.chargingPv.energy = pvCharged / 1000; - wbdata.usageSummary.chargingPv.energy = pvCharged / 1000; - } - } - extractLiveValues(payload) { - const elements = payload.split(","); - const now = new Date(Date.now()); - const mSecondsPerDay = 86400000 // milliseconds in a day - var values = {}; - values.date = new Date(d3.timeParse("%H:%M:%S")(elements[0])); - values.date.setDate(now.getDate()) - values.date.setMonth(now.getMonth()) - values.date.setFullYear(now.getFullYear()) - if (values.date.getHours() > now.getHours()) { // this is an entry from yesterday - values.date = new Date(values.date.getTime() - mSecondsPerDay) // change date to yesterday - } - // evu - if (+elements[1] > 0) { - values.gridPull = +elements[1]; - values.gridPush = 0; - } else { - values.gridPull = 0; - values.gridPush = -elements[1]; - } - // pv - if (+elements[3] >= 0) { - values.solarPower = +elements[3]; - values.inverter = 0; - } else { - values.solarPower = 0; - values.inverter = -elements[3] - } - // calculated values - values.housePower = +elements[11]; - values.selfUsage = values.solarPower - values.gridPush; - if (values.selfUsage < 0) { - values.selfUsage = 0; - } - // charge points - var i; - values.lp0 = +elements[4]; - values.lp1 = +elements[5]; - for (i = 2; i < 9; i++) { - values["lp" + i] = +elements[11 + i]; - } - values.soc1 = +elements[9]; - values.soc2 = +elements[10]; - - // smart home - for (i = 0; i < 8; i++) { - if (!(wbdata.shDevice[i].countAsHouse)) { - values["sh" + i] = +elements[20 + i]; - } else { - values["sh" + i] = +0; - } - } - //consumers - values.co0 = +elements[12]; - values.co1 = +elements[13]; - //battery - if (+elements[7] > 0) { - values.batIn = +elements[7]; - values.batOut = 0; - } else if (+elements[7] < 0) { - values.batIn = 0; - values.batOut = -elements[7] - } else { - values.batIn = 0; - values.batOut = 0; - }; - values.batterySoc = +elements[8]; - - return values; - } - - extractDayValues(payload, oldPayload) { - const elements = payload.split(","); - const oldElements = oldPayload.split(","); - var values = {}; - values.date = new Date(d3.timeParse("%H%M")(elements[0])); - // evu - values.gridPull = this.calcValue(1, elements, oldElements); - values.gridPush = this.calcValue(2, elements, oldElements); - // pv - values.solarPower = this.calcValue(3, elements, oldElements); - values.inverter = 0; - // charge points - values.charging = this.calcValue(7, elements, oldElements); - var i; - for (i = 0; i < 3; i++) { - values["lp" + i] = this.calcValue(4 + i, elements, oldElements); - } - for (i = 3; i < 8; i++) { - values["lp" + i] = this.calcValue(12 + i, elements, oldElements); - } - values.lpSum = this.calcValue(7, elements, oldElements); - values.lpSumPv = this.calcValue(29, elements, oldElements); - values.soc1 = +elements[21]; - values.soc2 = +elements[22]; - // smart home - for (i = 0; i < 9; i++) { - if (!(wbdata.shDevice[i].countAsHouse)) { - values["sh" + i] = this.calcValue(26 + i, elements, oldElements); - } else { - values["sh" + i] = +0; - } - } - //consumers - values.co0 = this.calcValue(10, elements, oldElements); - values.co1 = this.calcValue(12, elements, oldElements); - //battery - values.batIn = this.calcValue(8, elements, oldElements); - values.batOut = this.calcValue(9, elements, oldElements); - values.batterySoc = +elements[20]; - // calculated values - values.housePower = values.gridPull + values.solarPower + values.batOut - - values.gridPush - values.batIn - values.charging - values.co0 - values.co1 - - values.sh0 - values.sh1 - values.sh2 - values.sh3 - values.sh4 - values.sh5 - values.sh6 - values.sh7 - values.sh8; - if (values.housePower < 0) { values.housePower = 0; }; - values.selfUsage = values.solarPower - values.gridPush; - if (values.selfUsage < 0) { values.selfUsage = 0; }; - if ((values.solarPower + values.gridPull + values.batOut - values.gridPush - values.batIn) > 0) { - values.chargingPv = values.charging * values.solarPower / (values.solarPower + values.gridPull + values.batOut - values.gridPush - values.batIn) - } else { - values.chargingPv = 0; - } - return values; - } - - extractMonthValues(payload, oldPayload) { - if (payload != "0") { - const elements = payload.split(","); - const oldElements = oldPayload.split(","); - var values = {}; - values.date = new Date(d3.timeParse("%Y%m%d%H%M")(oldElements[0] + '1200')); - // evu - values.gridPull = this.calcMonthlyValue(1, elements, oldElements); - values.gridPush = this.calcMonthlyValue(2, elements, oldElements); - // pv - values.solarPower = this.calcMonthlyValue(3, elements, oldElements); - values.inverter = 0; - // charge points - values.charging = this.calcMonthlyValue(7, elements, oldElements); - values.chargingPv = this.calcMonthlyValue(29, elements, oldElements); - var i; - for (i = 0; i < 3; i++) { - values["lp" + i] = this.calcMonthlyValue(4 + i, elements, oldElements); - } - for (i = 3; i < 8; i++) { - values["lp" + i] = this.calcMonthlyValue(12 + i - 3, elements, oldElements); - } - values.soc1 = +elements[21]; - values.soc2 = +elements[22]; - // smart home - for (i = 0; i < 10; i++) { - values["sh" + i] = this.calcMonthlyValue(19 + i, elements, oldElements); - } - //consumers - values.co0 = this.calcMonthlyValue(10, elements, oldElements); - values.co1 = this.calcMonthlyValue(12, elements, oldElements); - //battery - values.batIn = this.calcMonthlyValue(17, elements, oldElements); - values.batOut = this.calcMonthlyValue(18, elements, oldElements); - values.batterySoc = +elements[20]; - // calculated values - values.housePower = values.gridPull + values.solarPower + values.batOut - - values.gridPush - values.batIn - values.charging - values.co0 - values.co1 - - values.sh0 - values.sh1 - values.sh2 - values.sh3 - values.sh4 - values.sh5 - values.sh6 - values.sh7 - values.sh8 - values.sh9; if (values.housePower < 0) { values.housePower = 0; }; - values.selfUsage = values.solarPower - values.gridPush; - if (values.selfUsage < 0) { values.selfUsage = 0; }; - return values; - } else return {} - } - reset() { - this.resetLiveGraph(); - this.resetDayGraph(); - } - - resetLiveGraph() { - // fresh reload of the graph - this.initialized = false; - this.initCounter = 0; - this.initialGraphData = []; - this.graphData = []; - this.graphRefreshCounter = 0; - wbdata.historicSummary.chargingPv.energy = 0; - wbdata.usageSummary.chargingPv.energy = 0; - } - - resetDayGraph() { - this.initialized = false; - this.initCounter = 0; - this.staging = []; - this.rawData = []; - this.graphData = []; - } - - resetMonthGraph() { - this.initialized = false; - this.initCounter = false; - this.staging = []; - this.rawData = []; - this.graphData = []; - } - - calcValue(i, array, oldArray) { - var val = (array[i] - oldArray[i]) * 12; - if (val < 0 || val > 150000) { - val = 0; - } - return val; - } - calcMonthlyValue(i, array, oldArray) { - var val = (array[i] - oldArray[i]); - - if (val < 0 || val > 150000) { - val = 0; - } - return val; - } - - updateGraph() { - const svg = this.createOrUpdateSvg(); - this.drawChart(svg); - }; - - createOrUpdateSvg() { - this.svg.selectAll("*").remove(); - this.g = this.svg - .append("g") - .attr( - "transform", - "translate(" + this.margin.left + "," + this.margin.top + ")" - ); - return this.g; - } - - drawChart(svg) { - const height = this.height - this.margin.top - this.margin.bottom; - const width = this.width - this.margin.left - this.margin.right; - this.drawSourceGraph(svg, width, height / 2); - this.drawUsageGraph(svg, width, height / 2); - if (wbdata.graphMode != 'month') { - this.drawSoc(svg, width, height / 2); - } - this.drawXAxis(svg, width, height); - } - - drawSourceGraph(svg, width, height) { - var keys = (wbdata.graphMode == 'month') ? ["gridPull", "batOut", "selfUsage", "gridPush"] : ["selfUsage", "gridPush", "batOut", "gridPull"]; - - if (wbdata.graphMode == 'month') { - const dayRange = d3.extent(this.graphData, d => d.date.getDate()) - this.xScale = d3.scaleBand() - .domain(Array.from({ length: (dayRange[1] - dayRange[0] + 1) }, (v, k) => k + dayRange[0])) - .paddingInner(0.4); - } else { - this.xScale = d3.scaleTime().domain(d3.extent(this.graphData, d => d.date)); - } - this.xScale.range([0, width - this.margin.right]); - const yScale = d3.scaleLinear().range([height - 10, 0]); - const extent = d3.extent(this.graphData, (d) => - Math.max(d.solarPower + d.gridPull + d.batOut, d.selfUsage + d.gridPush)); - - yScale.domain([0, Math.ceil(extent[1] / 1000) * 1000]); - - const stackGen = d3.stack().keys(keys); - const stackedSeries = stackGen(this.graphData); - - if (wbdata.graphMode == 'month') { - var rects = svg.selectAll(".sourcebar") - .data(stackedSeries).enter() - .append("g") - .attr("fill", (d, i) => this.colors[keys[i]]) - .selectAll("rect") - .data((d) => d).enter() - .append("rect") - .attr("x", (d) => this.xScale(d.data.date.getDate())) - .attr("y", d => yScale(d[1])) - .attr("height", d => yScale(d[0]) - yScale(d[1])) - .attr("width", this.xScale.bandwidth()) - rects.append("svg:title").text((d) => formatWattH(d[1] - d[0])); - } else { - svg.selectAll(".sourceareas") - .data(stackedSeries) - .join("path") - .attr("d", d3.area() - .x((d, i) => this.xScale(this.graphData[i].date)) - .y0((d) => yScale(d[0])) - .y1((d) => yScale(d[1])) - ) - .attr("fill", (d, i) => this.colors[keys[i]]); - } - - const yAxis = svg.append("g") - .attr("class", "axis") - .call(d3.axisLeft(yScale) - .tickSizeInner(-(width - this.margin.right)) - .ticks(4) - .tickFormat((d, i) => (d == 0) ? "" : (Math.round(d / 100) / 10))) - ; - yAxis.selectAll(".tick") - .attr("font-size", 12); - - if (wbdata.showGrid) { - yAxis.selectAll(".tick line") - .attr("stroke", this.gridcolor) - .attr("stroke-width", "0.5"); - } else { - yAxis.selectAll(".tick line").attr("stroke", this.bgcolor); - } - yAxis.select(".domain") - .attr("stroke", this.bgcolor) - ; - } - - drawUsageGraph(svg, width, height) { - const yScale = d3.scaleLinear().range([height + 10, 2 * height]); - - const extent = d3.extent(this.graphData, (d) => - (d.housePower + d.lp0 + d.lp1 + d.lp2 + d.lp3 + d.lp4 - + d.lp5 + d.lp6 + d.lp7 + d.sh0 + d.sh1 + d.sh2 + d.sh3 + d.sh4 - + d.sh5 + d.sh6 + d.sh7 + d.co0 + d.co1 + d.batIn + d.inverter) - ); - yScale.domain([0, Math.ceil(extent[1] / 1000) * 1000]); - const keys = [["lp0", "lp1", "lp2", "lp3", "lp4", - "lp5", "lp6", "lp7", - "sh0", "sh1", "sh2", "sh3", "sh4", - "sh5", "sh6", "sh7", "co0", "co1", "housePower", "batIn", "inverter"], - ["housePower", "lp0", "lp1", "lp2", "lp3", "lp4", - "lp5", "lp6", "lp7", - "sh0", "sh1", "sh2", "sh3", "sh4", - "sh5", "sh6", "sh7", "co0", "co1", "batIn", "inverter"], - ["sh0", "sh1", "sh2", "sh3", "sh4", - "sh5", "sh6", "sh7", "co0", "co1", "housePower", "lp0", "lp1", "lp2", "lp3", "lp4", - "lp5", "lp6", "lp7", - "batIn", "inverter"] - ]; - - const stackGen = d3.stack().keys(keys[wbdata.usageStackOrder]); - const stackedSeries = stackGen(this.graphData); - if (wbdata.graphMode == 'month') { - var rects2 = svg.selectAll(".sourcebar") - .data(stackedSeries).enter() - .append("g") - .attr("fill", (d, i) => this.colors[keys[wbdata.usageStackOrder][i]]) - .selectAll("rect") - .data(d => d).enter() - .append("rect") - .attr("x", (d) => this.xScale(d.data.date.getDate())) - .attr("y", d => yScale(d[0])) - .attr("height", d => yScale(d[1]) - yScale(d[0])) - .attr("width", this.xScale.bandwidth()) - rects2.append("svg:title").text((d) => formatWattH(d[1] - d[0])); - } else { - svg.selectAll(".targetareas") - .data(stackedSeries) - .join("path") - .attr("d", d3.area() - .x((d, i) => this.xScale(this.graphData[i].date)) - .y0((d) => yScale(d[0])) - .y1((d) => yScale(d[1])) - ) - .attr("fill", (d, i) => this.colors[keys[wbdata.usageStackOrder][i]]); - } - const yAxis = svg.append("g") - .attr("class", "axis") - .call(d3.axisLeft(yScale) - .tickSizeInner(-(width - this.margin.right)) - .ticks(4) - .tickFormat((d, i) => (d == 0) ? "" : (Math.round(d / 100) / 10)) - ); - yAxis.selectAll(".tick") - .attr("font-size", 12); - if (wbdata.showGrid) { - yAxis.selectAll(".tick line") - .attr("stroke", this.gridcolor) - .attr("stroke-width", "0.5"); - } else { - yAxis.selectAll(".tick line").attr("stroke", this.bgcolor); - } - yAxis.select(".domain") - .attr("stroke", this.bgcolor) - ; - } - - drawXAxis(svg, width, height) { - const fontsize = 12; - const xScale = d3.scaleTime().range([0, width - this.margin.right]); - xScale.domain(d3.extent(this.graphData, (d) => d.date)); - - var ticksize = (wbdata.showGrid) ? -(height / 2 - 7) : -10 - if (wbdata.graphMode == 'month') { - ticksize = 0; - } - const xAxisGenerator = d3 - .axisBottom(this.xScale) - .ticks(4) - .tickSizeInner(ticksize) - - if (wbdata.graphMode != 'month') { - xAxisGenerator.tickFormat(d3.timeFormat("%H:%M")) - .ticks(4); - } - - const xAxis = svg.append("g").attr("class", "axis") - .call(xAxisGenerator); - xAxis.attr("transform", "translate(0," + (height / 2 - 6) + ")"); - xAxis.selectAll(".tick") - .attr("color", this.axiscolor) - .attr("font-size", fontsize); - if (wbdata.showGrid) { - xAxis.selectAll(".tick line") - .attr("stroke", this.gridcolor) - .attr("stroke-width", "0.5"); - } else { - xAxis.selectAll(".tick line").attr("stroke", this.bgcolor); - } - xAxis.select(".domain") - .attr("stroke", this.bgcolor) - ; - svg.append("text") - .attr("x", - this.margin.left) - .attr("y", height / 2 + 5) - .attr("fill", this.axiscolor) - .attr("font-size", fontsize) - .text("kW") - - if (wbdata.showGrid) { - // second x axis for the grid - const ticksize2 = -(height / 2 - 10); - const xAxisGenerator2 = d3 - .axisTop(xScale) - .ticks(4) - .tickSizeInner(ticksize2) - .tickFormat(""); - const xAxis2 = svg.append("g").attr("class", "axis") - .call(xAxisGenerator2); - xAxis2.attr("transform", "translate(0," + (height / 2 + 10) + ")"); - xAxis2.selectAll(".tick") - .attr("color", this.axiscolor) - .attr("font-size", fontsize); - xAxis2.selectAll(".tick line").attr("stroke", this.gridcolor).attr("stroke-width", "0.5"); - - - xAxis2.select(".domain") - .attr("stroke", this.bgcolor) - ; - // add a rectangle around the graph - svg.append("g") - .append("rect") - .attr("x", 0) - .attr("y", 0) - .attr("width", width - this.margin.right) - .attr("height", height) - .attr("fill", "none") - .attr("stroke", this.gridcolor) - .attr("stroke-width", "0.5"); - } - } - - drawSoc(svg, width, height) { - const xScale = d3.scaleTime().range([0, width - this.margin.right]); - const yScale = d3.scaleLinear().range([height - 10, 0]); - xScale.domain(d3.extent(this.graphData, (d) => d.date)); - yScale.domain([0, 100]); - // Chargepoint 1 - if (wbdata.chargePoint[0].isSocConfigured) { - svg.append("path") - .datum(this.graphData) - .attr("stroke", this.bgcolor) - .attr("stroke-width", 1) - .attr("fill", "none") - //.style("stroke-dasharray", ("3, 3")) - .attr("d", d3.line() - .x((d, i) => xScale(this.graphData[i].date)) - .y(d => yScale(d.soc1)) - ); - svg.append("path") - .datum(this.graphData) - .attr("stroke", this.lp1color) - .attr("stroke-width", 1) - .attr("fill", "none") - .style("stroke-dasharray", ("3, 3")) - .attr("d", d3.line() - .x((d, i) => xScale(this.graphData[i].date)) - .y(d => yScale(d.soc1)) - ); - svg.append("text") - .attr("x", width - this.margin.right - 3) - .attr("y", yScale(this.graphData[this.graphData.length - 1].soc1 + 2)) - .text(wbdata.chargePoint[0].name) - .attr("fill", this.lp1color) - .style("font-size", 10) - .attr("text-anchor", "end"); - } - // Chargepoint 2 - if (wbdata.chargePoint[1].isSocConfigured) { - svg.append("path") - .datum(this.graphData) - .attr("stroke", this.bgcolor) - .attr("stroke-width", 1) - .attr("fill", "none") - // .style("stroke-dasharray", ("3, 3")) - .attr("d", d3.line() - .x((d, i) => xScale(this.graphData[i].date)) - .y(d => yScale(d.soc2)) - ); - svg.append("path") - .datum(this.graphData) - .attr("stroke", this.lp2color) - .attr("stroke-width", 1) - .attr("fill", "none") - .style("stroke-dasharray", ("3, 3")) - .attr("d", d3.line() - .x((d, i) => xScale(this.graphData[i].date)) - .y(d => yScale(d.soc2)) - ); - svg.append("text") - .attr("x", 3) - .attr("y", yScale(this.graphData[this.graphData.length - 1].soc2 + 2)) - .text(wbdata.chargePoint[1].name) - .attr("fill", this.lp2color) - .style("font-size", 10) - .attr("text-anchor", "start"); - } - // Battery - if (wbdata.isBatteryConfigured) { - svg.append("path") - .datum(this.graphData) - .attr("stroke", this.bgcolor) - .attr("stroke-width", 2) - .attr("fill", "none") - //.style("stroke-dasharray", ("3, 3")) - .attr("d", d3.line() - .x((d, i) => xScale(this.graphData[i].date)) - .y(d => yScale(d.batterySoc)) - ); - svg.append("path") - .datum(this.graphData) - .attr("stroke", this.batSocColor) - .attr("stroke-width", 2) - .attr("fill", "none") - .style("stroke-dasharray", ("3, 3")) - .attr("d", d3.line() - .x((d, i) => xScale(this.graphData[i].date)) - .y(d => yScale(d.batterySoc)) - ); - svg.append("text") - .attr("x", (width - this.margin.right) / 2) - .attr("y", yScale(this.graphData[this.graphData.length - 1].batterySoc + 2)) - .text("Speicher") - .attr("fill", this.batteryColor) - .style("background-color", "black") - .style("font-size", 10) - .attr("text-anchor", "middle"); - } - const socAxis = svg.append("g") - .attr("class", "axis") - .attr("transform", "translate(" + (width - 20) + ",0)") - .call(d3.axisRight(yScale) - .ticks(5) - .tickFormat((d) => (d + "%"))) - ; - socAxis.selectAll(".tick").attr("font-size", 12); - socAxis.selectAll(".tick line").attr("stroke", this.bgcolor); - socAxis.select(".domain") - .attr("stroke", this.bgcolor) - ; - } - - getEnergyValues() { - - } + svg; + xScale; + + constructor() { + this.graphData = []; + this.initCounter = 0; + this.staging = []; + this.rawData = []; + this.graphdata = [] + this.initialGraphData = []; + this.initialized = false; + this.colors = []; + this.gridColors = {}; + this.bgcolor = ""; + this.axiscolor = ""; + this.chargeColor = ""; + this.lp1color = ""; + this.lp2color = ""; + this.batteryColor = ""; + this.batSocColor = ""; + this.graphRefreshCounter = 0; + this.width = 500; + this.height = 500; + this.margin = { top: 10, right: 20, bottom: 10, left: 25 }; + this.liveGraphMinutes = 0; + wbdata.usageStackOrder = 2; + } + + init() { + var style = getComputedStyle(document.body); + this.colors.housePower = 'var(--color-house)'; + this.colors.batIn = 'var(--color-battery)'; + this.colors.inverter = 'var(--color-pv)'; + this.gridColors[0] = 'var(--color-battery)'; + this.colors.batOut = 'var(--color-battery)'; + this.gridColors[1] = 'var(--color-pv)'; + this.colors.selfUsage = 'var(--color-pv)'; + this.gridColors[2] = 'var(--color-export)'; + this.colors.gridPush = 'var(--color-export)'; + this.gridColors[3] = 'var(--color-evu)'; + this.colors.gridPull = 'var(--color-evu)'; + this.bgcolor = 'var(--color-bg)'; + this.chargeColor = 'var(--color-charging)'; + this.axiscolor = 'var(--color-axis)'; + this.gridcolor = 'var(--color-grid)'; + this.lp1color = 'var(--color-lp1)'; + this.lp2color = 'var(--color-lp2)'; + this.batteryColor = 'var(--color-battery)'; + this.batSocColor = 'var(--color-title)'; + var i; + for (i = 0; i < 8; i++) { + this.colors["lp" + i] = wbdata.chargePoint[i].color; + } + for (i = 0; i < 8; i++) { + this.colors["sh" + i] = wbdata.shDevice[i].color; + } + this.colors.co0 = 'var(--color-co1)'; + this.colors.co1 = 'var(--color-co2)'; + + var figure = d3.select("figure#powergraph"); + this.svg = figure.append("svg") + .attr("viewBox", `0 0 500 500`); + + d3.select("button#graphLeftButton") + .on("click", shiftLeft) + d3.select("button#graphRightButton") + .on("click", shiftRight) + d3.select("button#graphChangeButton") + .on("click", changeStack) + d3.select("button#gridChangeButton") + .on("click", toggleGrid) + } + + activateLive() { + try { + this.resetLiveGraph(); + subscribeMqttGraphSegments(); + subscribeGraphUpdates(); + } catch (err) { + // on initial invocation this method is not existing + } + this.updateHeading(); + } + + deactivateLive() { + try { + unsubscribeMqttGraphSegments(); + unsubscribeGraphUpdates(); + } catch (err) { + // on initial run this method is not existing + } + } + + activateDay() { + if (wbdata.graphMode == 'day') { + if (wbdata.showTodayGraph) { + wbdata.graphDate = new Date(); // ensure we update todays date if day changes during display + } + this.resetDayGraph(); + try { + subscribeDayGraph(wbdata.graphDate); + } catch (err) { + //on initial run of activate, subscribeDayGraph is not yet initialized. + // the error can be ignored + } + this.updateHeading(); + } + } + + updateHeading() { + var heading = "Leistung / Ladestand "; + switch (wbdata.graphMode) { + case 'live': + heading = heading + this.liveGraphMinutes + " min"; + break; + case 'day': + const today = new Date(); + if (today.getDate() == wbdata.graphDate.getDate() && today.getMonth() == wbdata.graphDate.getMonth() && today.getFullYear() == wbdata.graphDate.getFullYear()) { + heading = heading + "heute"; + } else { + heading = heading + wbdata.graphDate.getDate() + "." + (wbdata.graphDate.getMonth() + 1) + "."; + } + break; + case 'month': + heading = "Tageswerte " + formatMonth(wbdata.graphMonth.month, wbdata.graphMonth.year); + break; + default: break; + } + d3.select("h3#graphheading").text(heading); + } + + deactivateDay() { + try { + unsubscribeDayGraph(); + } catch (err) { + // ignore error + } + } + + activateMonth() { + this.resetMonthGraph(); + try { + subscribeMonthGraph(wbdata.graphMonth); + } catch (err) { + //on initial run of activate, subscribeDayGraph is not yet initialized. + // the error can be ignored + console.error("subscribeMonthGraph failed") + } + this.updateHeading(); + } + + deactivateMonth() { + try { + unsubscribeMonthGraph(); + } catch (err) { + // ignore error + } + } + + updateLive(topic, payload) { + if (wbdata.graphMode == 'live') { // only update if live graph is active + if (this.initialized) { // steady state + if (topic === "openWB/graph/lastlivevalues") { + const values = this.extractLiveValues(payload.toString()); + this.graphRefreshCounter++; + this.graphData.push(values); + this.updateGraph(); + if (this.graphRefreshCounter > 60) { + this.resetLiveGraph(); + subscribeMqttGraphSegments(); + } + } + } else { // init phase + const t = topic; + if (t.substring(t.length - 13, t.length) === "alllivevalues") { + // init message + const serialNo = t.substring(13, t.length - 13); + var bulkdata = payload.toString().split("\n"); + if (bulkdata.length <= 1) { + bulkdata = []; + } + if (serialNo != "") { + if (typeof (this.initialGraphData[+serialNo - 1]) === 'undefined') { + this.initialGraphData[+serialNo - 1] = bulkdata; + this.initCounter++; + } + } + if (this.initCounter == 16) {// Initialization complete + this.initialized = true; + this.initialGraphData.map(bulkdata => { + bulkdata.map((line) => { + const values = this.extractLiveValues(line); + this.graphData.push(values); + }); + }); + const startTime = this.graphData[0].date; + const endTime = this.graphData[this.graphData.length - 1].date; + this.liveGraphMinutes = Math.round((endTime - startTime) / 60000); + this.updateHeading(); + this.updateGraph(); + unsubscribeMqttGraphSegments(); + } + } + } + } + } + + updateDay(topic, payload) { + var segment; + if (payload == 'empty') { + segment = []; + } else { + segment = payload.toString().split("\n"); + if (segment[0] == "") { + segment = []; + } + const serialNo = topic.substring(26, topic.length); + if (serialNo != "") { + if (typeof (this.staging[+serialNo - 1]) === 'undefined') { + this.staging[+serialNo - 1] = segment; + this.initCounter++; + } + } + } + if (this.initCounter == 12) {// Initialization complete + unsubscribeDayGraph(); + + this.initCounter = 0; + this.staging.map(segment => + segment.map(line => this.rawData.push(line)) + ) + this.rawData.map((line, i, a) => { + if (i > 0) { + const values = this.extractDayValues(line, a[i - 1]); + this.graphData.push(values); + } else { + // const values = this.extractValues(line, []); + } + }); + this.updateGraph(); + this.updateEnergyValues(); + wbdata.dayGraphUpdated(); + setTimeout(() => this.activateDay(), 300000) + } + } + + updateMonth(topic, payload) { + if (payload != 'empty') { + var segment = payload.toString().split("\n"); + if (segment[0] == "") { + segment = []; + } + const serialNo = topic.substring(29, topic.length); + if (serialNo != "") { + if (typeof (this.staging[+serialNo - 1]) === 'undefined') { + this.staging[+serialNo - 1] = segment; + this.initCounter++; + } + } + if (this.initCounter == 12) {// Initialization complete + unsubscribeMonthGraph(); + this.initCounter = 0; + this.staging.map((segment, i) => { + if (i == 3) { + segment.map((line, i) => { + if (line.length > 1) { this.rawData.push(line) } + }) + } + }) + this.rawData.map((line, i, a) => { + if (i > 0) { + if (line != "0" && line != "") { + const values = this.extractMonthValues(line, a[i - 1]); + if ((values.date.getFullYear() == wbdata.graphMonth.year) + && ((values.date.getMonth() == wbdata.graphMonth.month) + || ((values.date.getMonth() == (wbdata.graphMonth.month + 1)) && (values.date.getDate == 1)) + ) + ) { this.graphData.push(values); } + } + } else { + // const values = this.extractValues(line, []); + } + }); + this.updateGraph(); + this.updateEnergyValues(); + wbdata.monthGraphUpdated(); + // setTimeout(() => this.activateDay(), 300000) + } + } + } + updateEnergyValues() { + if (this.rawData.length) { + const startValues = this.rawData[0].split(','); + const endValues = this.rawData[this.rawData.length - 1].split(','); + wbdata.historicSummary.pv.energy = (endValues[3] - startValues[3]) / 1000; + wbdata.historicSummary.evuIn.energy = (endValues[1] - startValues[1]) / 1000; + wbdata.historicSummary.batOut.energy = (endValues[9] - startValues[9]) / 1000; + wbdata.historicSummary.evuOut.energy = (endValues[2] - startValues[2]) / 1000; + wbdata.historicSummary.charging.energy = (endValues[7] - startValues[7]) / 1000; + var deviceEnergySum = 0; + var deviceEnergy = 0; + let deviceIndex = (wbdata.graphMode == 'day') ? 26 : 19; + for (var i = 0; i < 9; i++) { + deviceEnergy = (endValues[deviceIndex + i] - startValues[deviceIndex + i]) / 1000; + if (deviceEnergy < 0) { deviceEnergy = 0 } + deviceEnergySum = deviceEnergySum + deviceEnergy + wbdata.historicSummary['sh' + i].energy = deviceEnergy + } + deviceEnergySum = deviceEnergySum + (endValues[10] - startValues[10]) / 1000; + deviceEnergySum = deviceEnergySum + (endValues[12] - startValues[12]) / 1000; + wbdata.historicSummary.devices.energy = deviceEnergySum; + wbdata.historicSummary.batIn.energy = (endValues[8] - startValues[8]) / 1000; + wbdata.historicSummary.house.energy = wbdata.historicSummary.evuIn.energy + wbdata.historicSummary.pv.energy + wbdata.historicSummary.batOut.energy + - wbdata.historicSummary.evuOut.energy - wbdata.historicSummary.batIn.energy - wbdata.historicSummary.charging.energy - wbdata.historicSummary.devices.energy; + + let pvCharged = this.graphData.reduce((prev, cur) => { + return prev + (cur.chargingPv / 12); + }, 0) + wbdata.historicSummary.chargingPv.energy = pvCharged / 1000; + wbdata.usageSummary.chargingPv.energy = pvCharged / 1000; + } + } + extractLiveValues(payload) { + const elements = payload.split(","); + const now = new Date(Date.now()); + const mSecondsPerDay = 86400000 // milliseconds in a day + var values = {}; + values.date = new Date(d3.timeParse("%H:%M:%S")(elements[0])); + values.date.setDate(now.getDate()) + values.date.setMonth(now.getMonth()) + values.date.setFullYear(now.getFullYear()) + if (values.date.getHours() > now.getHours()) { // this is an entry from yesterday + values.date = new Date(values.date.getTime() - mSecondsPerDay) // change date to yesterday + } + // evu + if (+elements[1] > 0) { + values.gridPull = +elements[1]; + values.gridPush = 0; + } else { + values.gridPull = 0; + values.gridPush = -elements[1]; + } + // pv + if (+elements[3] >= 0) { + values.solarPower = +elements[3]; + values.inverter = 0; + } else { + values.solarPower = 0; + values.inverter = -elements[3] + } + // calculated values + values.housePower = +elements[11]; + values.selfUsage = values.solarPower - values.gridPush; + if (values.selfUsage < 0) { + values.selfUsage = 0; + } + // charge points + var i; + values.lp0 = +elements[4]; + values.lp1 = +elements[5]; + for (i = 2; i < 9; i++) { + values["lp" + i] = +elements[11 + i]; + } + values.soc1 = +elements[9]; + values.soc2 = +elements[10]; + + // smart home + for (i = 0; i < 8; i++) { + if (!(wbdata.shDevice[i].countAsHouse)) { + values["sh" + i] = +elements[20 + i]; + } else { + values["sh" + i] = +0; + } + } + //consumers + values.co0 = +elements[12]; + values.co1 = +elements[13]; + //battery + if (+elements[7] > 0) { + values.batIn = +elements[7]; + values.batOut = 0; + } else if (+elements[7] < 0) { + values.batIn = 0; + values.batOut = -elements[7] + } else { + values.batIn = 0; + values.batOut = 0; + }; + values.batterySoc = +elements[8]; + + return values; + } + + extractDayValues(payload, oldPayload) { + const elements = payload.split(","); + const oldElements = oldPayload.split(","); + var values = {}; + values.date = new Date(d3.timeParse("%H%M")(elements[0])); + // evu + values.gridPull = this.calcValue(1, elements, oldElements); + values.gridPush = this.calcValue(2, elements, oldElements); + // pv + values.solarPower = this.calcValue(3, elements, oldElements); + values.inverter = 0; + // charge points + values.charging = this.calcValue(7, elements, oldElements); + var i; + for (i = 0; i < 3; i++) { + values["lp" + i] = this.calcValue(4 + i, elements, oldElements); + } + for (i = 3; i < 8; i++) { + values["lp" + i] = this.calcValue(12 + i, elements, oldElements); + } + values.lpSum = this.calcValue(7, elements, oldElements); + values.lpSumPv = this.calcValue(29, elements, oldElements); + values.soc1 = +elements[21]; + values.soc2 = +elements[22]; + // smart home + for (i = 0; i < 9; i++) { + if (!(wbdata.shDevice[i].countAsHouse)) { + values["sh" + i] = this.calcValue(26 + i, elements, oldElements); + } else { + values["sh" + i] = +0; + } + } + //consumers + values.co0 = this.calcValue(10, elements, oldElements); + values.co1 = this.calcValue(12, elements, oldElements); + //battery + values.batIn = this.calcValue(8, elements, oldElements); + values.batOut = this.calcValue(9, elements, oldElements); + values.batterySoc = +elements[20]; + // calculated values + values.housePower = values.gridPull + values.solarPower + values.batOut + - values.gridPush - values.batIn - values.charging - values.co0 - values.co1 + - values.sh0 - values.sh1 - values.sh2 - values.sh3 - values.sh4 - values.sh5 - values.sh6 - values.sh7 - values.sh8; + if (values.housePower < 0) { values.housePower = 0; }; + values.selfUsage = values.solarPower - values.gridPush; + if (values.selfUsage < 0) { values.selfUsage = 0; }; + if ((values.solarPower + values.gridPull + values.batOut - values.gridPush - values.batIn) > 0) { + values.chargingPv = values.charging * values.solarPower / (values.solarPower + values.gridPull + values.batOut - values.gridPush - values.batIn) + } else { + values.chargingPv = 0; + } + return values; + } + + extractMonthValues(payload, oldPayload) { + if (payload != "0") { + const elements = payload.split(","); + const oldElements = oldPayload.split(","); + var values = {}; + values.date = new Date(d3.timeParse("%Y%m%d%H%M")(oldElements[0] + '1200')); + // evu + values.gridPull = this.calcMonthlyValue(1, elements, oldElements); + values.gridPush = this.calcMonthlyValue(2, elements, oldElements); + // pv + values.solarPower = this.calcMonthlyValue(3, elements, oldElements); + values.inverter = 0; + // charge points + values.charging = this.calcMonthlyValue(7, elements, oldElements); + values.chargingPv = this.calcMonthlyValue(29, elements, oldElements); + var i; + for (i = 0; i < 3; i++) { + values["lp" + i] = this.calcMonthlyValue(4 + i, elements, oldElements); + } + for (i = 3; i < 8; i++) { + values["lp" + i] = this.calcMonthlyValue(12 + i - 3, elements, oldElements); + } + values.soc1 = +elements[21]; + values.soc2 = +elements[22]; + // smart home + for (i = 0; i < 10; i++) { + values["sh" + i] = this.calcMonthlyValue(19 + i, elements, oldElements); + } + //consumers + values.co0 = this.calcMonthlyValue(10, elements, oldElements); + values.co1 = this.calcMonthlyValue(12, elements, oldElements); + //battery + values.batIn = this.calcMonthlyValue(17, elements, oldElements); + values.batOut = this.calcMonthlyValue(18, elements, oldElements); + values.batterySoc = +elements[20]; + // calculated values + values.housePower = values.gridPull + values.solarPower + values.batOut + - values.gridPush - values.batIn - values.charging - values.co0 - values.co1 + - values.sh0 - values.sh1 - values.sh2 - values.sh3 - values.sh4 - values.sh5 - values.sh6 - values.sh7 - values.sh8 - values.sh9; if (values.housePower < 0) { values.housePower = 0; }; + values.selfUsage = values.solarPower - values.gridPush; + if (values.selfUsage < 0) { values.selfUsage = 0; }; + return values; + } else return {} + } + reset() { + this.resetLiveGraph(); + this.resetDayGraph(); + } + + resetLiveGraph() { + // fresh reload of the graph + this.initialized = false; + this.initCounter = 0; + this.initialGraphData = []; + this.graphData = []; + this.graphRefreshCounter = 0; + wbdata.historicSummary.chargingPv.energy = 0; + wbdata.usageSummary.chargingPv.energy = 0; + } + + resetDayGraph() { + this.initialized = false; + this.initCounter = 0; + this.staging = []; + this.rawData = []; + this.graphData = []; + } + + resetMonthGraph() { + this.initialized = false; + this.initCounter = false; + this.staging = []; + this.rawData = []; + this.graphData = []; + } + + calcValue(i, array, oldArray) { + var val = (array[i] - oldArray[i]) * 12; + if (val < 0 || val > 150000) { + val = 0; + } + return val; + } + calcMonthlyValue(i, array, oldArray) { + var val = (array[i] - oldArray[i]); + + if (val < 0 || val > 150000) { + val = 0; + } + return val; + } + + updateGraph() { + const svg = this.createOrUpdateSvg(); + this.drawChart(svg); + }; + + createOrUpdateSvg() { + this.svg.selectAll("*").remove(); + this.g = this.svg + .append("g") + .attr( + "transform", + "translate(" + this.margin.left + "," + this.margin.top + ")" + ); + return this.g; + } + + drawChart(svg) { + const height = this.height - this.margin.top - this.margin.bottom; + const width = this.width - this.margin.left - this.margin.right; + this.drawSourceGraph(svg, width, height / 2); + this.drawUsageGraph(svg, width, height / 2); + if (wbdata.graphMode != 'month') { + this.drawSoc(svg, width, height / 2); + } + this.drawXAxis(svg, width, height); + } + + drawSourceGraph(svg, width, height) { + var keys = (wbdata.graphMode == 'month') ? ["gridPull", "batOut", "selfUsage", "gridPush"] : ["selfUsage", "gridPush", "batOut", "gridPull"]; + + if (wbdata.graphMode == 'month') { + const dayRange = d3.extent(this.graphData, d => d.date.getDate()) + this.xScale = d3.scaleBand() + .domain(Array.from({ length: (dayRange[1] - dayRange[0] + 1) }, (v, k) => k + dayRange[0])) + .paddingInner(0.4); + } else { + this.xScale = d3.scaleTime().domain(d3.extent(this.graphData, d => d.date)); + } + this.xScale.range([0, width - this.margin.right]); + const yScale = d3.scaleLinear().range([height - 10, 0]); + const extent = d3.extent(this.graphData, (d) => + Math.max(d.solarPower + d.gridPull + d.batOut, d.selfUsage + d.gridPush)); + + yScale.domain([0, Math.ceil(extent[1] / 1000) * 1000]); + + const stackGen = d3.stack().keys(keys); + const stackedSeries = stackGen(this.graphData); + + if (wbdata.graphMode == 'month') { + var rects = svg.selectAll(".sourcebar") + .data(stackedSeries).enter() + .append("g") + .attr("fill", (d, i) => this.colors[keys[i]]) + .selectAll("rect") + .data((d) => d).enter() + .append("rect") + .attr("x", (d) => this.xScale(d.data.date.getDate())) + .attr("y", d => yScale(d[1])) + .attr("height", d => yScale(d[0]) - yScale(d[1])) + .attr("width", this.xScale.bandwidth()) + rects.append("svg:title").text((d) => formatWattH(d[1] - d[0])); + } else { + svg.selectAll(".sourceareas") + .data(stackedSeries) + .join("path") + .attr("d", d3.area() + .x((d, i) => this.xScale(this.graphData[i].date)) + .y0((d) => yScale(d[0])) + .y1((d) => yScale(d[1])) + ) + .attr("fill", (d, i) => this.colors[keys[i]]); + } + + const yAxis = svg.append("g") + .attr("class", "axis") + .call(d3.axisLeft(yScale) + .tickSizeInner(-(width - this.margin.right)) + .ticks(4) + .tickFormat((d, i) => (d == 0) ? "" : (Math.round(d / 100) / 10))) + ; + yAxis.selectAll(".tick") + .attr("font-size", 12); + + if (wbdata.showGrid) { + yAxis.selectAll(".tick line") + .attr("stroke", this.gridcolor) + .attr("stroke-width", "0.5"); + } else { + yAxis.selectAll(".tick line").attr("stroke", this.bgcolor); + } + yAxis.select(".domain") + .attr("stroke", this.bgcolor) + ; + } + + drawUsageGraph(svg, width, height) { + const yScale = d3.scaleLinear().range([height + 10, 2 * height]); + + const extent = d3.extent(this.graphData, (d) => + (d.housePower + d.lp0 + d.lp1 + d.lp2 + d.lp3 + d.lp4 + + d.lp5 + d.lp6 + d.lp7 + d.sh0 + d.sh1 + d.sh2 + d.sh3 + d.sh4 + + d.sh5 + d.sh6 + d.sh7 + d.co0 + d.co1 + d.batIn + d.inverter) + ); + yScale.domain([0, Math.ceil(extent[1] / 1000) * 1000]); + const keys = [["lp0", "lp1", "lp2", "lp3", "lp4", + "lp5", "lp6", "lp7", + "sh0", "sh1", "sh2", "sh3", "sh4", + "sh5", "sh6", "sh7", "co0", "co1", "housePower", "batIn", "inverter"], + ["housePower", "lp0", "lp1", "lp2", "lp3", "lp4", + "lp5", "lp6", "lp7", + "sh0", "sh1", "sh2", "sh3", "sh4", + "sh5", "sh6", "sh7", "co0", "co1", "batIn", "inverter"], + ["sh0", "sh1", "sh2", "sh3", "sh4", + "sh5", "sh6", "sh7", "co0", "co1", "housePower", "lp0", "lp1", "lp2", "lp3", "lp4", + "lp5", "lp6", "lp7", + "batIn", "inverter"] + ]; + + const stackGen = d3.stack().keys(keys[wbdata.usageStackOrder]); + const stackedSeries = stackGen(this.graphData); + if (wbdata.graphMode == 'month') { + var rects2 = svg.selectAll(".sourcebar") + .data(stackedSeries).enter() + .append("g") + .attr("fill", (d, i) => this.colors[keys[wbdata.usageStackOrder][i]]) + .selectAll("rect") + .data(d => d).enter() + .append("rect") + .attr("x", (d) => this.xScale(d.data.date.getDate())) + .attr("y", d => yScale(d[0])) + .attr("height", d => yScale(d[1]) - yScale(d[0])) + .attr("width", this.xScale.bandwidth()) + rects2.append("svg:title").text((d) => formatWattH(d[1] - d[0])); + } else { + svg.selectAll(".targetareas") + .data(stackedSeries) + .join("path") + .attr("d", d3.area() + .x((d, i) => this.xScale(this.graphData[i].date)) + .y0((d) => yScale(d[0])) + .y1((d) => yScale(d[1])) + ) + .attr("fill", (d, i) => this.colors[keys[wbdata.usageStackOrder][i]]); + } + const yAxis = svg.append("g") + .attr("class", "axis") + .call(d3.axisLeft(yScale) + .tickSizeInner(-(width - this.margin.right)) + .ticks(4) + .tickFormat((d, i) => (d == 0) ? "" : (Math.round(d / 100) / 10)) + ); + yAxis.selectAll(".tick") + .attr("font-size", 12); + if (wbdata.showGrid) { + yAxis.selectAll(".tick line") + .attr("stroke", this.gridcolor) + .attr("stroke-width", "0.5"); + } else { + yAxis.selectAll(".tick line").attr("stroke", this.bgcolor); + } + yAxis.select(".domain") + .attr("stroke", this.bgcolor) + ; + } + + drawXAxis(svg, width, height) { + const fontsize = 12; + const xScale = d3.scaleTime().range([0, width - this.margin.right]); + xScale.domain(d3.extent(this.graphData, (d) => d.date)); + + var ticksize = (wbdata.showGrid) ? -(height / 2 - 7) : -10 + if (wbdata.graphMode == 'month') { + ticksize = 0; + } + const xAxisGenerator = d3 + .axisBottom(this.xScale) + .ticks(4) + .tickSizeInner(ticksize) + + if (wbdata.graphMode != 'month') { + xAxisGenerator.tickFormat(d3.timeFormat("%H:%M")) + .ticks(4); + } + + const xAxis = svg.append("g").attr("class", "axis") + .call(xAxisGenerator); + xAxis.attr("transform", "translate(0," + (height / 2 - 6) + ")"); + xAxis.selectAll(".tick") + .attr("color", this.axiscolor) + .attr("font-size", fontsize); + if (wbdata.showGrid) { + xAxis.selectAll(".tick line") + .attr("stroke", this.gridcolor) + .attr("stroke-width", "0.5"); + } else { + xAxis.selectAll(".tick line").attr("stroke", this.bgcolor); + } + xAxis.select(".domain") + .attr("stroke", this.bgcolor) + ; + svg.append("text") + .attr("x", - this.margin.left) + .attr("y", height / 2 + 5) + .attr("fill", this.axiscolor) + .attr("font-size", fontsize) + .text("kW") + + if (wbdata.showGrid) { + // second x axis for the grid + const ticksize2 = -(height / 2 - 10); + const xAxisGenerator2 = d3 + .axisTop(xScale) + .ticks(4) + .tickSizeInner(ticksize2) + .tickFormat(""); + const xAxis2 = svg.append("g").attr("class", "axis") + .call(xAxisGenerator2); + xAxis2.attr("transform", "translate(0," + (height / 2 + 10) + ")"); + xAxis2.selectAll(".tick") + .attr("color", this.axiscolor) + .attr("font-size", fontsize); + xAxis2.selectAll(".tick line").attr("stroke", this.gridcolor).attr("stroke-width", "0.5"); + + + xAxis2.select(".domain") + .attr("stroke", this.bgcolor) + ; + // add a rectangle around the graph + svg.append("g") + .append("rect") + .attr("x", 0) + .attr("y", 0) + .attr("width", width - this.margin.right) + .attr("height", height) + .attr("fill", "none") + .attr("stroke", this.gridcolor) + .attr("stroke-width", "0.5"); + } + } + + drawSoc(svg, width, height) { + const xScale = d3.scaleTime().range([0, width - this.margin.right]); + const yScale = d3.scaleLinear().range([height - 10, 0]); + xScale.domain(d3.extent(this.graphData, (d) => d.date)); + yScale.domain([0, 100]); + // Chargepoint 1 + if (wbdata.chargePoint[0].isSocConfigured) { + svg.append("path") + .datum(this.graphData) + .attr("stroke", this.bgcolor) + .attr("stroke-width", 1) + .attr("fill", "none") + //.style("stroke-dasharray", ("3, 3")) + .attr("d", d3.line() + .x((d, i) => xScale(this.graphData[i].date)) + .y(d => yScale(d.soc1)) + ); + svg.append("path") + .datum(this.graphData) + .attr("stroke", this.lp1color) + .attr("stroke-width", 1) + .attr("fill", "none") + .style("stroke-dasharray", ("3, 3")) + .attr("d", d3.line() + .x((d, i) => xScale(this.graphData[i].date)) + .y(d => yScale(d.soc1)) + ); + svg.append("text") + .attr("x", width - this.margin.right - 3) + .attr("y", yScale(this.graphData[this.graphData.length - 1].soc1 + 2)) + .text(wbdata.chargePoint[0].name) + .attr("fill", this.lp1color) + .style("font-size", 10) + .attr("text-anchor", "end"); + } + // Chargepoint 2 + if (wbdata.chargePoint[1].isSocConfigured) { + svg.append("path") + .datum(this.graphData) + .attr("stroke", this.bgcolor) + .attr("stroke-width", 1) + .attr("fill", "none") + // .style("stroke-dasharray", ("3, 3")) + .attr("d", d3.line() + .x((d, i) => xScale(this.graphData[i].date)) + .y(d => yScale(d.soc2)) + ); + svg.append("path") + .datum(this.graphData) + .attr("stroke", this.lp2color) + .attr("stroke-width", 1) + .attr("fill", "none") + .style("stroke-dasharray", ("3, 3")) + .attr("d", d3.line() + .x((d, i) => xScale(this.graphData[i].date)) + .y(d => yScale(d.soc2)) + ); + svg.append("text") + .attr("x", 3) + .attr("y", yScale(this.graphData[this.graphData.length - 1].soc2 + 2)) + .text(wbdata.chargePoint[1].name) + .attr("fill", this.lp2color) + .style("font-size", 10) + .attr("text-anchor", "start"); + } + // Battery + if (wbdata.isBatteryConfigured) { + svg.append("path") + .datum(this.graphData) + .attr("stroke", this.bgcolor) + .attr("stroke-width", 2) + .attr("fill", "none") + //.style("stroke-dasharray", ("3, 3")) + .attr("d", d3.line() + .x((d, i) => xScale(this.graphData[i].date)) + .y(d => yScale(d.batterySoc)) + ); + svg.append("path") + .datum(this.graphData) + .attr("stroke", this.batSocColor) + .attr("stroke-width", 2) + .attr("fill", "none") + .style("stroke-dasharray", ("3, 3")) + .attr("d", d3.line() + .x((d, i) => xScale(this.graphData[i].date)) + .y(d => yScale(d.batterySoc)) + ); + svg.append("text") + .attr("x", (width - this.margin.right) / 2) + .attr("y", yScale(this.graphData[this.graphData.length - 1].batterySoc + 2)) + .text("Speicher") + .attr("fill", this.batteryColor) + .style("background-color", "black") + .style("font-size", 10) + .attr("text-anchor", "middle"); + } + const socAxis = svg.append("g") + .attr("class", "axis") + .attr("transform", "translate(" + (width - 20) + ",0)") + .call(d3.axisRight(yScale) + .ticks(5) + .tickFormat((d) => (d + "%"))) + ; + socAxis.selectAll(".tick").attr("font-size", 12); + socAxis.selectAll(".tick line").attr("stroke", this.bgcolor); + socAxis.select(".domain") + .attr("stroke", this.bgcolor) + ; + } + + getEnergyValues() { + + } } // Change the order of values in the stack function changeStack() { - wbdata.usageStackOrder = wbdata.usageStackOrder + 1; - if (wbdata.usageStackOrder > 2) { - wbdata.usageStackOrder = 0; - } - wbdata.persistGraphPreferences(); - powerGraph.updateGraph(); + wbdata.usageStackOrder = wbdata.usageStackOrder + 1; + if (wbdata.usageStackOrder > 2) { + wbdata.usageStackOrder = 0; + } + wbdata.persistGraphPreferences(); + powerGraph.updateGraph(); } var powerGraph = new PowerGraph(); From 61296aa456850177753cd12a8d6ede5812cf9af3 Mon Sep 17 00:00:00 2001 From: "cshagen@hagens.ch" Date: Sat, 12 Nov 2022 13:16:45 +0100 Subject: [PATCH 034/201] change indentation from spaces to tabs --- web/themes/colors/processAllMqttMsg.js | 36 +- web/themes/colors/yieldmeter.js | 484 ++++++++++++------------- 2 files changed, 260 insertions(+), 260 deletions(-) diff --git a/web/themes/colors/processAllMqttMsg.js b/web/themes/colors/processAllMqttMsg.js index d2da5e4869..ec7345f3a3 100644 --- a/web/themes/colors/processAllMqttMsg.js +++ b/web/themes/colors/processAllMqttMsg.js @@ -37,7 +37,7 @@ function getIndex(topic) { function handlevar(mqttmsg, mqttpayload) { // receives all messages and calls respective function to process them - + if (mqttmsg.match(/^openwb\/graph\//i)) { processGraphMessages(mqttmsg, mqttpayload); } else if (mqttmsg.match(/^openwb\/evu\//i)) { processEvuMessages(mqttmsg, mqttpayload); } else if (mqttmsg.match(/^openwb\/global\/awattar\//i)) { processETProviderMessages(mqttmsg, mqttpayload); } @@ -54,27 +54,27 @@ function handlevar(mqttmsg, mqttpayload) { else if (mqttmsg.match(/^openwb\/SmartHome\/Status\//i)) { processSmartHomeDevicesStatusMessages(mqttmsg, mqttpayload); } else if (mqttmsg.match(/^openwb\/config\/get\/sofort\/lp\//i)) { processSofortConfigMessages(mqttmsg, mqttpayload); } else if (mqttmsg.match(/^openwb\/config\/get\/pv\//i)) { processPvConfigMessages(mqttmsg, mqttpayload); } - } // end handlevar +} // end handlevar function processETProviderMessages(mqttmsg, mqttpayload) { // processes mqttmsg for topic openWB/global // called by handlevar processPreloader(mqttmsg); -// colors theme -if ( mqttmsg == 'openWB/global/ETProvider/providerName' ) { - wbdata.updateET ('etProviderName', mqttpayload); -} else if ( mqttmsg == 'openWB/global/ETProvider/modulePath' ) { - wbdata.updateET ('etModulePath', mqttpayload); -} else if ( mqttmsg == 'openWB/global/awattar/boolAwattarEnabled' ) { - wbdata.updateET('isEtEnabled' ,(mqttpayload == '1')) -} else if ( mqttmsg == 'openWB/global/awattar/pricelist' ) { - wbdata.updateET('etPriceList',mqttpayload); -} else if ( mqttmsg == 'openWB/global/awattar/MaxPriceForCharging' ) { - wbdata.updateET ('etMaxPrice', parseFloat(mqttpayload)); -} else if ( mqttmsg == 'openWB/global/awattar/ActualPriceForCharging' ) { - wbdata.updateET ('etPrice', parseFloat(mqttpayload)); -} + // colors theme + if (mqttmsg == 'openWB/global/ETProvider/providerName') { + wbdata.updateET('etProviderName', mqttpayload); + } else if (mqttmsg == 'openWB/global/ETProvider/modulePath') { + wbdata.updateET('etModulePath', mqttpayload); + } else if (mqttmsg == 'openWB/global/awattar/boolAwattarEnabled') { + wbdata.updateET('isEtEnabled', (mqttpayload == '1')) + } else if (mqttmsg == 'openWB/global/awattar/pricelist') { + wbdata.updateET('etPriceList', mqttpayload); + } else if (mqttmsg == 'openWB/global/awattar/MaxPriceForCharging') { + wbdata.updateET('etMaxPrice', parseFloat(mqttpayload)); + } else if (mqttmsg == 'openWB/global/awattar/ActualPriceForCharging') { + wbdata.updateET('etPrice', parseFloat(mqttpayload)); + } // end color theme @@ -99,7 +99,7 @@ if ( mqttmsg == 'openWB/global/ETProvider/providerName' ) { $('#navStromtarifInfo').addClass('hide'); } } - + } function processPvConfigMessages(mqttmsg, mqttpayload) { @@ -429,7 +429,7 @@ function processGlobalMessages(mqttmsg, mqttpayload) { // '3': mode stop // '4': mode standby } - else if ( mqttmsg == 'openWB/global/rfidConfigured' ) { + else if (mqttmsg == 'openWB/global/rfidConfigured') { wbdata.updateGlobal("rfidConfigured", (mqttpayload == 1)) } else if (mqttmsg == 'openWB/global/DailyYieldAllChargePointsKwh') { diff --git a/web/themes/colors/yieldmeter.js b/web/themes/colors/yieldmeter.js index 1a0cd777d9..711aea1bf7 100644 --- a/web/themes/colors/yieldmeter.js +++ b/web/themes/colors/yieldmeter.js @@ -5,268 +5,268 @@ */ class YieldMeter { - bardata; - xScale; - yScale; - svg; + bardata; + xScale; + yScale; + svg; - constructor() { - this.width = 500; - this.height = 500; - this.margin = { - top: 25, bottom: 30, left: 25, right: 0 - }; - this.labelfontsize = 16; - this.axisFontSize = 12; - this.textLength = 12; - } + constructor() { + this.width = 500; + this.height = 500; + this.margin = { + top: 25, bottom: 30, left: 25, right: 0 + }; + this.labelfontsize = 16; + this.axisFontSize = 12; + this.textLength = 12; + } - // to be called when the document is loaded - init() { - const figure = d3.select("figure#energymeter"); - this.svg = figure.append("svg") - .attr("viewBox", `0 0 500 500`); - const style = getComputedStyle(document.body); - this.houseColor = 'var(--color-house)'; - this.pvColor = 'var(--color-pv)'; - this.exportColor = 'var(--color-export)'; - this.evuColor = 'var(--color-evu)'; - this.bgColor = 'var(--color-bg)'; - this.chargeColor = 'var(--color-charging)'; - this.axisColor = 'var(--color-axis)'; - this.gridColor = 'var(--color-grid)'; - d3.select("button#energyLeftButton") - .on("click", shiftLeft) - d3.select("button#energyRightButton") - .on("click", shiftRight) - d3.select("button#calendarButton") - .on("click", toggleMonthView) - } + // to be called when the document is loaded + init() { + const figure = d3.select("figure#energymeter"); + this.svg = figure.append("svg") + .attr("viewBox", `0 0 500 500`); + const style = getComputedStyle(document.body); + this.houseColor = 'var(--color-house)'; + this.pvColor = 'var(--color-pv)'; + this.exportColor = 'var(--color-export)'; + this.evuColor = 'var(--color-evu)'; + this.bgColor = 'var(--color-bg)'; + this.chargeColor = 'var(--color-charging)'; + this.axisColor = 'var(--color-axis)'; + this.gridColor = 'var(--color-grid)'; + d3.select("button#energyLeftButton") + .on("click", shiftLeft) + d3.select("button#energyRightButton") + .on("click", shiftRight) + d3.select("button#calendarButton") + .on("click", toggleMonthView) + } - // to be called when values have changed - update() { - switch (wbdata.graphMode) { - case 'live': - this.plotdata = Object.values(wbdata.sourceSummary) - .filter((row) => (row.energy > 0)) - .concat(wbdata.usageDetails - .filter((row) => (row.energy > 0))); - break; - case 'day': - if (wbdata.showTodayGraph) { - this.plotdata = Object.values(wbdata.sourceSummary) - .filter((row) => (row.energy > 0)) - .concat(wbdata.usageDetails - .filter((row) => (row.energy > 0))); - } else { - this.plotdata = Object.values(wbdata.historicSummary) - .filter((row) => (row.energy > 0)); - } - break; - case 'month': - this.plotdata = Object.values(wbdata.historicSummary) - .filter((row) => (row.energy > 0)); - break; - default: break; - } - this.adjustLabelSize() - const svg = this.createOrUpdateSvg(); - this.drawChart(svg); - this.updateHeading(); - }; + // to be called when values have changed + update() { + switch (wbdata.graphMode) { + case 'live': + this.plotdata = Object.values(wbdata.sourceSummary) + .filter((row) => (row.energy > 0)) + .concat(wbdata.usageDetails + .filter((row) => (row.energy > 0))); + break; + case 'day': + if (wbdata.showTodayGraph) { + this.plotdata = Object.values(wbdata.sourceSummary) + .filter((row) => (row.energy > 0)) + .concat(wbdata.usageDetails + .filter((row) => (row.energy > 0))); + } else { + this.plotdata = Object.values(wbdata.historicSummary) + .filter((row) => (row.energy > 0)); + } + break; + case 'month': + this.plotdata = Object.values(wbdata.historicSummary) + .filter((row) => (row.energy > 0)); + break; + default: break; + } + this.adjustLabelSize() + const svg = this.createOrUpdateSvg(); + this.drawChart(svg); + this.updateHeading(); + }; - createOrUpdateSvg() { - this.svg.selectAll("*").remove(); - const g = this.svg.append("g") - .attr("transform", "translate(" + this.margin.left + "," + this.margin.top + ")"); - this.xScale = d3.scaleBand() - .range([0, this.width - this.margin.left - this.margin.right]) - .padding(0.4); - this.yScale = d3.scaleLinear() - .range([this.height - this.margin.bottom - this.margin.top, 10]); - return g; - } + createOrUpdateSvg() { + this.svg.selectAll("*").remove(); + const g = this.svg.append("g") + .attr("transform", "translate(" + this.margin.left + "," + this.margin.top + ")"); + this.xScale = d3.scaleBand() + .range([0, this.width - this.margin.left - this.margin.right]) + .padding(0.4); + this.yScale = d3.scaleLinear() + .range([this.height - this.margin.bottom - this.margin.top, 10]); + return g; + } - drawChart(svg) { - let pvcdata = this.plotdata.filter(d => (d.name == "PVCharge")) - let chargedata = this.plotdata.filter(d => d.name == "Laden") - this.plotdata = this.plotdata.filter(d => (d.name != "PVCharge")) - const ymax = d3.max(this.plotdata, (d) => d.energy); - this.xScale.domain(this.plotdata.map((d) => d.name)); - this.yScale.domain([0, Math.ceil(ymax)]); + drawChart(svg) { + let pvcdata = this.plotdata.filter(d => (d.name == "PVCharge")) + let chargedata = this.plotdata.filter(d => d.name == "Laden") + this.plotdata = this.plotdata.filter(d => (d.name != "PVCharge")) + const ymax = d3.max(this.plotdata, (d) => d.energy); + this.xScale.domain(this.plotdata.map((d) => d.name)); + this.yScale.domain([0, Math.ceil(ymax)]); - // Draw the bars - const bargroups = svg - .selectAll(".bar") - .data(this.plotdata) - .enter() - .append("g"); - bargroups - .append("rect") - .attr("class", "bar") - .attr("x", (d) => this.xScale(d.name)) - .attr("y", (d) => this.yScale(d.energy)) - .attr("width", this.xScale.bandwidth()) - .attr("height", (d) => (this.height - this.yScale(d.energy) - this.margin.top - this.margin.bottom)) - .attr("fill", (d) => d.color); + // Draw the bars + const bargroups = svg + .selectAll(".bar") + .data(this.plotdata) + .enter() + .append("g"); + bargroups + .append("rect") + .attr("class", "bar") + .attr("x", (d) => this.xScale(d.name)) + .attr("y", (d) => this.yScale(d.energy)) + .attr("width", this.xScale.bandwidth()) + .attr("height", (d) => (this.height - this.yScale(d.energy) - this.margin.top - this.margin.bottom)) + .attr("fill", (d) => d.color); - // Display the PV Charging inner bar - if ((pvcdata.length > 0) && (chargedata.length > 0) && (chargedata[0].energy > 0)) { - const pvcBargroup = svg - .selectAll(".pvcBar") - .data(pvcdata) - .enter() - .append("g") - pvcBargroup - .append("rect") - .attr("class", "bar") - .attr("x", (d) => this.xScale("Laden") + this.xScale.bandwidth() / 6) - .attr("y", (d) => this.yScale(d.energy)) - .attr("width", this.xScale.bandwidth() * 2 / 3) - .attr("height", (d) => (this.height - this.yScale(d.energy) - this.margin.top - this.margin.bottom)) - .attr("fill", this.pvColor) - .attr("fill-opacity", "66%"); - } - const yAxisGenerator = d3.axisLeft(this.yScale) - .tickFormat(function (d) { - return ((d > 0) ? d : ""); - }) - .ticks(8) - .tickSizeInner(-this.width); + // Display the PV Charging inner bar + if ((pvcdata.length > 0) && (chargedata.length > 0) && (chargedata[0].energy > 0)) { + const pvcBargroup = svg + .selectAll(".pvcBar") + .data(pvcdata) + .enter() + .append("g") + pvcBargroup + .append("rect") + .attr("class", "bar") + .attr("x", (d) => this.xScale("Laden") + this.xScale.bandwidth() / 6) + .attr("y", (d) => this.yScale(d.energy)) + .attr("width", this.xScale.bandwidth() * 2 / 3) + .attr("height", (d) => (this.height - this.yScale(d.energy) - this.margin.top - this.margin.bottom)) + .attr("fill", this.pvColor) + .attr("fill-opacity", "66%"); + } + const yAxisGenerator = d3.axisLeft(this.yScale) + .tickFormat(function (d) { + return ((d > 0) ? d : ""); + }) + .ticks(8) + .tickSizeInner(-this.width); - const yAxis = svg.append("g") - .attr("class", "axis") - .attr("transform", "translate(0," + 0 + ")") - .call(yAxisGenerator); + const yAxis = svg.append("g") + .attr("class", "axis") + .attr("transform", "translate(0," + 0 + ")") + .call(yAxisGenerator); - yAxis.append("text") - .attr("y", 6) - .attr("dy", "0.71em") - .attr("text-anchor", "end") - .text("energy"); + yAxis.append("text") + .attr("y", 6) + .attr("dy", "0.71em") + .attr("text-anchor", "end") + .text("energy"); - yAxis.selectAll(".tick").attr("font-size", this.axisFontSize); - if (wbdata.showGrid) { - yAxis.selectAll(".tick line") - .attr("stroke", this.gridColor) - .attr("stroke-width", "0.5"); - } else { - yAxis.selectAll(".tick line").attr("stroke", this.bgColor); - } - yAxis.select(".domain") - .attr("stroke", this.bgcolor); + yAxis.selectAll(".tick").attr("font-size", this.axisFontSize); + if (wbdata.showGrid) { + yAxis.selectAll(".tick line") + .attr("stroke", this.gridColor) + .attr("stroke-width", "0.5"); + } else { + yAxis.selectAll(".tick line").attr("stroke", this.bgColor); + } + yAxis.select(".domain") + .attr("stroke", this.bgcolor); - svg.append("text") - .attr("x", -this.margin.left) - .attr("y", -15) - .style("fill", this.axisColor) - .attr("font-size", this.axisFontSize) - .text("kWh") - ; + svg.append("text") + .attr("x", -this.margin.left) + .attr("y", -15) + .style("fill", this.axisColor) + .attr("font-size", this.axisFontSize) + .text("kWh") + ; - // add value labels to the bars - const labels = svg.selectAll(".label") - .data(this.plotdata) - .enter() - .append("g"); - labels - .append("text") - .attr("x", (d) => this.xScale(d.name) + this.xScale.bandwidth() / 2) - .attr("y", (d) => { - if (d.name == "Laden" && pvcdata.length > 0) { - return this.yScale(d.energy) - 25 - } else { - return this.yScale(d.energy) - 10 - } - }) - .attr("font-size", this.labelfontsize) - .attr("text-anchor", "middle") - .attr("fill", (d) => d.color) - .text((d) => (formatWattH(d.energy * 1000))); + // add value labels to the bars + const labels = svg.selectAll(".label") + .data(this.plotdata) + .enter() + .append("g"); + labels + .append("text") + .attr("x", (d) => this.xScale(d.name) + this.xScale.bandwidth() / 2) + .attr("y", (d) => { + if (d.name == "Laden" && pvcdata.length > 0) { + return this.yScale(d.energy) - 25 + } else { + return this.yScale(d.energy) - 10 + } + }) + .attr("font-size", this.labelfontsize) + .attr("text-anchor", "middle") + .attr("fill", (d) => d.color) + .text((d) => (formatWattH(d.energy * 1000))); - // add a PV percentage tag to the charging bar - if ((pvcdata.length > 0) && (chargedata.length > 0) && (chargedata[0].energy > 0)) { - let pvRatio = Math.round (pvcdata[0].energy / chargedata[0].energy * 100) + // add a PV percentage tag to the charging bar + if ((pvcdata.length > 0) && (chargedata.length > 0) && (chargedata[0].energy > 0)) { + let pvRatio = Math.round(pvcdata[0].energy / chargedata[0].energy * 100) - const pvtags = svg.selectAll(".pvtag") - .data(chargedata) - .enter() - .append("g"); - pvtags - .append("text") - .attr("x", (d) => this.xScale(d.name) + this.xScale.bandwidth() / 2) - .attr("y", (d) => this.yScale(d.energy) - 10) - .attr("font-size", this.labelfontsize - 2) - .attr("text-anchor", "middle") - .attr("fill", (d) => this.pvColor) - .text((d) => ("(PV: " + pvRatio.toLocaleString(undefined) + " %)")); - } + const pvtags = svg.selectAll(".pvtag") + .data(chargedata) + .enter() + .append("g"); + pvtags + .append("text") + .attr("x", (d) => this.xScale(d.name) + this.xScale.bandwidth() / 2) + .attr("y", (d) => this.yScale(d.energy) - 10) + .attr("font-size", this.labelfontsize - 2) + .attr("text-anchor", "middle") + .attr("fill", (d) => this.pvColor) + .text((d) => ("(PV: " + pvRatio.toLocaleString(undefined) + " %)")); + } - // Add category labels - labels - .append("text") - .attr("x", (d) => this.xScale(d.name) + this.xScale.bandwidth() / 2) - .attr("y", this.height - this.margin.bottom - 5) - .attr("font-size", this.labelfontsize) - .attr("text-anchor", "middle") - .attr("fill", (d) => d.color) - .text((d) => (this.truncateCategory(d.name))); + // Add category labels + labels + .append("text") + .attr("x", (d) => this.xScale(d.name) + this.xScale.bandwidth() / 2) + .attr("y", this.height - this.margin.bottom - 5) + .attr("font-size", this.labelfontsize) + .attr("text-anchor", "middle") + .attr("fill", (d) => d.color) + .text((d) => (this.truncateCategory(d.name))); - } + } - updateHeading() { - var heading = "Energie "; + updateHeading() { + var heading = "Energie "; - switch (wbdata.graphMode) { - case 'live': - heading = heading + " heute"; - break; - case 'day': - if (wbdata.showTodayGraph) { - heading = heading + " heute"; - } else { - heading = heading + wbdata.graphDate.getDate() + "." + (wbdata.graphDate.getMonth() + 1) + "."; - } - break; - case 'month': - heading = "Monatswerte " + formatMonth(wbdata.graphMonth.month, wbdata.graphMonth.year); - break; - default: break; - } - d3.select("h3#energyheading").text(heading); - } + switch (wbdata.graphMode) { + case 'live': + heading = heading + " heute"; + break; + case 'day': + if (wbdata.showTodayGraph) { + heading = heading + " heute"; + } else { + heading = heading + wbdata.graphDate.getDate() + "." + (wbdata.graphDate.getMonth() + 1) + "."; + } + break; + case 'month': + heading = "Monatswerte " + formatMonth(wbdata.graphMonth.month, wbdata.graphMonth.year); + break; + default: break; + } + d3.select("h3#energyheading").text(heading); + } - adjustLabelSize() { - let xCount = this.plotdata.length - if (xCount <= 5) { - this.maxTextLength = 12; - this.labelfontsize = 16 - } else if (xCount == 6) { - this.maxTextLength = 11; - this.labelfontsize = 14 - } else if (xCount > 6 && xCount <= 8) { - this.maxTextLength = 8; - this.labelfontsize = 13 - } else if (xCount == 9) { - this.maxTextLength = 8; - this.labelfontsize = 11; - } else if (xCount == 10) { - this.maxTextLength = 7; - this.labelfontsize = 10; - } - else { - this.maxTextLength = 6; - this.labelfontsize = 9 - } - } + adjustLabelSize() { + let xCount = this.plotdata.length + if (xCount <= 5) { + this.maxTextLength = 12; + this.labelfontsize = 16 + } else if (xCount == 6) { + this.maxTextLength = 11; + this.labelfontsize = 14 + } else if (xCount > 6 && xCount <= 8) { + this.maxTextLength = 8; + this.labelfontsize = 13 + } else if (xCount == 9) { + this.maxTextLength = 8; + this.labelfontsize = 11; + } else if (xCount == 10) { + this.maxTextLength = 7; + this.labelfontsize = 10; + } + else { + this.maxTextLength = 6; + this.labelfontsize = 9 + } + } - truncateCategory(name) { - if (name.length > this.maxTextLength) { - return name.substr(0, this.maxTextLength) + "." - } else { - return name - } - } + truncateCategory(name) { + if (name.length > this.maxTextLength) { + return name.substr(0, this.maxTextLength) + "." + } else { + return name + } + } } From 9058f82747ac6c21c0739ec6bdd1f438312a4dfe Mon Sep 17 00:00:00 2001 From: Jens Date: Sun, 13 Nov 2022 16:56:25 +0100 Subject: [PATCH 035/201] Add VIN selector to SOC PSA --- modules/soc_psa/main.sh | 8 +++++--- modules/soc_psa/psasoc.py | 14 ++++++++++++-- runs/updateConfig.sh | 6 ++++++ web/settings/modulconfiglp.php | 12 ++++++++++++ 4 files changed, 35 insertions(+), 5 deletions(-) diff --git a/modules/soc_psa/main.sh b/modules/soc_psa/main.sh index 76e10afb45..2626a0ef93 100755 --- a/modules/soc_psa/main.sh +++ b/modules/soc_psa/main.sh @@ -34,6 +34,7 @@ case $CHARGEPOINT in password=$psa_passlp2 clientId=$psa_clientidlp2 clientSecret=$psa_clientsecretlp2 + vehicleId=$psa_vinlp2 soccalc=$psa_soccalclp2 manufacturer=$psa_manufacturerlp2 socOnlineIntervall=$psa_intervallp2 @@ -59,6 +60,7 @@ case $CHARGEPOINT in password=$psa_passlp1 clientId=$psa_clientidlp1 clientSecret=$psa_clientsecretlp1 + vehicleId=$psa_vinlp1 soccalc=$psa_soccalclp1 manufacturer=$psa_manufacturerlp1 socOnlineIntervall=$psa_intervallp1 @@ -100,7 +102,7 @@ if (($soccalc == 0)); then #manual calculation not enabled, using existing logic incrementTimer else echo 0 > $soctimerfile - sudo python $MODULEDIR/psasoc.py $CHARGEPOINT $username $password $clientId $clientSecret $manufacturer $soccalc + sudo python $MODULEDIR/psasoc.py $CHARGEPOINT $username $password $clientId $clientSecret $manufacturer $soccalc $vehicleId if [[ $? == 0 ]]; then openwbDebugLog ${DMOD} 0 "Lp$CHARGEPOINT: Fetched from $manufacturer: $(<$psaSocFile)%" else @@ -113,7 +115,7 @@ else # manual calculation enabled, combining PSA module with manual calc method openwbDebugLog ${DMOD} 0 "Lp$CHARGEPOINT: Charging started. Fetching SoC from $manufacturer out of order." soctimer=0 echo 0 > $soctimerfile - sudo python $MODULEDIR/psasoc.py $CHARGEPOINT $username $password $clientId $clientSecret $manufacturer $soccalc + sudo python $MODULEDIR/psasoc.py $CHARGEPOINT $username $password $clientId $clientSecret $manufacturer $soccalc $vehicleId if [[ $? == 0 ]]; then echo $(<$psaSocFile) > $socFile echo $(<$psaSocFile) > $manualSocFile @@ -132,7 +134,7 @@ else # manual calculation enabled, combining PSA module with manual calc method else openwbDebugLog ${DMOD} 0 "Lp$CHARGEPOINT: Fetching SoC from $manufacturer" echo 0 > $soctimerfile - sudo python $MODULEDIR/psasoc.py $CHARGEPOINT $username $password $clientId $clientSecret $manufacturer $soccalc + sudo python $MODULEDIR/psasoc.py $CHARGEPOINT $username $password $clientId $clientSecret $manufacturer $soccalc $vehicleId if [[ $? == 0 ]]; then # if fetched SoC is equal from last used fetched SoC and car is plugged in if [[ $(<$psaSocFile) == $(<$psaSocFile_last) ]] && [[ $(($(<$plugstat))) == 1 ]]; then diff --git a/modules/soc_psa/psasoc.py b/modules/soc_psa/psasoc.py index c4d489d84b..92d2399994 100755 --- a/modules/soc_psa/psasoc.py +++ b/modules/soc_psa/psasoc.py @@ -34,6 +34,7 @@ client_secret=str(sys.argv[5]) manufacturer=str(sys.argv[6]) soccalc=str(sys.argv[7]) +vehicleId=str(sys.argv[8]) named_tuple = time.localtime() # get struct_time time_string = time.strftime("%m/%d/%Y, %H:%M:%S psasoc lp"+chargepoint, named_tuple) @@ -93,8 +94,17 @@ f.write(str(responestatus)) f.close() vin_list = json.loads(responsetext) -vin_id = vin_list ['_embedded']['vehicles'][0]['id'] -vin_vin = vin_list ['_embedded']['vehicles'][0]['vin'] + +# search for entry of entered VIN +vin_selected = filter(lambda x: x['vin'] == vehicleId, vin_list['_embedded']['vehicles']) +vin_id = vin_selected [0]['id'] +vin_vin = vin_selected [0]['vin'] + +f = open('/var/www/html/openWB/ramdisk/psareply2filterVINlp'+chargepoint, 'w') +f.write('VIN: ' + str(vin_vin)) +f.write(', ID: ' + str(vin_id)) +f.close() + payload = {'client_id':client_id} data = urllib.urlencode(payload) data = data.encode('Big5') diff --git a/runs/updateConfig.sh b/runs/updateConfig.sh index 8ae746a3dc..a7218e2037 100755 --- a/runs/updateConfig.sh +++ b/runs/updateConfig.sh @@ -2063,6 +2063,12 @@ updateConfig(){ if ! grep -Fq "psa_manufacturerlp2=" $ConfigFile; then echo "psa_manufacturerlp2=Peugeot" >> $ConfigFile fi + if ! grep -Fq "psa_vinlp1=" $ConfigFile; then + echo "psa_vinlp1=''" >> $ConfigFile + fi + if ! grep -Fq "psa_vinlp2=" $ConfigFile; then + echo "psa_vinlp2=''" >> $ConfigFile + fi if ! grep -Fq "soc_eq_client_id_lp1=" $ConfigFile; then { echo "soc_eq_client_id_lp1=ID" diff --git a/web/settings/modulconfiglp.php b/web/settings/modulconfiglp.php index 7a1cd78467..3513df12cf 100644 --- a/web/settings/modulconfiglp.php +++ b/web/settings/modulconfiglp.php @@ -1840,6 +1840,12 @@ function visibility_i3_soccalclp1() {
+
+ +
+ +
+
@@ -3532,6 +3538,12 @@ function visibility_i3_soccalclp2() {
+
+ +
+ +
+
From beb60656d749fb3e26398626badcebaa15700c08 Mon Sep 17 00:00:00 2001 From: Jens Date: Sun, 13 Nov 2022 20:37:43 +0100 Subject: [PATCH 036/201] Change SoC PSA VIN to optional --- modules/soc_psa/psasoc.py | 20 +++++++++++++++----- web/settings/modulconfiglp.php | 6 ++++++ 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/modules/soc_psa/psasoc.py b/modules/soc_psa/psasoc.py index 92d2399994..0f096f6271 100755 --- a/modules/soc_psa/psasoc.py +++ b/modules/soc_psa/psasoc.py @@ -34,7 +34,11 @@ client_secret=str(sys.argv[5]) manufacturer=str(sys.argv[6]) soccalc=str(sys.argv[7]) -vehicleId=str(sys.argv[8]) + +# VehicleId is optional +vehicleId = False +if (len(sys.argv) > 8 ): + vehicleId=str(sys.argv[8]) named_tuple = time.localtime() # get struct_time time_string = time.strftime("%m/%d/%Y, %H:%M:%S psasoc lp"+chargepoint, named_tuple) @@ -95,10 +99,16 @@ f.close() vin_list = json.loads(responsetext) -# search for entry of entered VIN -vin_selected = filter(lambda x: x['vin'] == vehicleId, vin_list['_embedded']['vehicles']) -vin_id = vin_selected [0]['id'] -vin_vin = vin_selected [0]['vin'] +# if VIN is not given, first car will be selected: +if not vehicleId: + vin_id = vin_list ['_embedded']['vehicles'][0]['id'] + vin_vin = vin_list ['_embedded']['vehicles'][0]['vin'] + +else: + # search for entry of given VIN + vin_selected = filter(lambda x: x['vin'] == vehicleId, vin_list['_embedded']['vehicles']) + vin_id = vin_selected [0]['id'] + vin_vin = vin_selected [0]['vin'] f = open('/var/www/html/openWB/ramdisk/psareply2filterVINlp'+chargepoint, 'w') f.write('VIN: ' + str(vin_vin)) diff --git a/web/settings/modulconfiglp.php b/web/settings/modulconfiglp.php index 3513df12cf..1cbcab7d31 100644 --- a/web/settings/modulconfiglp.php +++ b/web/settings/modulconfiglp.php @@ -1844,6 +1844,9 @@ function visibility_i3_soccalclp1() {
+ + VIN des gewünschten Fahrzeugs. Wird keine VIN angegeben, wird das erste Fahrzeug aus dem Account verwendet. +
@@ -3542,6 +3545,9 @@ function visibility_i3_soccalclp2() {
+ + VIN des gewünschten Fahrzeugs. Wird keine VIN angegeben, wird das erste Fahrzeug aus dem Account verwendet. +
From 334b3b5c01ac627d7d0034849ce50f1778b91512 Mon Sep 17 00:00:00 2001 From: LKuemmel <76958050+LKuemmel@users.noreply.github.com> Date: Mon, 14 Nov 2022 14:25:35 +0100 Subject: [PATCH 037/201] Nissan soc module works for all Nissan vehicles (#2488) --- web/settings/modulconfiglp.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/settings/modulconfiglp.php b/web/settings/modulconfiglp.php index 7a1cd78467..51d4507376 100644 --- a/web/settings/modulconfiglp.php +++ b/web/settings/modulconfiglp.php @@ -735,7 +735,7 @@ function visibility_twcmanagerlp1_connection() { - + @@ -2932,7 +2932,7 @@ function visibility_twcmanagerlp2_connection() { - + From d04c8e24081d324dc143a34705290a62e4d60206 Mon Sep 17 00:00:00 2001 From: okaegi <72255431+okaegi@users.noreply.github.com> Date: Mon, 14 Nov 2022 14:27:22 +0100 Subject: [PATCH 038/201] Python Log im Smarthome... diverse Korrekutren (#2493) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit HTTP Gerät: Es wurde auf Python Log umgestellt. Es wurde im on / off trigger ein Browser Header genommen. Es wurde auf static Types umgestellt. Dac Gerät: Es wurde auf Python Log umgestellt. Neuer Dac typ M120T von Pigeon Es wurde auf static Types umgestellt. Ratiotherm WP Es wurde auf Python Log umgestellt. Es wurde auf static Types umgestellt. Stiebel WP Es wurde auf Python Log umgestellt. Es wurde auf static Types umgestellt. Smarthome Config 2.0 Maximaler Speicherladung 30'000 Textkorrektur bei DAC J/N Hausverbrauch besser erklärt --- modules/smarthome/http/off.py | 36 +++++++---------- modules/smarthome/http/on.py | 36 +++++++---------- modules/smarthome/http/watt.py | 58 +++++++++++----------------- modules/smarthome/nxdacxx/off.py | 26 ++++++------- modules/smarthome/nxdacxx/on.py | 27 +++++++------ modules/smarthome/nxdacxx/watt.py | 47 +++++++++++----------- modules/smarthome/ratiotherm/off.py | 4 +- modules/smarthome/ratiotherm/on.py | 4 +- modules/smarthome/ratiotherm/watt.py | 14 +++---- modules/smarthome/stiebel/off.py | 38 ++++++------------ modules/smarthome/stiebel/on.py | 40 ++++++------------- modules/smarthome/stiebel/watt.py | 34 +++++++--------- packages/smarthome/smartlog.py | 2 +- packages/smarthome/smartret.py | 8 ++++ runs/mqttsub.py | 2 +- runs/usmarthome/smartnxdacxx.py | 17 ++++---- web/settings/smarthomeconfig.php | 17 ++++---- 17 files changed, 174 insertions(+), 236 deletions(-) create mode 100644 packages/smarthome/smartret.py diff --git a/modules/smarthome/http/off.py b/modules/smarthome/http/off.py index ff3d8b4751..190a972842 100644 --- a/modules/smarthome/http/off.py +++ b/modules/smarthome/http/off.py @@ -1,27 +1,17 @@ #!/usr/bin/python3 import sys -import os -import time -import json -import getopt -import socket -import struct -import codecs -import binascii -import urllib.request +import logging +from smarthome.smartlog import initlog +from urllib.request import Request, urlopen from urllib.parse import urlparse -named_tuple = time.localtime() # getstruct_time -time_string = time.strftime("%m/%d/%Y, %H:%M:%S http off.py", named_tuple) -devicenumber=str(sys.argv[1]) -uberschuss=int(sys.argv[3]) -url=str(sys.argv[4]) +devicenumber = int(sys.argv[1]) +uberschuss = int(sys.argv[3]) +url = str(sys.argv[4]) +initlog("http", devicenumber) +log = logging.getLogger("http") if not urlparse(url).scheme: - url = 'http://' + url -file_string= '/var/www/html/openWB/ramdisk/smarthome_device_' + str(devicenumber) + '_http.log' -if os.path.isfile(file_string): - f = open( file_string , 'a') -else: - f = open( file_string , 'w') -print ('%s devicenr %s url %s)' % (time_string,devicenumber,url),file=f) -f.close() -urllib.request.urlopen(url, timeout=5) \ No newline at end of file + url = 'http://' + url +log.info('off devicenr %d url %s' % (devicenumber, url)) +headers = {'User-Agent': 'Mozilla/5.0'} +request = Request(url, headers=headers) +urlopen(request, timeout=5).read() diff --git a/modules/smarthome/http/on.py b/modules/smarthome/http/on.py index 8888301446..9eb6cde138 100644 --- a/modules/smarthome/http/on.py +++ b/modules/smarthome/http/on.py @@ -1,27 +1,17 @@ #!/usr/bin/python3 import sys -import os -import time -import json -import getopt -import socket -import struct -import codecs -import binascii -import urllib.request +import logging +from smarthome.smartlog import initlog +from urllib.request import Request, urlopen from urllib.parse import urlparse -named_tuple = time.localtime() # getstruct_time -time_string = time.strftime("%m/%d/%Y, %H:%M:%S http on.py", named_tuple) -devicenumber=str(sys.argv[1]) -uberschuss=int(sys.argv[3]) -url=str(sys.argv[4]) +devicenumber = int(sys.argv[1]) +uberschuss = int(sys.argv[3]) +url = str(sys.argv[4]) +initlog("http", devicenumber) +log = logging.getLogger("http") if not urlparse(url).scheme: - url = 'http://' + url -file_string= '/var/www/html/openWB/ramdisk/smarthome_device_' + str(devicenumber) + '_http.log' -if os.path.isfile(file_string): - f = open( file_string , 'a') -else: - f = open( file_string , 'w') -print ('%s devicenr %s url %s' % (time_string,devicenumber,url),file=f) -f.close() -urllib.request.urlopen(url, timeout=5) + url = 'http://' + url +log.info('on devicenr %d url %s' % (devicenumber, url)) +headers = {'User-Agent': 'Mozilla/5.0'} +request = Request(url, headers=headers) +urlopen(request, timeout=5).read() diff --git a/modules/smarthome/http/watt.py b/modules/smarthome/http/watt.py index 0dc45cf701..fa04b37eab 100755 --- a/modules/smarthome/http/watt.py +++ b/modules/smarthome/http/watt.py @@ -1,57 +1,47 @@ #!/usr/bin/python3 import sys -import os -import time -import json -import getopt -import socket -import struct -import codecs -import binascii +import logging +from smarthome.smartlog import initlog +from smarthome.smartret import writeret import urllib.request from urllib.parse import urlparse -named_tuple = time.localtime() # getstruct_time -time_string = time.strftime("%m/%d/%Y, %H:%M:%S http watt.py", named_tuple) -devicenumber=str(sys.argv[1]) -uberschuss=int(sys.argv[3]) -url=str(sys.argv[4]) +devicenumber = int(sys.argv[1]) +uberschuss = int(sys.argv[3]) +url = str(sys.argv[4]) try: - urlc=str(sys.argv[5]) -except: + urlc = str(sys.argv[5]) +except Exception: urlc = "none" try: - urlstate=str(sys.argv[8]) -except: + urlstate = str(sys.argv[8]) +except Exception: urlstate = "none" +initlog("http", devicenumber) +log = logging.getLogger("http") if not urlparse(url).scheme: - url = 'http://' + url + url = 'http://' + url if not urlparse(urlstate).scheme and not urlstate.startswith("none"): - urlstate = 'http://' + urlstate + urlstate = 'http://' + urlstate if uberschuss < 0: - uberschuss = 0 -urlrep= url.replace("", str(uberschuss)) -file_string= '/var/www/html/openWB/ramdisk/smarthome_device_' + str(devicenumber) + '_http.log' -if os.path.isfile(file_string): - f = open( file_string , 'a') -else: - f = open( file_string , 'w') -print ('%s devicenr %s orig url %s replaced url %s urlc %s urlstate %s'% (time_string,devicenumber,url,urlrep,urlc,urlstate),file=f) + uberschuss = 0 +urlrep = url.replace("", str(uberschuss)) +log.info('watt devicenr %d orig url %s replaced url %s urlc %s urlstate %s' % + (devicenumber, url, urlrep, urlc, urlstate)) if not urlstate.startswith("none"): stateurl_response = 0 try: stateurl_response = urllib.request.urlopen(urlstate, timeout=5).read().decode("utf-8") except urllib.error.HTTPError as e: - print('%s StateURL HTTP Error: %d'%(time_string,e.code),file=f) + log.info('watt StateURL HTTP Error: %d' % (e.code)) except urllib.error.URLError as e: - print('%s StateURL URL Error: %s'%(time_string,e.reason),file=f) + log.info('watt StateURL URL Error: %s' % (e.reason)) try: state = int(stateurl_response) except ValueError: - print ('%s StateURL delivered no integer but: %s'%(time_string,stateurl_response),file=f) + log.info('watt StateURL delivered no integer but: %s' % (stateurl_response)) state = 0 else: state = 0 -f.close() aktpowerfl = float(urllib.request.urlopen(urlrep, timeout=5).read().decode("utf-8")) aktpower = int(aktpowerfl) if state == 1 or aktpower > 50: @@ -65,7 +55,5 @@ urlc = 'http://' + urlc powercfl = float(urllib.request.urlopen(urlc, timeout=5).read().decode("utf-8")) powerc = int(powercfl) -answer = '{"power":' + str(aktpower) + ',"powerc":' + str(powerc) + ',"on":' + str(relais) + '} ' -f1 = open('/var/www/html/openWB/ramdisk/smarthome_device_ret' + str(devicenumber), 'w') -json.dump(answer,f1) -f1.close() +answer = '{"power":' + str(aktpower) + ',"powerc":' + str(powerc) + ',"on":' + str(relais) + '}' +writeret(answer, devicenumber) diff --git a/modules/smarthome/nxdacxx/off.py b/modules/smarthome/nxdacxx/off.py index 89d4be1788..dbdf29ceb8 100644 --- a/modules/smarthome/nxdacxx/off.py +++ b/modules/smarthome/nxdacxx/off.py @@ -1,25 +1,25 @@ #!/usr/bin/python3 import sys import os -import time -named_tuple = time.localtime() # getstruct_time -time_string = time.strftime("%m/%d/%Y, %H:%M:%S N4DAC02 off.py", named_tuple) -devicenumber = str(sys.argv[1]) +import logging +from smarthome.smartlog import initlog +from pymodbus.client.sync import ModbusTcpClient +devicenumber = int(sys.argv[1]) ipadr = str(sys.argv[2]) uberschuss = int(sys.argv[3]) +port = int(sys.argv[4]) +dactyp = int(sys.argv[5]) bp = '/var/www/html/openWB/ramdisk/smarthome_device_' -file_string = bp + str(devicenumber) + '_N4DAC02.log' file_stringpv = bp + str(devicenumber) + '_pv' file_stringcount = bp + str(devicenumber) + '_count' file_stringcount5 = bp + str(devicenumber) + '_count5' -if os.path.isfile(file_string): - pass -else: - with open(file_string, 'w') as f: - print('N4DAC02 start log', file=f) -with open(file_string, 'a') as f: - print('%s devicenr %s ipadr %s' - % (time_string, devicenumber, ipadr), file=f) +initlog("DAC", devicenumber) +log = logging.getLogger("DAC") +log.info('off devicenr %d ipadr %s dactyp %d' % (devicenumber, ipadr, dactyp)) +if dactyp == 2: + client = ModbusTcpClient(ipadr, port=port) + # DO1 ausschalten um SGready zu sperren + rq = client.write_coil(0, False) pvmodus = 0 if os.path.isfile(file_stringpv): with open(file_stringpv, 'r') as f: diff --git a/modules/smarthome/nxdacxx/on.py b/modules/smarthome/nxdacxx/on.py index 7917e61fb9..413ff9f047 100644 --- a/modules/smarthome/nxdacxx/on.py +++ b/modules/smarthome/nxdacxx/on.py @@ -1,25 +1,24 @@ #!/usr/bin/python3 import sys -import os -import time -named_tuple = time.localtime() # getstruct_time -time_string = time.strftime("%m/%d/%Y, %H:%M:%S N4DAC02 on.py", named_tuple) -devicenumber = str(sys.argv[1]) +import logging +from smarthome.smartlog import initlog +from pymodbus.client.sync import ModbusTcpClient +devicenumber = int(sys.argv[1]) ipadr = str(sys.argv[2]) uberschuss = int(sys.argv[3]) +port = int(sys.argv[4]) +dactyp = int(sys.argv[5]) +initlog("DAC", devicenumber) +log = logging.getLogger("DAC") bp = '/var/www/html/openWB/ramdisk/smarthome_device_' -file_string = bp + str(devicenumber) + '_N4DAC02.log' file_stringpv = bp + str(devicenumber) + '_pv' file_stringcount = bp + str(devicenumber) + '_count' file_stringcount5 = bp + str(devicenumber) + '_count5' -if os.path.isfile(file_string): - pass -else: - with open(file_string, 'w') as f: - print('N4DAC02 start log', file=f) -with open(file_string, 'a') as f: - print('%s devicenr %s ipadr %s' % - (time_string, devicenumber, ipadr), file=f) +log.info('on devicenr %d ipadr %s dactyp %d' % (devicenumber, ipadr, dactyp)) +if dactyp == 2: + client = ModbusTcpClient(ipadr, port=port) + # DO1 einschalten um SGready zu aktivieren + rq = client.write_coil(0, True) pvmodus = 1 with open(file_stringpv, 'w') as f: f.write(str(pvmodus)) diff --git a/modules/smarthome/nxdacxx/watt.py b/modules/smarthome/nxdacxx/watt.py index 9231eb2656..cf98e89f79 100644 --- a/modules/smarthome/nxdacxx/watt.py +++ b/modules/smarthome/nxdacxx/watt.py @@ -1,23 +1,23 @@ #!/usr/bin/python3 import sys import os -import time -import json from pymodbus.client.sync import ModbusTcpClient -named_tuple = time.localtime() # getstruct_time -time_string = time.strftime("%m/%d/%Y, %H:%M:%S N4DAC02 watty.py", named_tuple) -devicenumber = str(sys.argv[1]) +import logging +from smarthome.smartlog import initlog +from smarthome.smartret import writeret +devicenumber = int(sys.argv[1]) ipadr = str(sys.argv[2]) uberschuss = int(sys.argv[3]) maxpower = int(sys.argv[4]) forcesend = int(sys.argv[5]) port = int(sys.argv[6]) dactyp = int(sys.argv[7]) -# forcesend = 0 default acthor time period applies +initlog("DAC", devicenumber) +log = logging.getLogger("DAC") +# forcesend = 0 default time period applies # forcesend = 1 default overwritten send now # forcesend = 9 default overwritten no send bp = '/var/www/html/openWB/ramdisk/smarthome_device_' -file_string = bp + str(devicenumber) + '_N4DAC02.log' file_stringpv = bp + str(devicenumber) + '_pv' file_stringcount = bp + str(devicenumber) + '_count' file_stringcount5 = bp + str(devicenumber) + '_count5' @@ -71,16 +71,10 @@ if count1 > 80: count1 = 0 if count1 < 3: - if os.path.isfile(file_string): - pass - else: - with open(file_string, 'w') as f: - print('N4DAC02 start log', file=f) - with open(file_string, 'a') as f: - helpstr = '%s devicenr %s ipadr %s ueberschuss %6d port %4d' - helpstr += ' maxueberschuss %6d pvmodus %1d modbuswrite %1d' - print(helpstr % (time_string, devicenumber, ipadr, uberschuss, - port, maxpower, pvmodus, modbuswrite), file=f) + helpstr = 'devicenr %d ipadr %s ueberschuss %6d port %4d' + helpstr += ' maxueberschuss %6d pvmodus %1d modbuswrite %1d' + log.info(helpstr % (devicenumber, ipadr, uberschuss, + port, maxpower, pvmodus, modbuswrite)) # modbus write if modbuswrite == 1: client = ModbusTcpClient(ipadr, port=port) @@ -88,14 +82,21 @@ # 10 Volts are 1000 volt = int((neupower * 1000) / maxpower) rq = client.write_register(1, volt, unit=1) - else: + elif dactyp == 1: # 10 volts are 4000 volt = int((neupower * 4000) / maxpower) rq = client.write_register(0x01f4, volt, unit=1) + elif dactyp == 2: + volt = int((neupower * 4095) / maxpower) + if volt < 370: + volt = 370 + # ausgabe nicht kleiner 0,9V sonst Leistungsregelung der WP aus + rq = client.write_register(0, volt, unit=1) + else: + pass if count1 < 3: - with open(file_string, 'a') as f: - print('%s devicenr %s ipadr %s Volt %6d dactyp %d written by modbus ' % - (time_string, devicenumber, ipadr, volt, dactyp), file=f) + log.info('devicenr %d ipadr %s Volt %6d dactyp %d written by modbus ' % + (devicenumber, ipadr, volt, dactyp)) with open(file_stringcount, 'w') as f: f.write(str(count1)) else: @@ -104,6 +105,4 @@ answer = '{"power":' + str(aktpower) + ',"powerc":' + str(powerc) answer += ',"send":' + str(modbuswrite) + ',"sendpower":' + str(volt) answer += ',"on":' + str(pvmodus) + '}' -with open('/var/www/html/openWB/ramdisk/smarthome_device_ret' + - str(devicenumber), 'w') as f1: - json.dump(answer, f1) +writeret(answer, devicenumber) diff --git a/modules/smarthome/ratiotherm/off.py b/modules/smarthome/ratiotherm/off.py index 677503eb2b..118f326f40 100644 --- a/modules/smarthome/ratiotherm/off.py +++ b/modules/smarthome/ratiotherm/off.py @@ -3,7 +3,7 @@ import sys import logging from smarthome.smartlog import initlog -devicenumber = str(sys.argv[1]) +devicenumber = int(sys.argv[1]) ipadr = str(sys.argv[2]) uberschuss = int(sys.argv[3]) bp = '/var/www/html/openWB/ramdisk/smarthome_device_' @@ -13,7 +13,7 @@ initlog("ratiotherm", devicenumber) log = logging.getLogger("ratiotherm") aktpower = 0 -log.info(" off devicenr %s ipadr %s ueberschuss %6d Akt Leistung %6d" +log.info(" off devicenr %d ipadr %s ueberschuss %6d Akt Leistung %6d" % (devicenumber, ipadr, uberschuss, aktpower)) pvmodus = 0 if os.path.isfile(file_stringpv): diff --git a/modules/smarthome/ratiotherm/on.py b/modules/smarthome/ratiotherm/on.py index 568eec1c30..5368dedc28 100644 --- a/modules/smarthome/ratiotherm/on.py +++ b/modules/smarthome/ratiotherm/on.py @@ -2,7 +2,7 @@ import sys import logging from smarthome.smartlog import initlog -devicenumber = str(sys.argv[1]) +devicenumber = int(sys.argv[1]) ipadr = str(sys.argv[2]) uberschuss = int(sys.argv[3]) bp = '/var/www/html/openWB/ramdisk/smarthome_device_' @@ -14,7 +14,7 @@ file_stringpv = bp + str(devicenumber) + '_pv' file_stringcount = bp + str(devicenumber) + '_count' aktpower = 0 -log.info(" on devicenr %s ipadr %s ueberschuss %6d Akt Leistung %6d" +log.info(" on devicenr %d ipadr %s ueberschuss %6d Akt Leistung %6d" % (devicenumber, ipadr, uberschuss, aktpower)) with open(file_stringpv, 'w') as f: f.write(str(1)) diff --git a/modules/smarthome/ratiotherm/watt.py b/modules/smarthome/ratiotherm/watt.py index 8dce8efa36..bcc0b5ec95 100644 --- a/modules/smarthome/ratiotherm/watt.py +++ b/modules/smarthome/ratiotherm/watt.py @@ -1,12 +1,12 @@ #!/usr/bin/python3 import sys import os -import json from pymodbus.payload import BinaryPayloadBuilder, Endian from pymodbus.client.sync import ModbusTcpClient import logging from smarthome.smartlog import initlog -devicenumber = str(sys.argv[1]) +from smarthome.smartret import writeret +devicenumber = int(sys.argv[1]) ipadr = str(sys.argv[2]) uberschuss = int(sys.argv[3]) forcesend = int(sys.argv[4]) @@ -70,9 +70,9 @@ with open(file_stringpv, 'w') as f: f.write(str(pvmodus)) if count1 < 3: - log.info(" watt devicenr %s ipadr %s ueberschuss %6d Akt Leistung %6d" + log.info(" watt devicenr %d ipadr %s ueberschuss %6d Akt Leistung %6d" % (devicenumber, ipadr, uberschuss, aktpower)) - log.info(" watt devicenr %s ipadr %s neupower %6d pvmodus %1d modbusw %1d" + log.info(" watt devicenr %d ipadr %s neupower %6d pvmodus %1d modbusw %1d" % (devicenumber, ipadr, neupower, pvmodus, modbuswrite)) # modbus write if modbuswrite == 1: @@ -84,7 +84,7 @@ client = ModbusTcpClient(ipadr, port=502) client.write_register(100, pay[0], unit=1) if count1 < 3: - log.info(" watt devicenr %s ipadr %s written %6d %#4X" + log.info(" watt devicenr %d ipadr %s written %6d %#4X" % (devicenumber, ipadr, pay[0], pay[0])) else: if pvmodus == 99: @@ -92,6 +92,4 @@ answer = '{"power":' + str(aktpower) + ',"powerc":0' answer += ',"send":' + str(modbuswrite) + ',"sendpower":' + str(neupower) answer += ',"on":' + str(pvmodus) + '}' -with open('/var/www/html/openWB/ramdisk/smarthome_device_ret' + - str(devicenumber), 'w') as f1: - json.dump(answer, f1) +writeret(answer, devicenumber) diff --git a/modules/smarthome/stiebel/off.py b/modules/smarthome/stiebel/off.py index f80f3a24d9..d6d86cb0f0 100644 --- a/modules/smarthome/stiebel/off.py +++ b/modules/smarthome/stiebel/off.py @@ -1,33 +1,19 @@ #!/usr/bin/python3 import sys -import os -import time -import json -import getopt -import socket -import struct -import codecs -import binascii from pymodbus.client.sync import ModbusTcpClient -named_tuple = time.localtime() # getstruct_time -time_string = time.strftime("%m/%d/%Y, %H:%M:%S stiebel off.py", named_tuple) -devicenumber=str(sys.argv[1]) -ipadr=str(sys.argv[2]) -uberschuss=int(sys.argv[3]) -# standard -file_string= '/var/www/html/openWB/ramdisk/smarthome_device_' + str(devicenumber) + '_stiebel.log' -file_stringpv= '/var/www/html/openWB/ramdisk/smarthome_device_' + str(devicenumber) + '_pv' -if os.path.isfile(file_string): - f = open( file_string , 'a') -else: - f = open( file_string , 'w') -print ('%s devicenr %s ipadr %s ueberschuss %6d try to connect (modbus)' % (time_string,devicenumber,ipadr,uberschuss),file=f) +import logging +from smarthome.smartlog import initlog +devicenumber = int(sys.argv[1]) +ipadr = str(sys.argv[2]) +uberschuss = int(sys.argv[3]) +initlog("stiebel", devicenumber) +log = logging.getLogger("stiebel") +file_stringpv = '/var/www/html/openWB/ramdisk/smarthome_device_' + str(devicenumber) + '_pv' +log.info('off devicenr %d ipadr %s ueberschuss %6d try to connect (modbus)' % (devicenumber, ipadr, uberschuss)) client = ModbusTcpClient(ipadr, port=502) # deactivate switch one (manual 4002) rq = client.write_register(4001, 0, unit=1) -print ('%s devicenr %s ipadr %s ' % (time_string,devicenumber,ipadr),file=f) -f.close() +log.info('off devicenr %d ipadr %s ' % (devicenumber, ipadr)) pvmodus = 0 -f = open( file_stringpv , 'w') -f.write(str(pvmodus)) -f.close() \ No newline at end of file +with open(file_stringpv, 'w') as f: + f.write(str(pvmodus)) diff --git a/modules/smarthome/stiebel/on.py b/modules/smarthome/stiebel/on.py index 1e3a969d91..c363a66220 100644 --- a/modules/smarthome/stiebel/on.py +++ b/modules/smarthome/stiebel/on.py @@ -1,34 +1,18 @@ #!/usr/bin/python3 import sys -import os -import time -import json -import getopt -import socket -import struct -import codecs -import binascii from pymodbus.client.sync import ModbusTcpClient -named_tuple = time.localtime() # getstruct_time -time_string = time.strftime("%m/%d/%Y, %H:%M:%S stiebel on.py", named_tuple) -devicenumber=str(sys.argv[1]) -ipadr=str(sys.argv[2]) -uberschuss=int(sys.argv[3]) -# standard -# lesen -# own log -file_string= '/var/www/html/openWB/ramdisk/smarthome_device_' + str(devicenumber) + '_stiebel.log' -file_stringpv= '/var/www/html/openWB/ramdisk/smarthome_device_' + str(devicenumber) + '_pv' -if os.path.isfile(file_string): - f = open( file_string , 'a') -else: - f = open( file_string , 'w') -print ('%s devicenr %s ipadr %s ueberschuss %6d try to connect (modbus)' % (time_string,devicenumber,ipadr,uberschuss),file=f) +import logging +from smarthome.smartlog import initlog +devicenumber = int(sys.argv[1]) +ipadr = str(sys.argv[2]) +uberschuss = int(sys.argv[3]) +initlog("stiebel", devicenumber) +log = logging.getLogger("stiebel") +file_stringpv = '/var/www/html/openWB/ramdisk/smarthome_device_' + str(devicenumber) + '_pv' +log.info('on devicenr %d ipadr %s ueberschuss %6d try to connect (modbus)' % (devicenumber, ipadr, uberschuss)) client = ModbusTcpClient(ipadr, port=502) # activate switch one (manual 4002) rq = client.write_register(4001, 1, unit=1) -print ('%s devicenr %s ipadr %s ' % (time_string,devicenumber,ipadr),file=f) -f.close() -f = open( file_stringpv , 'w') -f.write(str(1)) -f.close() \ No newline at end of file +log.info('on devicenr %d ipadr %s ' % (devicenumber, ipadr)) +with open(file_stringpv, 'w') as f: + f.write(str(1)) diff --git a/modules/smarthome/stiebel/watt.py b/modules/smarthome/stiebel/watt.py index 89041c6a83..abcc8a0f22 100644 --- a/modules/smarthome/stiebel/watt.py +++ b/modules/smarthome/stiebel/watt.py @@ -1,29 +1,21 @@ #!/usr/bin/python3 import sys import os -import time -import json -import getopt -import socket -import struct -import codecs -import binascii -from pymodbus.client.sync import ModbusTcpClient -named_tuple = time.localtime() # getstruct_time -time_string = time.strftime("%m/%d/%Y, %H:%M:%S stiebel watty.py", named_tuple) -devicenumber=str(sys.argv[1]) -ipadr=str(sys.argv[2]) -uberschuss=int(sys.argv[3]) -file_stringpv= '/var/www/html/openWB/ramdisk/smarthome_device_' + str(devicenumber) + '_pv' +import logging +from smarthome.smartlog import initlog +from smarthome.smartret import writeret +devicenumber = int(sys.argv[1]) +ipadr = str(sys.argv[2]) +uberschuss = int(sys.argv[3]) +initlog("stiebel", devicenumber) +log = logging.getLogger("stiebel") +file_stringpv = '/var/www/html/openWB/ramdisk/smarthome_device_' + str(devicenumber) + '_pv' # pv modus pvmodus = 0 if os.path.isfile(file_stringpv): - f = open( file_stringpv , 'r') - pvmodus =int(f.read()) - f.close() + with open(file_stringpv, 'r') as f: + pvmodus = int(f.read()) aktpower = 0 powerc = 0 -answer = '{"power":' + str(aktpower) + ',"powerc":' + str(powerc) + ',"on":' + str(pvmodus) + '} ' -f1 = open('/var/www/html/openWB/ramdisk/smarthome_device_ret' + str(devicenumber), 'w') -json.dump(answer,f1) -f1.close() \ No newline at end of file +answer = '{"power":' + str(aktpower) + ',"powerc":' + str(powerc) + ',"on":' + str(pvmodus) + '}' +writeret(answer, devicenumber) diff --git a/packages/smarthome/smartlog.py b/packages/smarthome/smartlog.py index 7ced74baf2..f8c1e9fcf2 100644 --- a/packages/smarthome/smartlog.py +++ b/packages/smarthome/smartlog.py @@ -1,7 +1,7 @@ import logging -def initlog(name, devicenumber): +def initlog(name: str, devicenumber: int) -> None: log = logging.getLogger(name) formatter = logging.Formatter('%(asctime)s %(levelname)s %(message)s') log.setLevel(logging.DEBUG) diff --git a/packages/smarthome/smartret.py b/packages/smarthome/smartret.py new file mode 100644 index 0000000000..6f0cc91f4e --- /dev/null +++ b/packages/smarthome/smartret.py @@ -0,0 +1,8 @@ +import json + + +def writeret(jsonstr: str, devicenumber: int) -> None: + fname = '/var/www/html/openWB/ramdisk/smarthome_device_ret' + fname += str(devicenumber) + with open(fname, 'w') as f1: + json.dump(jsonstr, f1) diff --git a/runs/mqttsub.py b/runs/mqttsub.py index 4135eb2f22..7d9de345d5 100755 --- a/runs/mqttsub.py +++ b/runs/mqttsub.py @@ -539,7 +539,7 @@ def on_message(client, userdata, msg): else: print( "invalid payload for topic '" + msg.topic + "': " + msg.payload.decode("utf-8")) if (msg.topic == "openWB/config/set/SmartHome/maxBatteryPower"): - if (0 <= int(msg.payload) <= 10000): + if (0 <= int(msg.payload) <= 30000): f = open('/var/www/html/openWB/ramdisk/smarthomehandlermaxbatterypower', 'w') f.write(msg.payload.decode("utf-8")) f.close() diff --git a/runs/usmarthome/smartnxdacxx.py b/runs/usmarthome/smartnxdacxx.py index 6025a7bce6..d58d3172f5 100644 --- a/runs/usmarthome/smartnxdacxx.py +++ b/runs/usmarthome/smartnxdacxx.py @@ -1,21 +1,22 @@ #!/usr/bin/python3 from usmarthome.smartbase import Sbase from usmarthome.global0 import log +from typing import Dict import subprocess class Snxdacxx(Sbase): - def __init__(self): + def __init__(self) -> None: # setting super().__init__() print('__init__ Snxdacxx executed') - self._smart_paramadd = {} + self._smart_paramadd = {} # type: dict [str,str] self._device_nxdacxxueb = 0 self._device_nxdacxxtype = 0 self.device_nummer = 0 self._dynregel = 1 - def updatepar(self, input_param): + def updatepar(self, input_param: Dict[str, str]) -> None: super().updatepar(input_param) self._smart_paramadd = input_param.copy() self.device_nummer = int(self._smart_paramadd.get('device_nummer', @@ -33,10 +34,10 @@ def updatepar(self, input_param): self._device_nxdacxxtype = valueint else: log.warning("(" + str(self.device_nummer) + ") " + - __class__.__name__ + " überlesen " + key + + "Snxdacxx überlesen " + key + " " + value) - def getwatt(self, uberschuss, uberschussoffset): + def getwatt(self, uberschuss: int, uberschussoffset: int) -> None: self.prewatt(uberschuss, uberschussoffset) forcesend = self.checkbefsend() argumentList = ['python3', self._prefixpy + 'nxdacxx/watt.py', @@ -60,7 +61,7 @@ def getwatt(self, uberschuss, uberschussoffset): str(self._device_ip), str(e1))) self.postwatt() - def turndevicerelais(self, zustand, ueberschussberechnung, updatecnt): + def turndevicerelais(self, zustand: int, ueberschussberechnung: int, updatecnt: int) -> None: self.preturn(zustand, ueberschussberechnung, updatecnt) if (zustand == 1): pname = "/on.py" @@ -68,7 +69,9 @@ def turndevicerelais(self, zustand, ueberschussberechnung, updatecnt): pname = "/off.py" argumentList = ['python3', self._prefixpy + 'nxdacxx' + pname, str(self.device_nummer), str(self._device_ip), - str(self.devuberschuss)] + str(self.devuberschuss), + str(self._device_dacport), + str(self._device_nxdacxxtype)] try: self.proc = subprocess.Popen(argumentList) self.proc.communicate() diff --git a/web/settings/smarthomeconfig.php b/web/settings/smarthomeconfig.php index 5ecea30177..86c53f1f42 100644 --- a/web/settings/smarthomeconfig.php +++ b/web/settings/smarthomeconfig.php @@ -85,7 +85,7 @@ - + @@ -133,8 +133,8 @@ DAC angesteuert über Lan. Der anliegende Überschuss wird in eine Voltzahl zwischen 0.01V und 10.0V umgewandelt. Bezug wird als 0 Volt übertragen. - Wenn die Einschaltbedingung erreicht ist wird alle 30 Sekunden der gerechnete Überschuss übertragen.
- Der konkrete Dac Typ wird im Type definiert
+ Wenn die Einschaltbedingung erreicht ist, wird alle 30 Sekunden der gerechnete Überschuss übertragen.
+ Der konkrete DAC Typ wird im Type definiert.
Mit dem Parameter Updategerät kann eine abweichende Sekundenzahl angegeben werden.
 @@ -227,15 +227,16 @@
- Maximaler Überschuss in Watt = v10.0. Es wird kein grösserer Wert übertragen. + Maximal verwertbarer Überschuss des hier gewählten Gerät in Watt = v10.0. Es wird kein grösserer Wert übertragen.
- +
Hier ist das installierte Modell auszuwählen. @@ -243,7 +244,7 @@
- +
@@ -722,7 +723,7 @@ Ja
- Diese Option sorgt dafür, dass das Gerät zusätzlich in den Hausverbrauch eingerechnet wird (Startseite, neues logging). + Bei Nein wird dass das Gerät vom Hausverbrauch abgezogen, bei Ja ist es im Hausverbrauch eingerechnet. (Startseite, neues logging).
@@ -926,7 +927,7 @@
- +
From 5abf25ed12e2cfe015d5e415e133866845662fe8 Mon Sep 17 00:00:00 2001 From: Jens Date: Mon, 14 Nov 2022 21:02:01 +0100 Subject: [PATCH 039/201] fefactor module SoC PSA --- modules/soc_psa/psasoc.py | 70 ++++++++++++++++++++++----------------- 1 file changed, 40 insertions(+), 30 deletions(-) diff --git a/modules/soc_psa/psasoc.py b/modules/soc_psa/psasoc.py index 0f096f6271..f271993bfc 100755 --- a/modules/soc_psa/psasoc.py +++ b/modules/soc_psa/psasoc.py @@ -9,6 +9,7 @@ import requests import base64 import logging + #these two lines enable debugging at httplib level (requests->urllib3->http.client) # You will see the REQUEST, including HEADERS and DATA, and RESPONSE with HEADERS but without DATA. # The only thing missing will be the response.body which is not logged. @@ -16,6 +17,7 @@ import http.client as http_client except ImportError: # Python 2 import httplib as http_client + # to enable http trace set swbedug = 1 swdebug = 0 if swdebug == 1: @@ -28,17 +30,17 @@ requests_log.propagate = True chargepoint=str(sys.argv[1]) -userID=str(sys.argv[2]) +user_id=str(sys.argv[2]) password=str(sys.argv[3]) client_id=str(sys.argv[4]) client_secret=str(sys.argv[5]) manufacturer=str(sys.argv[6]) soccalc=str(sys.argv[7]) -# VehicleId is optional -vehicleId = False +# vehicle_vin is optional +vehicle_vin = False if (len(sys.argv) > 8 ): - vehicleId=str(sys.argv[8]) + vehicle_vin=str(sys.argv[8]) named_tuple = time.localtime() # get struct_time time_string = time.strftime("%m/%d/%Y, %H:%M:%S psasoc lp"+chargepoint, named_tuple) @@ -62,88 +64,97 @@ elif (manufacturer == "Vauxhall"): brand = 'vauxhall.co.uk' realm = 'clientsB2CVauxhall' -vin='?' -data = {'realm': realm,'grant_type':'password','password':password,'username': userID,'scope': scope} + +# oAuth2 login +data = {'realm': realm,'grant_type':'password','password':password,'username': user_id,'scope': scope} headers = {'Content-Type':'application/x-www-form-urlencoded','Authorization': 'Basic %s' % encoded_u} reg = 'https://idpcvs.' + brand + '/am/oauth2/access_token' + f = open('/var/www/html/openWB/ramdisk/psareq1lp'+chargepoint, 'w') f.write(str(reg)) f.write(str(data)) f.write(str(headers)) f.close() + response=requests.post(reg, data=data, headers=headers ) responsetext = response.text responestatus = response.status_code + f = open('/var/www/html/openWB/ramdisk/psareply1lp'+chargepoint, 'w') f.write(responsetext.encode("utf-8")) f.write(str(responestatus)) f.close() + psa_config = json.loads(responsetext) acc_token = psa_config['access_token'] + +# get Vehicles payload = {'client_id':client_id} data = urllib.urlencode(payload) data = data.encode('Big5') reg = 'https://api.groupe-psa.com/connectedcar/v4/user/vehicles?' + data headers = {'Accept':'application/hal+json','Authorization': 'Bearer %s' % acc_token,'x-introspect-realm': realm} + f = open('/var/www/html/openWB/ramdisk/psareq2lp'+chargepoint, 'w') f.write(str(reg)) f.write(str(data)) f.write(str(headers)) f.close() + response=requests.get(reg,headers=headers ) -f = open('/var/www/html/openWB/ramdisk/psareply2lp'+chargepoint, 'w') responsetext = response.text responestatus = response.status_code + +f = open('/var/www/html/openWB/ramdisk/psareply2lp'+chargepoint, 'w') f.write(responsetext.encode("utf-8")) f.write(str(responestatus)) f.close() -vin_list = json.loads(responsetext) -# if VIN is not given, first car will be selected: -if not vehicleId: - vin_id = vin_list ['_embedded']['vehicles'][0]['id'] - vin_vin = vin_list ['_embedded']['vehicles'][0]['vin'] +vehicle_response = json.loads(responsetext) +vehicles = vehicle_response['_embedded']['vehicles'] -else: - # search for entry of given VIN - vin_selected = filter(lambda x: x['vin'] == vehicleId, vin_list['_embedded']['vehicles']) - vin_id = vin_selected [0]['id'] - vin_vin = vin_selected [0]['vin'] +# Filter List for given VIN or select first entry +vehicle_selected = next(vehicle for vehicle in vehicles if vehicle['vin'] == vehicle_vin) if vehicle_vin else vehicles[0] +vehicle_id = vehicle_selected['id'] f = open('/var/www/html/openWB/ramdisk/psareply2filterVINlp'+chargepoint, 'w') -f.write('VIN: ' + str(vin_vin)) -f.write(', ID: ' + str(vin_id)) +f.write('VIN: ' + str(vehicle_selected['vin'])) +f.write(', ID: ' + str(vehicle_id)) f.close() +# get Vehicles Status payload = {'client_id':client_id} data = urllib.urlencode(payload) data = data.encode('Big5') '/user/vehicles/{id}/status' -reg = 'https://api.groupe-psa.com/connectedcar/v4/user/vehicles/' + vin_id + '/status?' + data +reg = 'https://api.groupe-psa.com/connectedcar/v4/user/vehicles/' + vehicle_id + '/status?' + data headers = {'Accept':'application/hal+json','Authorization': 'Bearer %s' % acc_token,'x-introspect-realm': realm} + f = open('/var/www/html/openWB/ramdisk/psareq3lp'+chargepoint, 'w') f.write(str(reg)) f.write(str(data)) f.write(str(headers)) f.close() + response=requests.get(reg,headers=headers ) -f = open('/var/www/html/openWB/ramdisk/psareply3lp'+chargepoint, 'w') responsetext = response.text responestatus = response.status_code + +f = open('/var/www/html/openWB/ramdisk/psareply3lp'+chargepoint, 'w') f.write(responsetext.encode("utf-8")) f.write(str(responestatus)) f.close() -batt = json.loads(responsetext) -# filter to only include type=Electric but remove all others. Seen type=Fuel and type=Electric being returned. -batt = filter(lambda x: x['type'] == 'Electric', batt['energy']) -soc = batt[0]['level'] +status_response = json.loads(responsetext) +energies = status_response['energy'] -#soc = batt['energy'][0]['level'] -#print(time_string,'soc lp'+chargepoint,soc) +# Filter to only include type=Electric but remove all others. Seen type=Fuel and type=Electric being returned. +energy_selected = next(energy for energy in energies if energy['type'] == 'Electric') +soc = energy_selected['level'] +fetchedsoctime = energy_selected['updatedAt'] if (int(soccalc) == 0): - #manual calculation not enabled, using existing logic + # manual calculation not enabled, using existing logic if (int(chargepoint) == 1): f = open('/var/www/html/openWB/ramdisk/soc', 'w') if (int(chargepoint) == 2): @@ -151,7 +162,7 @@ f.write(str(soc)) f.close() else: - #manual calculation enabled, using new logic with timestamp + # manual calculation enabled, using new logic with timestamp if (int(chargepoint) == 1): f = open('/var/www/html/openWB/ramdisk/psasoc', 'w') if (int(chargepoint) == 2): @@ -159,7 +170,6 @@ f.write(str(soc)) f.close() # getting timestamp of fetched SoC - fetchedsoctime = batt[0]['updatedAt'] soct = time.strptime(fetchedsoctime, "%Y-%m-%dT%H:%M:%SZ") soctime = time.mktime(soct) # adding one hour to UTC to get CET From a3e8124c8f8cbfe327a217a7e53e1d80e9c72309 Mon Sep 17 00:00:00 2001 From: Jens Date: Mon, 14 Nov 2022 21:03:59 +0100 Subject: [PATCH 040/201] solve wrong indentation type --- runs/updateConfig.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runs/updateConfig.sh b/runs/updateConfig.sh index a7218e2037..89dd5fe6ab 100755 --- a/runs/updateConfig.sh +++ b/runs/updateConfig.sh @@ -1834,7 +1834,7 @@ updateConfig(){ echo "slaveModeSlowRamping=1" >> $ConfigFile fi if ! grep -Fq "slaveModeMinimumAdjustmentInterval=" $ConfigFile; then - echo "slaveModeMinimumAdjustmentInterval=15" >> $ConfigFile + echo "slaveModeMinimumAdjustmentInterval=15" >> $ConfigFile fi if ! grep -Fq "standardSocketInstalled=" /var/www/html/openWB/openwb.conf then From 03d9bfbc3b826e59aa397fd669d2ed9cabdbfeba Mon Sep 17 00:00:00 2001 From: DetMoerk <76627235+DetMoerk@users.noreply.github.com> Date: Tue, 15 Nov 2022 11:38:27 +0100 Subject: [PATCH 041/201] set interval on debug to 2 Minutes API documentation says only one request all 2 minutes. As we had Returncode 400 Errors on systems using Debug Level 1 / 2 this is the Change to be in the specification --- modules/soc_eq/main.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/soc_eq/main.sh b/modules/soc_eq/main.sh index dc46b656e9..a3936f82b1 100755 --- a/modules/soc_eq/main.sh +++ b/modules/soc_eq/main.sh @@ -77,7 +77,7 @@ else tmpintervall=$(( 60 * 6 )) fi if (( socDebug > 0 )); then - tmpintervall=6 + tmpintervall=12 fi if (( soctimer < tmpintervall )); then From 5e9b831b54a76e80e1eac97df46350a21c9083fe Mon Sep 17 00:00:00 2001 From: "cshagen@hagens.ch" Date: Tue, 15 Nov 2022 14:26:02 +0100 Subject: [PATCH 042/201] fix monthly graph --- web/themes/colors/powergraph.js | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/web/themes/colors/powergraph.js b/web/themes/colors/powergraph.js index 445bcda1e1..87a43e1a17 100644 --- a/web/themes/colors/powergraph.js +++ b/web/themes/colors/powergraph.js @@ -262,7 +262,7 @@ class PowerGraph { unsubscribeMonthGraph(); this.initCounter = 0; this.staging.map((segment, i) => { - if (i == 3) { + if ((i == 3) || (i == 6)) { segment.map((line, i) => { if (line.length > 1) { this.rawData.push(line) } }) @@ -289,6 +289,7 @@ class PowerGraph { } } } + updateEnergyValues() { if (this.rawData.length) { const startValues = this.rawData[0].split(','); @@ -317,10 +318,17 @@ class PowerGraph { let pvCharged = this.graphData.reduce((prev, cur) => { return prev + (cur.chargingPv / 12); }, 0) - wbdata.historicSummary.chargingPv.energy = pvCharged / 1000; - wbdata.usageSummary.chargingPv.energy = pvCharged / 1000; + wbdata.historicSummary.charging.energyPv = pvCharged / 1000; + wbdata.usageSummary.charging.energyPv = pvCharged / 1000; + let batCharged = this.graphData.reduce((prev, cur) => { + return prev + (cur.chargingBat / 12); + }, 0) + wbdata.historicSummary.charging.energyBat = batCharged / 1000; + wbdata.usageSummary.charging.energyBat = batCharged / 1000; + } } + extractLiveValues(payload) { const elements = payload.split(","); const now = new Date(Date.now()); @@ -440,6 +448,8 @@ class PowerGraph { if (values.selfUsage < 0) { values.selfUsage = 0; }; if ((values.solarPower + values.gridPull + values.batOut - values.gridPush - values.batIn) > 0) { values.chargingPv = values.charging * values.solarPower / (values.solarPower + values.gridPull + values.batOut - values.gridPush - values.batIn) + values.chargingBat = values.charging * values.batOut / (values.solarPower + values.gridPull + values.batOut - values.gridPush - values.batIn) + } else { values.chargingPv = 0; } From 7723b27cdc36bbf490ec70723d0dea49c3a13fe6 Mon Sep 17 00:00:00 2001 From: "cshagen@hagens.ch" Date: Tue, 15 Nov 2022 17:55:55 +0100 Subject: [PATCH 043/201] show battery portion for charging --- web/themes/colors/powerdata.js | 22 +++++------ web/themes/colors/powergraph.js | 1 + web/themes/colors/yieldmeter.js | 65 +++++++++++++++++++++------------ 3 files changed, 54 insertions(+), 34 deletions(-) diff --git a/web/themes/colors/powerdata.js b/web/themes/colors/powerdata.js index ebab76fe52..032c2b1aaa 100644 --- a/web/themes/colors/powerdata.js +++ b/web/themes/colors/powerdata.js @@ -42,12 +42,12 @@ class WbData { }; this.usageSummary = { - "evuOut": { name: "Export", power: 0, energy: 0, color: "white" }, - "charging": { name: "Laden", power: 0, energy: 0, color: "white" }, - "devices": { name: "Geräte", power: 0, energy: 0, color: "white" }, - "batIn": { name: "> Bat", power: 0, energy: 0, color: "white" }, - "house": { name: "Haus", power: 0, energy: 0, color: "white" }, - "chargingPv": { name: "PVCharge", power: 0, energy: 0, color: "white"} + "evuOut": { name: "Export", power: 0, energy: 0, energyPv: 0, energyBat: 0, color: "white" }, + "charging": { name: "Laden", power: 0, energy: 0, energyPv: 0, energyBat: 0, color: "white" }, + "devices": { name: "Geräte", power: 0, energy: 0, energyPv: 0, energyBat: 0, color: "white" }, + "batIn": { name: "> Bat", power: 0, energy: 0, energyPv: 0, energyBat: 0, color: "white" }, + "house": { name: "Haus", power: 0, energy: 0, energyPv: 0, energyBat: 0, color: "white" }, + "chargingPv": { name: "PVCharge", power: 0, energy: 0, energyPv: 0, energyBat: 0, color: "white"} }; this.historicSummary = { @@ -55,11 +55,11 @@ class WbData { "pv": { name: "PV", power: 0, energy: 0, color: "white" }, "batOut": { name: "Bat >", power: 0, energy: 0, color: "white" }, "evuOut": { name: "Export", power: 0, energy: 0, color: "white" }, - "charging": { name: "Laden", power: 0, energy: 0, color: "white" }, - "batIn": { name: "> Bat", power: 0, energy: 0, color: "white" }, - "house": { name: "Haus", power: 0, energy: 0, color: "white" }, - "devices": { name: "Geräte", power: 0, energy: 0, color: "white" }, - "chargingPv": {name: "PVCharge", power: 0, energy: 0, color: "white"} + "charging": { name: "Laden", power: 0, energy: 0, energyPv: 0, energyBat: 0, color: "white" }, + "batIn": { name: "> Bat", power: 0, energy: 0, energyPv: 0, energyBat: 0, color: "white" }, + "house": { name: "Haus", power: 0, energy: 0, energyPv: 0, energyBat: 0, color: "white" }, + "devices": { name: "Geräte", power: 0, energy: 0, energyPv: 0, energyBat: 0, color: "white" }, + "chargingPv": {name: "PVCharge", power: 0, energy: 0, energyPv: 0, energyBat: 0, color: "white"} }; this.usageDetails = [this.usageSummary.evuOut]; diff --git a/web/themes/colors/powergraph.js b/web/themes/colors/powergraph.js index 87a43e1a17..06702067ff 100644 --- a/web/themes/colors/powergraph.js +++ b/web/themes/colors/powergraph.js @@ -452,6 +452,7 @@ class PowerGraph { } else { values.chargingPv = 0; + values.chargingBat = 0; } return values; } diff --git a/web/themes/colors/yieldmeter.js b/web/themes/colors/yieldmeter.js index 711aea1bf7..993b58345d 100644 --- a/web/themes/colors/yieldmeter.js +++ b/web/themes/colors/yieldmeter.js @@ -35,6 +35,7 @@ class YieldMeter { this.chargeColor = 'var(--color-charging)'; this.axisColor = 'var(--color-axis)'; this.gridColor = 'var(--color-grid)'; + this.batColor = 'var(--color-battery)'; d3.select("button#energyLeftButton") .on("click", shiftLeft) d3.select("button#energyRightButton") @@ -88,9 +89,7 @@ class YieldMeter { } drawChart(svg) { - let pvcdata = this.plotdata.filter(d => (d.name == "PVCharge")) let chargedata = this.plotdata.filter(d => d.name == "Laden") - this.plotdata = this.plotdata.filter(d => (d.name != "PVCharge")) const ymax = d3.max(this.plotdata, (d) => d.energy); this.xScale.domain(this.plotdata.map((d) => d.name)); this.yScale.domain([0, Math.ceil(ymax)]); @@ -111,22 +110,39 @@ class YieldMeter { .attr("fill", (d) => d.color); // Display the PV Charging inner bar - if ((pvcdata.length > 0) && (chargedata.length > 0) && (chargedata[0].energy > 0)) { + if ((chargedata.length > 0) && (chargedata[0].energyPv > 0)) { const pvcBargroup = svg .selectAll(".pvcBar") - .data(pvcdata) + .data(chargedata) .enter() .append("g") pvcBargroup .append("rect") .attr("class", "bar") .attr("x", (d) => this.xScale("Laden") + this.xScale.bandwidth() / 6) - .attr("y", (d) => this.yScale(d.energy)) + .attr("y", (d) => this.yScale(d.energyPv)) .attr("width", this.xScale.bandwidth() * 2 / 3) - .attr("height", (d) => (this.height - this.yScale(d.energy) - this.margin.top - this.margin.bottom)) + .attr("height", (d) => (this.height - this.yScale(d.energyPv) - this.margin.top - this.margin.bottom)) .attr("fill", this.pvColor) .attr("fill-opacity", "66%"); } + // Display the Bat Charging inner bar + if ((chargedata.length > 0) && (chargedata[0].energyBat > 0)) { + const pvcBargroup = svg + .selectAll(".batcBar") + .data(chargedata) + .enter() + .append("g") + pvcBargroup + .append("rect") + .attr("class", "bar") + .attr("x", (d) => this.xScale("Laden") + this.xScale.bandwidth() / 6) + .attr("y", (d) => this.yScale(d.energyBat+d.energyPv)) + .attr("width", this.xScale.bandwidth() * 2 / 3) + .attr("height", (d) => (this.height - this.yScale(d.energyBat) - this.margin.top - this.margin.bottom)) + .attr("fill", this.batColor) + .attr("fill-opacity", "66%"); + } const yAxisGenerator = d3.axisLeft(this.yScale) .tickFormat(function (d) { return ((d > 0) ? d : ""); @@ -173,7 +189,7 @@ class YieldMeter { .append("text") .attr("x", (d) => this.xScale(d.name) + this.xScale.bandwidth() / 2) .attr("y", (d) => { - if (d.name == "Laden" && pvcdata.length > 0) { + if (d.energyPv > 0) { return this.yScale(d.energy) - 25 } else { return this.yScale(d.energy) - 10 @@ -185,22 +201,18 @@ class YieldMeter { .text((d) => (formatWattH(d.energy * 1000))); // add a PV percentage tag to the charging bar - if ((pvcdata.length > 0) && (chargedata.length > 0) && (chargedata[0].energy > 0)) { - let pvRatio = Math.round(pvcdata[0].energy / chargedata[0].energy * 100) - - const pvtags = svg.selectAll(".pvtag") - .data(chargedata) - .enter() - .append("g"); - pvtags - .append("text") - .attr("x", (d) => this.xScale(d.name) + this.xScale.bandwidth() / 2) - .attr("y", (d) => this.yScale(d.energy) - 10) - .attr("font-size", this.labelfontsize - 2) - .attr("text-anchor", "middle") - .attr("fill", (d) => this.pvColor) - .text((d) => ("(PV: " + pvRatio.toLocaleString(undefined) + " %)")); - } + const pvtags = svg.selectAll(".pvtag") + .data(this.plotdata) + .enter() + .append("g"); + pvtags + .append("text") + .attr("x", (d) => this.xScale(d.name) + this.xScale.bandwidth() / 2) + .attr("y", (d) => this.yScale(d.energy) - 10) + .attr("font-size", this.labelfontsize - 2) + .attr("text-anchor", "middle") + .attr("fill", (d) => this.pvColor) + .text((d) => this.pvString(d)); // Add category labels labels @@ -214,6 +226,13 @@ class YieldMeter { } + pvString( item ) { + if (item.energyPv > 0 || item.energyBat > 0) { + return ("(PV: " + (Math.round((item.energyPv + item.energyBat)/ item.energy *100)).toLocaleString(undefined) + " %)"); + } else { + return ""; + } + } updateHeading() { var heading = "Energie "; From edf8c3a1fe0dfd6ec27f2cd6886ffab348401a28 Mon Sep 17 00:00:00 2001 From: "cshagen@hagens.ch" Date: Tue, 15 Nov 2022 18:02:43 +0100 Subject: [PATCH 044/201] battery contribution for charging for monthly graph --- web/themes/colors/powergraph.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/web/themes/colors/powergraph.js b/web/themes/colors/powergraph.js index 06702067ff..97bf380be7 100644 --- a/web/themes/colors/powergraph.js +++ b/web/themes/colors/powergraph.js @@ -472,6 +472,7 @@ class PowerGraph { // charge points values.charging = this.calcMonthlyValue(7, elements, oldElements); values.chargingPv = this.calcMonthlyValue(29, elements, oldElements); + values.chargingBat = this.calcMonthlyValue(30, elements, oldElements); var i; for (i = 0; i < 3; i++) { values["lp" + i] = this.calcMonthlyValue(4 + i, elements, oldElements); @@ -515,6 +516,9 @@ class PowerGraph { this.graphRefreshCounter = 0; wbdata.historicSummary.chargingPv.energy = 0; wbdata.usageSummary.chargingPv.energy = 0; + wbdata.historicSummary.chargingBat.energy = 0; + wbdata.usageSummary.chargingBat.energy = 0; + } resetDayGraph() { From 6d03caca44366b6acadf6cad943db0b68405bb3e Mon Sep 17 00:00:00 2001 From: "cshagen@hagens.ch" Date: Tue, 15 Nov 2022 22:34:24 +0100 Subject: [PATCH 045/201] fix calculations --- web/themes/colors/powergraph.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/web/themes/colors/powergraph.js b/web/themes/colors/powergraph.js index 97bf380be7..0c0c09fe1e 100644 --- a/web/themes/colors/powergraph.js +++ b/web/themes/colors/powergraph.js @@ -274,7 +274,7 @@ class PowerGraph { const values = this.extractMonthValues(line, a[i - 1]); if ((values.date.getFullYear() == wbdata.graphMonth.year) && ((values.date.getMonth() == wbdata.graphMonth.month) - || ((values.date.getMonth() == (wbdata.graphMonth.month + 1)) && (values.date.getDate == 1)) + || ((values.date.getMonth() == (wbdata.graphMonth.month + 1)) && (values.date.getDate() == 1)) ) ) { this.graphData.push(values); } } @@ -447,8 +447,8 @@ class PowerGraph { values.selfUsage = values.solarPower - values.gridPush; if (values.selfUsage < 0) { values.selfUsage = 0; }; if ((values.solarPower + values.gridPull + values.batOut - values.gridPush - values.batIn) > 0) { - values.chargingPv = values.charging * values.solarPower / (values.solarPower + values.gridPull + values.batOut - values.gridPush - values.batIn) - values.chargingBat = values.charging * values.batOut / (values.solarPower + values.gridPull + values.batOut - values.gridPush - values.batIn) + values.chargingPv = Math.floor ((values.charging * values.solarPower / (values.solarPower + values.gridPull + values.batOut))) + values.chargingBat = Math.floor ((values.charging * values.batOut / (values.solarPower + values.gridPull + values.batOut))) } else { values.chargingPv = 0; @@ -509,6 +509,7 @@ class PowerGraph { resetLiveGraph() { // fresh reload of the graph + console.log ("resetlivegraph") this.initialized = false; this.initCounter = 0; this.initialGraphData = []; From c1afa85ae662b14c66fd8e71455ae821ed4e2778 Mon Sep 17 00:00:00 2001 From: Yannik Hampe Date: Wed, 12 Oct 2022 17:13:48 +0200 Subject: [PATCH 046/201] use relative paths in zielladen.sh&loadconfig.sh --- loadconfig.sh | 4 +++- zielladen.sh | 36 +++++++++++++++++++----------------- 2 files changed, 22 insertions(+), 18 deletions(-) diff --git a/loadconfig.sh b/loadconfig.sh index b08e2bddbc..315b73f399 100755 --- a/loadconfig.sh +++ b/loadconfig.sh @@ -1,3 +1,5 @@ +OPENWBBASEDIR=$(cd $(dirname "${BASH_SOURCE[0]}") && pwd) + while read -r x; do value="${x#*=}" if [[ "${value:0:1}" == "'" ]] ; then @@ -7,4 +9,4 @@ while read -r x; do else export "$x" fi -done < /var/www/html/openWB/openwb.conf +done < "$OPENWBBASEDIR/openwb.conf" diff --git a/zielladen.sh b/zielladen.sh index 216647bb09..e95eb0acdd 100755 --- a/zielladen.sh +++ b/zielladen.sh @@ -1,18 +1,20 @@ #!/bin/bash +OPENWBBASEDIR=$(cd $(dirname "${BASH_SOURCE[0]}") && pwd) +RAMDISKDIR="${OPENWBBASEDIR}/ramdisk" ziellademodus(){ #verbleibende Zeit berechnen dateaktuell=$(date '+%Y-%m-%d %H:%M') epochdateaktuell=$(date -d "$dateaktuell" +"%s") - zielladenkorrektura=$( ramdisk/ladungdurchziel - echo 0 > ramdisk/zielladenkorrektura - sed -e "s/zielladenaktivlp1=.*/zielladenaktivlp1=0/" openwb.conf > ramdisk/openwb.conf && mv ramdisk/openwb.conf openwb.conf && chmod 777 openwb.conf - runs/set-current.sh 0 m + echo 0 > "$RAMDISKDIR/ladungdurchziel" + echo 0 > "$RAMDISKDIR/zielladenkorrektura" + sed -i 's/^\(zielladenaktivlp1=\).*/\10/' "$OPENWBBASEDIR/openwb.conf" + "$OPENWBBASEDIR/runs/set-current.sh" 0 m fi else if (( zuladendewh > moeglichewh )); then if (( ladestatus == 0 )); then - runs/set-current.sh "$zielladenalp1" m + "$OPENWBBASEDIR/runs/set-current.sh" "$zielladenalp1" m openwbDebugLog "MAIN" 1 "setzte Soctimer hoch zum Abfragen des aktuellen SoC" - echo 20000 > /var/www/html/openWB/ramdisk/soctimer - echo 1 > ramdisk/ladungdurchziel + echo 20000 > "$RAMDISKDIR/soctimer" + echo 1 > "$RAMDISKDIR/ladungdurchziel" exit 0 else if (( diffwh > 1000 )); then - if test $(find /var/www/html/openWB/ramdisk/zielladenkorrektura -mmin +10); then + if test $(find "$RAMDISKDIR/zielladenkorrektura" -mmin +10); then zielladenkorrektura=$(( zielladenkorrektura + 1 )) - echo $zielladenkorrektura > ramdisk/zielladenkorrektura + echo $zielladenkorrektura > "$RAMDISKDIR/zielladenkorrektura" zielneu=$(( zielladenalp1 + zielladenkorrektura )) if (( zielneu > zielladenmaxalp1)); then zielneu=$zielladenmaxalp1 fi - runs/set-current.sh "$zielneu" m + "$OPENWBBASEDIR/runs/set-current.sh" "$zielneu" m exit 0 fi fi @@ -64,14 +66,14 @@ ziellademodus(){ else if (( ladestatus == 1 )); then if (( diffwh < -1000 )); then - if test $(find /var/www/html/openWB/ramdisk/zielladenkorrektura -mmin +10); then + if test $(find "$RAMDISKDIR/zielladenkorrektura" -mmin +10); then zielladenkorrektura=$(( zielladenkorrektura - 1 )) - echo $zielladenkorrektura > ramdisk/zielladenkorrektura + echo $zielladenkorrektura > "$RAMDISKDIR/zielladenkorrektura" zielneu=$(( zielladenalp1 + zielladenkorrektura )) if (( zielneu < minimalstromstaerke )); then zielneu=$minimalstromstaerke fi - runs/set-current.sh "$zielneu" m + "$OPENWBBASEDIR/runs/set-current.sh" "$zielneu" m exit 0 fi fi From 819ac270b40f9d342e461e1384d74234689e7140 Mon Sep 17 00:00:00 2001 From: Yannik Hampe Date: Wed, 12 Oct 2022 19:08:42 +0200 Subject: [PATCH 047/201] take charging efficiency into account for "zielladen" --- web/settings/settings.php | 15 +++++++++++++++ zielladen.sh | 3 ++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/web/settings/settings.php b/web/settings/settings.php index 538b6ec657..98dfbd5b47 100644 --- a/web/settings/settings.php +++ b/web/settings/settings.php @@ -702,6 +702,21 @@ function visibility_electricitytariff() { Ampere mit denen geladen werden soll um den Ziel SoC zu erreichen. + +
+ +
+ + + Wert in Prozent, der den gemittelten Wirkungsgrad der Ladeelektronik angibt.
+ Durch Verluste in der Ladeelektronik (z. B. Umwandlung Wechselspannung in Gleichspannung) gelangt nicht die komplette Energie, welche durch den Zähler in der Wallbox gemesen wird, im Akku des Fahrzeugs. + Der anzugebende Wert liegt bei gängigen Fahrzeugen im Bereich 90-95%. Eine Ausnahme stellt der Zoe dar, dessen Chameleonlader je nach Modellversion und freigegebener Leistung der Wallbox teilweise nur auf ca. 50% kommt.
+ Liegen die Angaben der Wallbox und des Fahrzeugs nach der Ladung mehrere Prozent auseinander, dann kann mit dieser Einstellung eine Feinabstimmung erfolgen:
+ SoC an der Wallbox zu hoch: Wirkungsgrad um ein paar Prozent reduzieren
+ SoC an der Wallbox zu gering: Wirkungsgrad um ein paar Prozent erhöhen + +
+
diff --git a/zielladen.sh b/zielladen.sh index e95eb0acdd..5b2a7d609a 100755 --- a/zielladen.sh +++ b/zielladen.sh @@ -12,12 +12,13 @@ ziellademodus(){ epochdateziel=$(date -d "$zielladenuhrzeitlp1" +"%s") zeitdiff=$(( epochdateziel - epochdateaktuell )) minzeitdiff=$(( zeitdiff / 60 )) + wirkungsgrad=${wirkungsgradlp1:-100} # zu ladende Menge ermitteln soc=$(<"$RAMDISKDIR/soc") zuladendersoc=$(( zielladensoclp1 - soc )) akkuglp1wh=$(( akkuglp1 * 1000 )) - zuladendewh=$(( akkuglp1wh * zuladendersoc / 100)) + zuladendewh=$(( akkuglp1wh * zuladendersoc / wirkungsgrad )) #ladeleistung ermitteln lademaxwh=$(( zielladenmaxalp1 * zielladenphasenlp1 * 230 )) From 9d18ef8ae267fb361bae9742618ff5a4b66e261f Mon Sep 17 00:00:00 2001 From: Yannik Hampe Date: Wed, 2 Nov 2022 10:24:19 +0100 Subject: [PATCH 048/201] fix indention --- web/settings/settings.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/web/settings/settings.php b/web/settings/settings.php index 98dfbd5b47..28814003f8 100644 --- a/web/settings/settings.php +++ b/web/settings/settings.php @@ -262,7 +262,7 @@ function visibility_isss() { } addressStr = addressStr + ', ' + this.address.postalCode + ' ' + this.address.city; $('#tibberHomesDropdown').append(''); - }); + }); $('#tibberhomeIdModal').find('.modal-header').removeClass('bg-danger'); $('#tibberhomeIdModal').find('.modal-header').addClass('bg-success'); $('#tibberhomeIdModalOkBtn').show(); @@ -287,7 +287,7 @@ function visibility_isss() { $('#tibberModalSelectHomeIdDiv').hide(); $('#tibberhomeid').val(''); $('#tibberhomeIdModal').modal("show"); - }) + }) }); $('#verifyTibberBtn').click(function(){ @@ -344,10 +344,10 @@ function visibility_isss() {
- - -
+ + +
From 20c60640905b773754d615cf4ef2eb9fdff50611 Mon Sep 17 00:00:00 2001 From: "cshagen@hagens.ch" Date: Wed, 16 Nov 2022 09:56:20 +0100 Subject: [PATCH 049/201] fix monthly graph --- web/themes/colors/powergraph.js | 98 ++++++++++++++++++++------------- 1 file changed, 59 insertions(+), 39 deletions(-) diff --git a/web/themes/colors/powergraph.js b/web/themes/colors/powergraph.js index 0c0c09fe1e..446a1863ee 100644 --- a/web/themes/colors/powergraph.js +++ b/web/themes/colors/powergraph.js @@ -247,43 +247,43 @@ class PowerGraph { updateMonth(topic, payload) { if (payload != 'empty') { + const serialNo = topic.substring(29, topic.length); + var segment = payload.toString().split("\n"); if (segment[0] == "") { segment = []; } - const serialNo = topic.substring(29, topic.length); if (serialNo != "") { if (typeof (this.staging[+serialNo - 1]) === 'undefined') { this.staging[+serialNo - 1] = segment; this.initCounter++; } } + if (this.initCounter == 12) {// Initialization complete unsubscribeMonthGraph(); this.initCounter = 0; this.staging.map((segment, i) => { - if ((i == 3) || (i == 6)) { + if ((i == 4) || (i == 5)) { segment.map((line, i) => { if (line.length > 1) { this.rawData.push(line) } }) } + if (i == 2) { + this.monthlyAmounts = segment[0].split(','); + } }) this.rawData.map((line, i, a) => { - if (i > 0) { - if (line != "0" && line != "") { - const values = this.extractMonthValues(line, a[i - 1]); - if ((values.date.getFullYear() == wbdata.graphMonth.year) - && ((values.date.getMonth() == wbdata.graphMonth.month) - || ((values.date.getMonth() == (wbdata.graphMonth.month + 1)) && (values.date.getDate() == 1)) - ) - ) { this.graphData.push(values); } + if (line != "0" && line != "") { + const values = this.extractMonthValues(line, a[i - 1]); + if (values.date.getFullYear() == wbdata.graphMonth.year && values.date.getMonth() == wbdata.graphMonth.month) { + this.graphData.push(values); } - } else { - // const values = this.extractValues(line, []); } }); + this.updateGraph(); - this.updateEnergyValues(); + this.updateMonthlyEnergyValues(); wbdata.monthGraphUpdated(); // setTimeout(() => this.activateDay(), 300000) } @@ -325,10 +325,32 @@ class PowerGraph { }, 0) wbdata.historicSummary.charging.energyBat = batCharged / 1000; wbdata.usageSummary.charging.energyBat = batCharged / 1000; - } } - + updateMonthlyEnergyValues() { + if (this.rawData.length) { + wbdata.historicSummary.pv.energy = +this.monthlyAmounts[3]; + wbdata.historicSummary.evuIn.energy = +this.monthlyAmounts[1]; + wbdata.historicSummary.batOut.energy = +this.monthlyAmounts[9]; + wbdata.historicSummary.evuOut.energy = +this.monthlyAmounts[2];; + wbdata.historicSummary.charging.energy = +this.monthlyAmounts[7]; + var deviceEnergySum = 0; + var deviceEnergy = 0; + let deviceIndex = 32; + for (var i = 0; i < 9; i++) { + deviceEnergy = +this.monthlyAmounts[deviceIndex + 3 * i]; + if (deviceEnergy < 0) { deviceEnergy = 0 } + deviceEnergySum = deviceEnergySum + deviceEnergy + wbdata.historicSummary['sh' + i].energy = deviceEnergy + } + wbdata.historicSummary.devices.energy = deviceEnergySum; + wbdata.historicSummary.batIn.energy = +this.monthlyAmounts[12]; + wbdata.historicSummary.house.energy = wbdata.historicSummary.evuIn.energy + wbdata.historicSummary.pv.energy + wbdata.historicSummary.batOut.energy + - wbdata.historicSummary.evuOut.energy - wbdata.historicSummary.batIn.energy - wbdata.historicSummary.charging.energy - wbdata.historicSummary.devices.energy; + wbdata.historicSummary.charging.energyPv = +this.monthlyAmounts[29]; + wbdata.historicSummary.charging.energyBat = +this.monthlyAmounts[30]; + } + } extractLiveValues(payload) { const elements = payload.split(","); const now = new Date(Date.now()); @@ -447,9 +469,9 @@ class PowerGraph { values.selfUsage = values.solarPower - values.gridPush; if (values.selfUsage < 0) { values.selfUsage = 0; }; if ((values.solarPower + values.gridPull + values.batOut - values.gridPush - values.batIn) > 0) { - values.chargingPv = Math.floor ((values.charging * values.solarPower / (values.solarPower + values.gridPull + values.batOut))) - values.chargingBat = Math.floor ((values.charging * values.batOut / (values.solarPower + values.gridPull + values.batOut))) - + values.chargingPv = Math.floor((values.charging * values.solarPower / (values.solarPower + values.gridPull + values.batOut))) + values.chargingBat = Math.floor((values.charging * values.batOut / (values.solarPower + values.gridPull + values.batOut))) + } else { values.chargingPv = 0; values.chargingBat = 0; @@ -457,41 +479,40 @@ class PowerGraph { return values; } - extractMonthValues(payload, oldPayload) { + extractMonthValues(payload) { if (payload != "0") { const elements = payload.split(","); - const oldElements = oldPayload.split(","); var values = {}; - values.date = new Date(d3.timeParse("%Y%m%d%H%M")(oldElements[0] + '1200')); + values.date = new Date(d3.timeParse("%Y%m%d%H%M")(elements[0] + '1200')); // evu - values.gridPull = this.calcMonthlyValue(1, elements, oldElements); - values.gridPush = this.calcMonthlyValue(2, elements, oldElements); + values.gridPull = this.calcMonthlyValue(1, elements); + values.gridPush = this.calcMonthlyValue(2, elements); // pv - values.solarPower = this.calcMonthlyValue(3, elements, oldElements); + values.solarPower = this.calcMonthlyValue(3, elements); values.inverter = 0; // charge points - values.charging = this.calcMonthlyValue(7, elements, oldElements); - values.chargingPv = this.calcMonthlyValue(29, elements, oldElements); - values.chargingBat = this.calcMonthlyValue(30, elements, oldElements); + values.charging = this.calcMonthlyValue(7, elements); + values.chargingPv = this.calcMonthlyValue(29, elements); + values.chargingBat = this.calcMonthlyValue(30, elements); var i; for (i = 0; i < 3; i++) { - values["lp" + i] = this.calcMonthlyValue(4 + i, elements, oldElements); + values["lp" + i] = this.calcMonthlyValue(4 + i, elements); } for (i = 3; i < 8; i++) { - values["lp" + i] = this.calcMonthlyValue(12 + i - 3, elements, oldElements); + values["lp" + i] = this.calcMonthlyValue(12 + i - 3, elements); } values.soc1 = +elements[21]; values.soc2 = +elements[22]; // smart home for (i = 0; i < 10; i++) { - values["sh" + i] = this.calcMonthlyValue(19 + i, elements, oldElements); + values["sh" + i] = this.calcMonthlyValue(19 + i, elements); } //consumers - values.co0 = this.calcMonthlyValue(10, elements, oldElements); - values.co1 = this.calcMonthlyValue(12, elements, oldElements); + values.co0 = this.calcMonthlyValue(10, elements); + values.co1 = this.calcMonthlyValue(12, elements); //battery - values.batIn = this.calcMonthlyValue(17, elements, oldElements); - values.batOut = this.calcMonthlyValue(18, elements, oldElements); + values.batIn = this.calcMonthlyValue(17, elements); + values.batOut = this.calcMonthlyValue(18, elements); values.batterySoc = +elements[20]; // calculated values values.housePower = values.gridPull + values.solarPower + values.batOut @@ -509,7 +530,7 @@ class PowerGraph { resetLiveGraph() { // fresh reload of the graph - console.log ("resetlivegraph") + console.log("resetlivegraph") this.initialized = false; this.initCounter = 0; this.initialGraphData = []; @@ -519,7 +540,7 @@ class PowerGraph { wbdata.usageSummary.chargingPv.energy = 0; wbdata.historicSummary.chargingBat.energy = 0; wbdata.usageSummary.chargingBat.energy = 0; - + } resetDayGraph() { @@ -545,9 +566,8 @@ class PowerGraph { } return val; } - calcMonthlyValue(i, array, oldArray) { - var val = (array[i] - oldArray[i]); - + calcMonthlyValue(i, array) { + var val = Math.floor(+array[i] * 1000) if (val < 0 || val > 150000) { val = 0; } From 610a6b312ab8c42ee91d2b947859a699515fa768 Mon Sep 17 00:00:00 2001 From: LKuemmel Date: Wed, 16 Nov 2022 14:03:35 +0100 Subject: [PATCH 050/201] changes from core: split modules --- .../{alpha_ess => chargepoints}/__init__.py | 0 .../internal_openwb}/__init__.py | 0 .../internal_openwb/chargepoint_module.py | 0 .../internal_openwb/socket.py | 0 packages/modules/common/simcount/__init__.py | 2 +- packages/modules/common/simcount/_simcount.py | 2 +- .../modules/common/simcount/_simcounter.py | 2 +- .../common/simcount/_simcounter_store.py | 2 +- ...imcounter_state.py => simcounter_state.py} | 0 packages/modules/conftest.py | 3 + packages/modules/{byd => devices}/__init__.py | 0 .../alpha_ess}/__init__.py | 0 .../modules/{ => devices}/alpha_ess/bat.py | 10 +-- .../modules/{ => devices}/alpha_ess/config.py | 0 .../{ => devices}/alpha_ess/counter.py | 6 +- .../modules/{ => devices}/alpha_ess/device.py | 8 +-- .../{ => devices}/alpha_ess/inverter.py | 10 +-- .../batterx}/__init__.py | 0 packages/modules/{ => devices}/batterx/bat.py | 10 +-- .../{ => devices}/batterx/batterx_test.py | 51 +++++++------- .../modules/{ => devices}/batterx/config.py | 0 .../modules/{ => devices}/batterx/counter.py | 10 +-- .../modules/{ => devices}/batterx/device.py | 10 +-- .../modules/{ => devices}/batterx/inverter.py | 10 +-- .../{enphase => devices/byd}/__init__.py | 0 packages/modules/{ => devices}/byd/bat.py | 12 ++-- .../modules/{ => devices}/byd/byd_test.py | 2 +- .../byd/byd_test_sample_home.html | 45 ++++++------ .../byd/byd_test_sample_rundata.html | 2 +- packages/modules/{ => devices}/byd/config.py | 4 +- packages/modules/{ => devices}/byd/device.py | 6 +- .../carlo_gavazzi}/__init__.py | 0 .../{ => devices}/carlo_gavazzi/config.py | 0 .../{ => devices}/carlo_gavazzi/counter.py | 10 +-- .../{ => devices}/carlo_gavazzi/device.py | 4 +- .../discovergy}/__init__.py | 0 .../modules/{ => devices}/discovergy/api.py | 0 .../{ => devices}/discovergy/api_test.py | 2 +- .../{ => devices}/discovergy/config.py | 0 .../{ => devices}/discovergy/counter.py | 4 +- .../{ => devices}/discovergy/device.py | 4 +- .../{ => devices}/discovergy/device_test.py | 4 +- .../{ => devices}/discovergy/inverter.py | 4 +- .../modules/{ => devices}/discovergy/utils.py | 9 +-- packages/modules/{ => devices}/e3dc/bat.py | 2 +- packages/modules/{ => devices}/e3dc/config.py | 0 .../modules/{ => devices}/e3dc/counter.py | 2 +- packages/modules/{ => devices}/e3dc/device.py | 14 ++-- .../modules/{ => devices}/e3dc/inverter.py | 2 +- .../{good_we => devices/enphase}/__init__.py | 0 .../modules/{ => devices}/enphase/config.py | 4 +- .../modules/{ => devices}/enphase/counter.py | 2 +- .../modules/{ => devices}/enphase/device.py | 18 ++--- .../modules/{ => devices}/enphase/inverter.py | 2 +- .../{http => devices/fronius}/__init__.py | 0 packages/modules/{ => devices}/fronius/bat.py | 12 ++-- .../modules/{ => devices}/fronius/bat_test.py | 4 +- .../modules/{ => devices}/fronius/config.py | 0 .../{ => devices}/fronius/counter_s0.py | 10 +-- .../{ => devices}/fronius/counter_s0_test.py | 4 +- .../{ => devices}/fronius/counter_sm.py | 14 ++-- .../{ => devices}/fronius/counter_sm_test.py | 4 +- .../modules/{ => devices}/fronius/device.py | 12 ++-- .../modules/{ => devices}/fronius/inverter.py | 10 +-- .../{ => devices}/fronius/inverter_test.py | 4 +- .../{ => devices}/fronius/meter_test.py | 2 +- .../{huawei => devices/good_we}/__init__.py | 0 packages/modules/{ => devices}/good_we/bat.py | 6 +- .../modules/{ => devices}/good_we/config.py | 4 +- .../modules/{ => devices}/good_we/counter.py | 6 +- .../modules/{ => devices}/good_we/device.py | 9 +-- .../modules/{ => devices}/good_we/inverter.py | 6 +- .../http}/__init__.py | 0 packages/modules/{ => devices}/http/api.py | 0 packages/modules/{ => devices}/http/bat.py | 12 ++-- packages/modules/{ => devices}/http/config.py | 0 .../modules/{ => devices}/http/counter.py | 12 ++-- packages/modules/{ => devices}/http/device.py | 8 +-- .../modules/{ => devices}/http/inverter.py | 12 ++-- .../{janitza => devices/huawei}/__init__.py | 0 packages/modules/{ => devices}/huawei/bat.py | 10 +-- .../modules/{ => devices}/huawei/config.py | 0 .../modules/{ => devices}/huawei/counter.py | 10 +-- .../modules/{ => devices}/huawei/device.py | 8 +-- .../modules/{ => devices}/huawei/inverter.py | 10 +-- .../{json => devices/janitza}/__init__.py | 0 .../modules/{ => devices}/janitza/config.py | 0 .../modules/{ => devices}/janitza/counter.py | 10 +-- .../modules/{ => devices}/janitza/device.py | 4 +- .../{kostal_piko => devices/json}/__init__.py | 0 packages/modules/{ => devices}/json/bat.py | 10 +-- packages/modules/{ => devices}/json/config.py | 0 .../modules/{ => devices}/json/counter.py | 10 +-- packages/modules/{ => devices}/json/device.py | 24 +++---- .../modules/{ => devices}/json/device_test.py | 6 +- .../modules/{ => devices}/json/inverter.py | 10 +-- .../{lg => devices/kostal_piko}/__init__.py | 0 .../{ => devices}/kostal_piko/config.py | 0 .../{ => devices}/kostal_piko/counter.py | 10 +-- .../{ => devices}/kostal_piko/device.py | 18 ++--- .../{ => devices}/kostal_piko/inverter.py | 9 +-- .../modules/devices/lg/JSON-Beispiele.txt | 69 +++++++++++++++++++ .../lg}/__init__.py | 0 packages/modules/{ => devices}/lg/bat.py | 10 +-- packages/modules/{ => devices}/lg/config.py | 0 packages/modules/{ => devices}/lg/counter.py | 10 +-- packages/modules/{ => devices}/lg/device.py | 4 +- packages/modules/{ => devices}/lg/inverter.py | 10 +-- packages/modules/{ => devices}/lg/lg_test.py | 4 +- .../openwb_bat_kit}/__init__.py | 0 .../{ => devices}/openwb_bat_kit/bat.py | 8 +-- .../{ => devices}/openwb_bat_kit/config.py | 0 .../{ => devices}/openwb_bat_kit/device.py | 4 +- .../openwb_evu_kit}/__init__.py | 0 .../{ => devices}/openwb_evu_kit/bat.py | 2 +- .../{ => devices}/openwb_evu_kit/config.py | 0 .../{ => devices}/openwb_evu_kit/counter.py | 6 +- .../{ => devices}/openwb_evu_kit/device.py | 14 ++-- .../{ => devices}/openwb_evu_kit/inverter.py | 2 +- .../openwb_flex}/__init__.py | 0 .../modules/{ => devices}/openwb_flex/bat.py | 12 ++-- .../{ => devices}/openwb_flex/config.py | 6 +- .../{ => devices}/openwb_flex/counter.py | 12 ++-- .../{ => devices}/openwb_flex/device.py | 8 +-- .../{ => devices}/openwb_flex/inverter.py | 12 ++-- .../{ => devices}/openwb_flex/versions.py | 0 .../openwb_pv_kit}/__init__.py | 0 .../{ => devices}/openwb_pv_kit/config.py | 0 .../{ => devices}/openwb_pv_kit/device.py | 4 +- .../{ => devices}/openwb_pv_kit/inverter.py | 8 +-- .../powerdog}/__init__.py | 0 .../modules/{ => devices}/powerdog/config.py | 0 .../modules/{ => devices}/powerdog/counter.py | 10 +-- .../modules/{ => devices}/powerdog/device.py | 6 +- .../{ => devices}/powerdog/inverter.py | 10 +-- .../{siemens => devices/saxpower}/__init__.py | 0 .../modules/{ => devices}/saxpower/bat.py | 10 +-- .../modules/{ => devices}/saxpower/config.py | 0 .../modules/{ => devices}/saxpower/device.py | 4 +- .../siemens}/__init__.py | 0 packages/modules/{ => devices}/siemens/bat.py | 10 +-- .../modules/{ => devices}/siemens/config.py | 0 .../modules/{ => devices}/siemens/counter.py | 10 +-- .../modules/{ => devices}/siemens/device.py | 4 +- .../modules/{ => devices}/siemens/inverter.py | 10 +-- .../siemens_sentron}/__init__.py | 0 .../{ => devices}/siemens_sentron/config.py | 0 .../{ => devices}/siemens_sentron/counter.py | 2 +- .../{ => devices}/siemens_sentron/device.py | 4 +- .../sma_shm}/__init__.py | 0 .../modules/{ => devices}/sma_shm/config.py | 0 .../modules/{ => devices}/sma_shm/counter.py | 4 +- .../{ => devices}/sma_shm/counter_test.py | 2 +- .../modules/{ => devices}/sma_shm/device.py | 10 +-- .../modules/{ => devices}/sma_shm/inverter.py | 4 +- .../sma_shm/speedwire_listener.py | 2 +- .../{ => devices}/sma_shm/speedwiredecoder.py | 0 .../modules/{ => devices}/sma_shm/utils.py | 7 +- .../sma_sunny_boy}/__init__.py | 0 .../{ => devices}/sma_sunny_boy/bat.py | 6 +- .../sma_sunny_boy/bat_smart_energy.py | 10 +-- .../{ => devices}/sma_sunny_boy/config.py | 2 +- .../{ => devices}/sma_sunny_boy/counter.py | 10 +-- .../{ => devices}/sma_sunny_boy/device.py | 14 ++-- .../sma_sunny_boy/inv_version.py | 0 .../{ => devices}/sma_sunny_boy/inverter.py | 4 +- .../sma_sunny_boy/sma_sunny_boy_test.py | 6 +- .../sma_sunny_island}/__init__.py | 0 .../{ => devices}/sma_sunny_island/bat.py | 6 +- .../{ => devices}/sma_sunny_island/config.py | 0 .../{ => devices}/sma_sunny_island/device.py | 4 +- .../sma_webbox}/__init__.py | 0 .../{ => devices}/sma_webbox/config.py | 0 .../{ => devices}/sma_webbox/device.py | 4 +- .../{ => devices}/sma_webbox/inverter.py | 6 +- .../solaredge}/__init__.py | 0 .../modules/{ => devices}/solaredge/bat.py | 12 ++-- .../modules/{ => devices}/solaredge/config.py | 4 +- .../{ => devices}/solaredge/counter.py | 10 +-- .../modules/{ => devices}/solaredge/device.py | 59 +++++----------- .../{ => devices}/solaredge/device_test.py | 10 +-- .../solaredge/external_inverter.py | 12 ++-- .../{ => devices}/solaredge/inverter.py | 10 +-- .../modules/{ => devices}/solaredge/meter.py | 0 .../{ => devices}/solaredge/meter_test.py | 2 +- .../modules/{ => devices}/solaredge/scale.py | 0 .../{solax => devices/solarmax}/__init__.py | 0 .../modules/{ => devices}/solarmax/config.py | 0 .../modules/{ => devices}/solarmax/device.py | 4 +- .../{ => devices}/solarmax/inverter.py | 10 +-- .../solax}/__init__.py | 0 packages/modules/{ => devices}/solax/bat.py | 10 +-- .../modules/{ => devices}/solax/config.py | 0 .../modules/{ => devices}/solax/counter.py | 6 +- .../modules/{ => devices}/solax/device.py | 8 +-- .../modules/{ => devices}/solax/inverter.py | 6 +- .../sonnenbatterie}/__init__.py | 0 .../{ => devices}/sonnenbatterie/bat.py | 10 +-- .../{ => devices}/sonnenbatterie/config.py | 0 .../{ => devices}/sonnenbatterie/counter.py | 12 ++-- .../{ => devices}/sonnenbatterie/device.py | 6 +- .../{ => devices}/sonnenbatterie/inverter.py | 12 ++-- .../{sungrow => devices/studer}/__init__.py | 0 packages/modules/{ => devices}/studer/bat.py | 6 +- .../modules/{ => devices}/studer/config.py | 0 .../modules/{ => devices}/studer/device.py | 6 +- .../modules/{ => devices}/studer/inverter.py | 6 +- .../{sunways => devices/sungrow}/__init__.py | 0 packages/modules/{ => devices}/sungrow/bat.py | 10 +-- .../modules/{ => devices}/sungrow/config.py | 0 .../modules/{ => devices}/sungrow/counter.py | 12 ++-- .../modules/{ => devices}/sungrow/device.py | 12 ++-- .../modules/{ => devices}/sungrow/inverter.py | 10 +-- .../modules/{ => devices}/sungrow/version.py | 0 .../{tesla => devices/sunways}/__init__.py | 0 .../modules/{ => devices}/sunways/config.py | 0 .../modules/{ => devices}/sunways/device.py | 4 +- .../modules/{ => devices}/sunways/inverter.py | 6 +- .../{victron => devices/tesla}/__init__.py | 0 packages/modules/{ => devices}/tesla/bat.py | 8 +-- .../modules/{ => devices}/tesla/config.py | 0 .../modules/{ => devices}/tesla/counter.py | 8 +-- .../modules/{ => devices}/tesla/device.py | 6 +- .../{ => devices}/tesla/http_client.py | 0 .../modules/{ => devices}/tesla/inverter.py | 8 +-- .../modules/{ => devices}/tesla/tesla_test.py | 6 +- packages/modules/devices/victron/__init__.py | 0 packages/modules/{ => devices}/victron/bat.py | 10 +-- .../modules/{ => devices}/victron/config.py | 0 .../modules/{ => devices}/victron/counter.py | 10 +-- .../modules/{ => devices}/victron/device.py | 8 +-- .../modules/{ => devices}/victron/inverter.py | 10 +-- packages/modules/evnotify/EVNotify.py | 39 ----------- packages/modules/lg/JSON-Beispiele.txt | 69 ------------------- packages/modules/vehicles/__init__.py | 0 .../{ => vehicles}/evnotify/EVNotify_test.py | 34 ++------- .../modules/vehicles/evnotify/__init__.py | 0 .../modules/{ => vehicles}/evnotify/api.py | 0 .../{ => vehicles}/evnotify/api_test.py | 2 +- packages/modules/vehicles/evnotify/config.py | 15 ++++ packages/modules/vehicles/evnotify/soc.py | 36 ++++++++++ packages/smarthome/test.py | 2 + runs/isss.py | 4 +- 243 files changed, 743 insertions(+), 787 deletions(-) rename packages/modules/{alpha_ess => chargepoints}/__init__.py (100%) rename packages/modules/{batterx => chargepoints/internal_openwb}/__init__.py (100%) rename packages/modules/{ => chargepoints}/internal_openwb/chargepoint_module.py (100%) rename packages/modules/{ => chargepoints}/internal_openwb/socket.py (100%) rename packages/modules/common/simcount/{_simcounter_state.py => simcounter_state.py} (100%) rename packages/modules/{byd => devices}/__init__.py (100%) rename packages/modules/{carlo_gavazzi => devices/alpha_ess}/__init__.py (100%) rename packages/modules/{ => devices}/alpha_ess/bat.py (84%) rename packages/modules/{ => devices}/alpha_ess/config.py (100%) rename packages/modules/{ => devices}/alpha_ess/counter.py (93%) rename packages/modules/{ => devices}/alpha_ess/device.py (94%) rename packages/modules/{ => devices}/alpha_ess/inverter.py (84%) rename packages/modules/{discovergy => devices/batterx}/__init__.py (100%) rename packages/modules/{ => devices}/batterx/bat.py (76%) rename packages/modules/{ => devices}/batterx/batterx_test.py (60%) rename packages/modules/{ => devices}/batterx/config.py (100%) rename packages/modules/{ => devices}/batterx/counter.py (85%) rename packages/modules/{ => devices}/batterx/device.py (92%) rename packages/modules/{ => devices}/batterx/inverter.py (75%) rename packages/modules/{enphase => devices/byd}/__init__.py (100%) rename packages/modules/{ => devices}/byd/bat.py (84%) rename packages/modules/{ => devices}/byd/byd_test.py (92%) rename packages/modules/{ => devices}/byd/byd_test_sample_home.html (90%) rename packages/modules/{ => devices}/byd/byd_test_sample_rundata.html (99%) rename packages/modules/{ => devices}/byd/config.py (92%) rename packages/modules/{ => devices}/byd/device.py (93%) rename packages/modules/{evnotify => devices/carlo_gavazzi}/__init__.py (100%) rename packages/modules/{ => devices}/carlo_gavazzi/config.py (100%) rename packages/modules/{ => devices}/carlo_gavazzi/counter.py (86%) rename packages/modules/{ => devices}/carlo_gavazzi/device.py (96%) rename packages/modules/{fronius => devices/discovergy}/__init__.py (100%) rename packages/modules/{ => devices}/discovergy/api.py (100%) rename packages/modules/{ => devices}/discovergy/api_test.py (98%) rename packages/modules/{ => devices}/discovergy/config.py (100%) rename packages/modules/{ => devices}/discovergy/counter.py (73%) rename packages/modules/{ => devices}/discovergy/device.py (94%) rename packages/modules/{ => devices}/discovergy/device_test.py (96%) rename packages/modules/{ => devices}/discovergy/inverter.py (83%) rename packages/modules/{ => devices}/discovergy/utils.py (65%) rename packages/modules/{ => devices}/e3dc/bat.py (96%) rename packages/modules/{ => devices}/e3dc/config.py (100%) rename packages/modules/{ => devices}/e3dc/counter.py (97%) rename packages/modules/{ => devices}/e3dc/device.py (92%) rename packages/modules/{ => devices}/e3dc/inverter.py (97%) rename packages/modules/{good_we => devices/enphase}/__init__.py (100%) rename packages/modules/{ => devices}/enphase/config.py (96%) rename packages/modules/{ => devices}/enphase/counter.py (97%) rename packages/modules/{ => devices}/enphase/device.py (84%) rename packages/modules/{ => devices}/enphase/inverter.py (96%) rename packages/modules/{http => devices/fronius}/__init__.py (100%) rename packages/modules/{ => devices}/fronius/bat.py (84%) rename packages/modules/{ => devices}/fronius/bat_test.py (95%) rename packages/modules/{ => devices}/fronius/config.py (100%) rename packages/modules/{ => devices}/fronius/counter_s0.py (80%) rename packages/modules/{ => devices}/fronius/counter_s0_test.py (95%) rename packages/modules/{ => devices}/fronius/counter_sm.py (93%) rename packages/modules/{ => devices}/fronius/counter_sm_test.py (99%) rename packages/modules/{ => devices}/fronius/device.py (93%) rename packages/modules/{ => devices}/fronius/inverter.py (83%) rename packages/modules/{ => devices}/fronius/inverter_test.py (96%) rename packages/modules/{ => devices}/fronius/meter_test.py (94%) rename packages/modules/{huawei => devices/good_we}/__init__.py (100%) rename packages/modules/{ => devices}/good_we/bat.py (91%) rename packages/modules/{ => devices}/good_we/config.py (94%) rename packages/modules/{ => devices}/good_we/counter.py (93%) rename packages/modules/{ => devices}/good_we/device.py (92%) rename packages/modules/{ => devices}/good_we/inverter.py (89%) rename packages/modules/{internal_openwb => devices/http}/__init__.py (100%) rename packages/modules/{ => devices}/http/api.py (100%) rename packages/modules/{ => devices}/http/bat.py (80%) rename packages/modules/{ => devices}/http/config.py (100%) rename packages/modules/{ => devices}/http/counter.py (82%) rename packages/modules/{ => devices}/http/device.py (94%) rename packages/modules/{ => devices}/http/inverter.py (78%) rename packages/modules/{janitza => devices/huawei}/__init__.py (100%) rename packages/modules/{ => devices}/huawei/bat.py (82%) rename packages/modules/{ => devices}/huawei/config.py (100%) rename packages/modules/{ => devices}/huawei/counter.py (82%) rename packages/modules/{ => devices}/huawei/device.py (95%) rename packages/modules/{ => devices}/huawei/inverter.py (80%) rename packages/modules/{json => devices/janitza}/__init__.py (100%) rename packages/modules/{ => devices}/janitza/config.py (100%) rename packages/modules/{ => devices}/janitza/counter.py (85%) rename packages/modules/{ => devices}/janitza/device.py (96%) rename packages/modules/{kostal_piko => devices/json}/__init__.py (100%) rename packages/modules/{ => devices}/json/bat.py (82%) rename packages/modules/{ => devices}/json/config.py (100%) rename packages/modules/{ => devices}/json/counter.py (81%) rename packages/modules/{ => devices}/json/device.py (80%) rename packages/modules/{ => devices}/json/device_test.py (88%) rename packages/modules/{ => devices}/json/inverter.py (79%) rename packages/modules/{lg => devices/kostal_piko}/__init__.py (100%) rename packages/modules/{ => devices}/kostal_piko/config.py (100%) rename packages/modules/{ => devices}/kostal_piko/counter.py (83%) rename packages/modules/{ => devices}/kostal_piko/device.py (89%) rename packages/modules/{ => devices}/kostal_piko/inverter.py (85%) create mode 100644 packages/modules/devices/lg/JSON-Beispiele.txt rename packages/modules/{openwb_bat_kit => devices/lg}/__init__.py (100%) rename packages/modules/{ => devices}/lg/bat.py (81%) rename packages/modules/{ => devices}/lg/config.py (100%) rename packages/modules/{ => devices}/lg/counter.py (77%) rename packages/modules/{ => devices}/lg/device.py (97%) rename packages/modules/{ => devices}/lg/inverter.py (76%) rename packages/modules/{ => devices}/lg/lg_test.py (97%) rename packages/modules/{openwb_evu_kit => devices/openwb_bat_kit}/__init__.py (100%) rename packages/modules/{ => devices}/openwb_bat_kit/bat.py (78%) rename packages/modules/{ => devices}/openwb_bat_kit/config.py (100%) rename packages/modules/{ => devices}/openwb_bat_kit/device.py (96%) rename packages/modules/{openwb_flex => devices/openwb_evu_kit}/__init__.py (100%) rename packages/modules/{ => devices}/openwb_evu_kit/bat.py (72%) rename packages/modules/{ => devices}/openwb_evu_kit/config.py (100%) rename packages/modules/{ => devices}/openwb_evu_kit/counter.py (83%) rename packages/modules/{ => devices}/openwb_evu_kit/device.py (89%) rename packages/modules/{ => devices}/openwb_evu_kit/inverter.py (71%) rename packages/modules/{openwb_pv_kit => devices/openwb_flex}/__init__.py (100%) rename packages/modules/{ => devices}/openwb_flex/bat.py (82%) rename packages/modules/{ => devices}/openwb_flex/config.py (93%) rename packages/modules/{ => devices}/openwb_flex/counter.py (85%) rename packages/modules/{ => devices}/openwb_flex/device.py (93%) rename packages/modules/{ => devices}/openwb_flex/inverter.py (81%) rename packages/modules/{ => devices}/openwb_flex/versions.py (100%) rename packages/modules/{powerdog => devices/openwb_pv_kit}/__init__.py (100%) rename packages/modules/{ => devices}/openwb_pv_kit/config.py (100%) rename packages/modules/{ => devices}/openwb_pv_kit/device.py (96%) rename packages/modules/{ => devices}/openwb_pv_kit/inverter.py (77%) rename packages/modules/{saxpower => devices/powerdog}/__init__.py (100%) rename packages/modules/{ => devices}/powerdog/config.py (100%) rename packages/modules/{ => devices}/powerdog/counter.py (82%) rename packages/modules/{ => devices}/powerdog/device.py (95%) rename packages/modules/{ => devices}/powerdog/inverter.py (80%) rename packages/modules/{siemens => devices/saxpower}/__init__.py (100%) rename packages/modules/{ => devices}/saxpower/bat.py (81%) rename packages/modules/{ => devices}/saxpower/config.py (100%) rename packages/modules/{ => devices}/saxpower/device.py (96%) rename packages/modules/{siemens_sentron => devices/siemens}/__init__.py (100%) rename packages/modules/{ => devices}/siemens/bat.py (81%) rename packages/modules/{ => devices}/siemens/config.py (100%) rename packages/modules/{ => devices}/siemens/counter.py (79%) rename packages/modules/{ => devices}/siemens/device.py (95%) rename packages/modules/{ => devices}/siemens/inverter.py (79%) rename packages/modules/{sma_shm => devices/siemens_sentron}/__init__.py (100%) rename packages/modules/{ => devices}/siemens_sentron/config.py (100%) rename packages/modules/{ => devices}/siemens_sentron/counter.py (96%) rename packages/modules/{ => devices}/siemens_sentron/device.py (95%) rename packages/modules/{sma_sunny_boy => devices/sma_shm}/__init__.py (100%) rename packages/modules/{ => devices}/sma_shm/config.py (100%) rename packages/modules/{ => devices}/sma_shm/counter.py (92%) rename packages/modules/{ => devices}/sma_shm/counter_test.py (97%) rename packages/modules/{ => devices}/sma_shm/device.py (87%) rename packages/modules/{ => devices}/sma_shm/inverter.py (82%) rename packages/modules/{ => devices}/sma_shm/speedwire_listener.py (95%) rename packages/modules/{ => devices}/sma_shm/speedwiredecoder.py (100%) rename packages/modules/{ => devices}/sma_shm/utils.py (83%) rename packages/modules/{sma_sunny_island => devices/sma_sunny_boy}/__init__.py (100%) rename packages/modules/{ => devices}/sma_sunny_boy/bat.py (90%) rename packages/modules/{ => devices}/sma_sunny_boy/bat_smart_energy.py (84%) rename packages/modules/{ => devices}/sma_sunny_boy/config.py (97%) rename packages/modules/{ => devices}/sma_sunny_boy/counter.py (81%) rename packages/modules/{ => devices}/sma_sunny_boy/device.py (93%) rename packages/modules/{ => devices}/sma_sunny_boy/inv_version.py (100%) rename packages/modules/{ => devices}/sma_sunny_boy/inverter.py (95%) rename packages/modules/{ => devices}/sma_sunny_boy/sma_sunny_boy_test.py (91%) rename packages/modules/{sma_webbox => devices/sma_sunny_island}/__init__.py (100%) rename packages/modules/{ => devices}/sma_sunny_island/bat.py (89%) rename packages/modules/{ => devices}/sma_sunny_island/config.py (100%) rename packages/modules/{ => devices}/sma_sunny_island/device.py (95%) rename packages/modules/{solaredge => devices/sma_webbox}/__init__.py (100%) rename packages/modules/{ => devices}/sma_webbox/config.py (100%) rename packages/modules/{ => devices}/sma_webbox/device.py (94%) rename packages/modules/{ => devices}/sma_webbox/inverter.py (88%) rename packages/modules/{solarmax => devices/solaredge}/__init__.py (100%) rename packages/modules/{ => devices}/solaredge/bat.py (84%) rename packages/modules/{ => devices}/solaredge/config.py (93%) rename packages/modules/{ => devices}/solaredge/counter.py (88%) rename packages/modules/{ => devices}/solaredge/device.py (80%) rename packages/modules/{ => devices}/solaredge/device_test.py (86%) rename packages/modules/{ => devices}/solaredge/external_inverter.py (83%) rename packages/modules/{ => devices}/solaredge/inverter.py (88%) rename packages/modules/{ => devices}/solaredge/meter.py (100%) rename packages/modules/{ => devices}/solaredge/meter_test.py (93%) rename packages/modules/{ => devices}/solaredge/scale.py (100%) rename packages/modules/{solax => devices/solarmax}/__init__.py (100%) rename packages/modules/{ => devices}/solarmax/config.py (100%) rename packages/modules/{ => devices}/solarmax/device.py (96%) rename packages/modules/{ => devices}/solarmax/inverter.py (81%) rename packages/modules/{sonnenbatterie => devices/solax}/__init__.py (100%) rename packages/modules/{ => devices}/solax/bat.py (82%) rename packages/modules/{ => devices}/solax/config.py (100%) rename packages/modules/{ => devices}/solax/counter.py (92%) rename packages/modules/{ => devices}/solax/device.py (94%) rename packages/modules/{ => devices}/solax/inverter.py (90%) rename packages/modules/{studer => devices/sonnenbatterie}/__init__.py (100%) rename packages/modules/{ => devices}/sonnenbatterie/bat.py (93%) rename packages/modules/{ => devices}/sonnenbatterie/config.py (100%) rename packages/modules/{ => devices}/sonnenbatterie/counter.py (91%) rename packages/modules/{ => devices}/sonnenbatterie/device.py (93%) rename packages/modules/{ => devices}/sonnenbatterie/inverter.py (91%) rename packages/modules/{sungrow => devices/studer}/__init__.py (100%) rename packages/modules/{ => devices}/studer/bat.py (90%) rename packages/modules/{ => devices}/studer/config.py (100%) rename packages/modules/{ => devices}/studer/device.py (94%) rename packages/modules/{ => devices}/studer/inverter.py (93%) rename packages/modules/{sunways => devices/sungrow}/__init__.py (100%) rename packages/modules/{ => devices}/sungrow/bat.py (83%) rename packages/modules/{ => devices}/sungrow/config.py (100%) rename packages/modules/{ => devices}/sungrow/counter.py (88%) rename packages/modules/{ => devices}/sungrow/device.py (92%) rename packages/modules/{ => devices}/sungrow/inverter.py (82%) rename packages/modules/{ => devices}/sungrow/version.py (100%) rename packages/modules/{tesla => devices/sunways}/__init__.py (100%) rename packages/modules/{ => devices}/sunways/config.py (100%) rename packages/modules/{ => devices}/sunways/device.py (96%) rename packages/modules/{ => devices}/sunways/inverter.py (90%) rename packages/modules/{victron => devices/tesla}/__init__.py (100%) rename packages/modules/{ => devices}/tesla/bat.py (82%) rename packages/modules/{ => devices}/tesla/config.py (100%) rename packages/modules/{ => devices}/tesla/counter.py (89%) rename packages/modules/{ => devices}/tesla/device.py (96%) rename packages/modules/{ => devices}/tesla/http_client.py (100%) rename packages/modules/{ => devices}/tesla/inverter.py (80%) rename packages/modules/{ => devices}/tesla/tesla_test.py (97%) create mode 100644 packages/modules/devices/victron/__init__.py rename packages/modules/{ => devices}/victron/bat.py (82%) rename packages/modules/{ => devices}/victron/config.py (100%) rename packages/modules/{ => devices}/victron/counter.py (87%) rename packages/modules/{ => devices}/victron/device.py (94%) rename packages/modules/{ => devices}/victron/inverter.py (87%) delete mode 100644 packages/modules/evnotify/EVNotify.py delete mode 100644 packages/modules/lg/JSON-Beispiele.txt create mode 100644 packages/modules/vehicles/__init__.py rename packages/modules/{ => vehicles}/evnotify/EVNotify_test.py (55%) create mode 100644 packages/modules/vehicles/evnotify/__init__.py rename packages/modules/{ => vehicles}/evnotify/api.py (100%) rename packages/modules/{ => vehicles}/evnotify/api_test.py (97%) create mode 100644 packages/modules/vehicles/evnotify/config.py create mode 100644 packages/modules/vehicles/evnotify/soc.py create mode 100644 packages/smarthome/test.py diff --git a/packages/modules/alpha_ess/__init__.py b/packages/modules/chargepoints/__init__.py similarity index 100% rename from packages/modules/alpha_ess/__init__.py rename to packages/modules/chargepoints/__init__.py diff --git a/packages/modules/batterx/__init__.py b/packages/modules/chargepoints/internal_openwb/__init__.py similarity index 100% rename from packages/modules/batterx/__init__.py rename to packages/modules/chargepoints/internal_openwb/__init__.py diff --git a/packages/modules/internal_openwb/chargepoint_module.py b/packages/modules/chargepoints/internal_openwb/chargepoint_module.py similarity index 100% rename from packages/modules/internal_openwb/chargepoint_module.py rename to packages/modules/chargepoints/internal_openwb/chargepoint_module.py diff --git a/packages/modules/internal_openwb/socket.py b/packages/modules/chargepoints/internal_openwb/socket.py similarity index 100% rename from packages/modules/internal_openwb/socket.py rename to packages/modules/chargepoints/internal_openwb/socket.py diff --git a/packages/modules/common/simcount/__init__.py b/packages/modules/common/simcount/__init__.py index 49c2dda8f8..add2e1ac5d 100644 --- a/packages/modules/common/simcount/__init__.py +++ b/packages/modules/common/simcount/__init__.py @@ -1,3 +1,3 @@ from modules.common.simcount._simcount import sim_count from modules.common.simcount._simcounter import SimCounter -from modules.common.simcount._simcounter_state import SimCounterState +from modules.common.simcount.simcounter_state import SimCounterState diff --git a/packages/modules/common/simcount/_simcount.py b/packages/modules/common/simcount/_simcount.py index 6331abeff2..6ff825e626 100644 --- a/packages/modules/common/simcount/_simcount.py +++ b/packages/modules/common/simcount/_simcount.py @@ -6,7 +6,7 @@ from modules.common.fault_state import exceptions_to_fault_state from modules.common.simcount._calculate import calculate_import_export -from modules.common.simcount._simcounter_state import SimCounterState +from modules.common.simcount.simcounter_state import SimCounterState from modules.common.simcount._simcounter_store import get_sim_counter_store log = logging.getLogger(__name__) diff --git a/packages/modules/common/simcount/_simcounter.py b/packages/modules/common/simcount/_simcounter.py index c0a2b69767..0e65dec191 100644 --- a/packages/modules/common/simcount/_simcounter.py +++ b/packages/modules/common/simcount/_simcounter.py @@ -1,7 +1,7 @@ from typing import Tuple, Optional from modules.common.simcount._simcount import sim_count -from modules.common.simcount._simcounter_state import SimCounterState +from modules.common.simcount.simcounter_state import SimCounterState class SimCounter: diff --git a/packages/modules/common/simcount/_simcounter_store.py b/packages/modules/common/simcount/_simcounter_store.py index 182a666ce7..03563c35d8 100644 --- a/packages/modules/common/simcount/_simcounter_store.py +++ b/packages/modules/common/simcount/_simcounter_store.py @@ -7,7 +7,7 @@ from paho.mqtt.client import Client as MqttClient, MQTTMessage from helpermodules import pub, compatibility -from modules.common.simcount._simcounter_state import SimCounterState +from modules.common.simcount.simcounter_state import SimCounterState from modules.common.store import ramdisk_write, ramdisk_read_float from modules.common.store.ramdisk.io import RamdiskReadError diff --git a/packages/modules/common/simcount/_simcounter_state.py b/packages/modules/common/simcount/simcounter_state.py similarity index 100% rename from packages/modules/common/simcount/_simcounter_state.py rename to packages/modules/common/simcount/simcounter_state.py diff --git a/packages/modules/conftest.py b/packages/modules/conftest.py index 865b93fc4b..2322a08961 100644 --- a/packages/modules/conftest.py +++ b/packages/modules/conftest.py @@ -6,6 +6,9 @@ from modules.common import simcount sys.modules['pymodbus'] = type(sys)('pymodbus') +sys.modules['aiohttp'] = type(sys)('aiohttp') +sys.modules['lxml'] = type(sys)('lxml') +sys.modules['lxml.html'] = type(sys)('lxml.html') module = type(sys)('pymodbus.client.sync') module.ModbusSerialClient = Mock() diff --git a/packages/modules/byd/__init__.py b/packages/modules/devices/__init__.py similarity index 100% rename from packages/modules/byd/__init__.py rename to packages/modules/devices/__init__.py diff --git a/packages/modules/carlo_gavazzi/__init__.py b/packages/modules/devices/alpha_ess/__init__.py similarity index 100% rename from packages/modules/carlo_gavazzi/__init__.py rename to packages/modules/devices/alpha_ess/__init__.py diff --git a/packages/modules/alpha_ess/bat.py b/packages/modules/devices/alpha_ess/bat.py similarity index 84% rename from packages/modules/alpha_ess/bat.py rename to packages/modules/devices/alpha_ess/bat.py index ce22942a8c..3f15ffdac2 100644 --- a/packages/modules/alpha_ess/bat.py +++ b/packages/modules/devices/alpha_ess/bat.py @@ -4,7 +4,7 @@ from typing import Dict, Union from dataclass_utils import dataclass_from_dict -from modules.alpha_ess.config import AlphaEssBatSetup, AlphaEssConfiguration +from modules.devices.alpha_ess.config import AlphaEssBatSetup, AlphaEssConfiguration from modules.common import modbus from modules.common.component_state import BatState from modules.common.component_type import ComponentDescriptor @@ -24,8 +24,8 @@ def __init__(self, device_id: int, self.__device_id = device_id self.component_config = dataclass_from_dict(AlphaEssBatSetup, component_config) self.__tcp_client = tcp_client - self.__sim_counter = SimCounter(self.__device_id, self.component_config.id, prefix="speicher") - self.__store = get_bat_value_store(self.component_config.id) + self.sim_counter = SimCounter(self.__device_id, self.component_config.id, prefix="speicher") + self.store = get_bat_value_store(self.component_config.id) self.component_info = ComponentInfo.from_component_config(self.component_config) def update(self, unit_id: int) -> None: @@ -45,14 +45,14 @@ def update(self, unit_id: int) -> None: soc_reg = self.__tcp_client.read_holding_registers(0x0102, ModbusDataType.INT_16, unit=unit_id) soc = int(soc_reg * 0.1) - imported, exported = self.__sim_counter.sim_count(power) + imported, exported = self.sim_counter.sim_count(power) bat_state = BatState( power=power, soc=soc, imported=imported, exported=exported ) - self.__store.set(bat_state) + self.store.set(bat_state) component_descriptor = ComponentDescriptor(configuration_factory=AlphaEssBatSetup) diff --git a/packages/modules/alpha_ess/config.py b/packages/modules/devices/alpha_ess/config.py similarity index 100% rename from packages/modules/alpha_ess/config.py rename to packages/modules/devices/alpha_ess/config.py diff --git a/packages/modules/alpha_ess/counter.py b/packages/modules/devices/alpha_ess/counter.py similarity index 93% rename from packages/modules/alpha_ess/counter.py rename to packages/modules/devices/alpha_ess/counter.py index 6801741d6d..8779197d52 100644 --- a/packages/modules/alpha_ess/counter.py +++ b/packages/modules/devices/alpha_ess/counter.py @@ -3,7 +3,7 @@ from typing import Callable, Dict, Union from dataclass_utils import dataclass_from_dict -from modules.alpha_ess.config import AlphaEssConfiguration, AlphaEssCounterSetup +from modules.devices.alpha_ess.config import AlphaEssConfiguration, AlphaEssCounterSetup from modules.common import modbus from modules.common.component_state import CounterState from modules.common.component_type import ComponentDescriptor @@ -20,7 +20,7 @@ def __init__(self, device_config: AlphaEssConfiguration) -> None: self.component_config = dataclass_from_dict(AlphaEssCounterSetup, component_config) self.__tcp_client = tcp_client - self.__store = get_counter_value_store(self.component_config.id) + self.store = get_counter_value_store(self.component_config.id) self.component_info = ComponentInfo.from_component_config(self.component_config) self.__device_config = device_config @@ -28,7 +28,7 @@ def update(self, unit_id: int): time.sleep(0.1) factory_method = self.__get_values_factory() counter_state = factory_method(unit_id) - self.__store.set(counter_state) + self.store.set(counter_state) def __get_values_factory(self,) -> Callable[[int], CounterState]: if self.__device_config.source == 0 and self.__device_config.version == 0: diff --git a/packages/modules/alpha_ess/device.py b/packages/modules/devices/alpha_ess/device.py similarity index 94% rename from packages/modules/alpha_ess/device.py rename to packages/modules/devices/alpha_ess/device.py index 8a2c89346a..1b9a878ec0 100644 --- a/packages/modules/alpha_ess/device.py +++ b/packages/modules/devices/alpha_ess/device.py @@ -2,15 +2,15 @@ import logging from typing import Dict, Union, Optional, List -from modules.alpha_ess.config import AlphaEss, AlphaEssBatSetup, AlphaEssCounterSetup, AlphaEssInverterSetup +from modules.devices.alpha_ess.config import AlphaEss, AlphaEssBatSetup, AlphaEssCounterSetup, AlphaEssInverterSetup from dataclass_utils import dataclass_from_dict from helpermodules.cli import run_using_positional_cli_args from modules.common import modbus from modules.common.abstract_device import AbstractDevice, DeviceDescriptor from modules.common.component_context import SingleComponentUpdateContext -from modules.alpha_ess import bat -from modules.alpha_ess import counter -from modules.alpha_ess import inverter +from modules.devices.alpha_ess import bat +from modules.devices.alpha_ess import counter +from modules.devices.alpha_ess import inverter log = logging.getLogger(__name__) diff --git a/packages/modules/alpha_ess/inverter.py b/packages/modules/devices/alpha_ess/inverter.py similarity index 84% rename from packages/modules/alpha_ess/inverter.py rename to packages/modules/devices/alpha_ess/inverter.py index 910f9b2037..0e55290347 100644 --- a/packages/modules/alpha_ess/inverter.py +++ b/packages/modules/devices/alpha_ess/inverter.py @@ -2,7 +2,7 @@ from typing import Dict, Union from dataclass_utils import dataclass_from_dict -from modules.alpha_ess.config import AlphaEssConfiguration, AlphaEssInverterSetup +from modules.devices.alpha_ess.config import AlphaEssConfiguration, AlphaEssInverterSetup from modules.common import modbus from modules.common.component_state import InverterState from modules.common.component_type import ComponentDescriptor @@ -20,8 +20,8 @@ def __init__(self, device_id: int, self.__device_id = device_id self.component_config = dataclass_from_dict(AlphaEssInverterSetup, component_config) self.__tcp_client = tcp_client - self.__sim_counter = SimCounter(self.__device_id, self.component_config.id, prefix="pv") - self.__store = get_inverter_value_store(self.component_config.id) + self.sim_counter = SimCounter(self.__device_id, self.component_config.id, prefix="pv") + self.store = get_inverter_value_store(self.component_config.id) self.component_info = ComponentInfo.from_component_config(self.component_config) self.__device_config = device_config @@ -29,12 +29,12 @@ def update(self, unit_id: int) -> None: reg_p = self.__version_factory() power = self.__get_power(unit_id, reg_p) - _, exported = self.__sim_counter.sim_count(power) + _, exported = self.sim_counter.sim_count(power) inverter_state = InverterState( power=power, exported=exported ) - self.__store.set(inverter_state) + self.store.set(inverter_state) def __version_factory(self) -> int: if self.__device_config.source == 0 and self.__device_config.version == 0: diff --git a/packages/modules/discovergy/__init__.py b/packages/modules/devices/batterx/__init__.py similarity index 100% rename from packages/modules/discovergy/__init__.py rename to packages/modules/devices/batterx/__init__.py diff --git a/packages/modules/batterx/bat.py b/packages/modules/devices/batterx/bat.py similarity index 76% rename from packages/modules/batterx/bat.py rename to packages/modules/devices/batterx/bat.py index 6d85c691f4..a2c02974cb 100644 --- a/packages/modules/batterx/bat.py +++ b/packages/modules/devices/batterx/bat.py @@ -2,7 +2,7 @@ from typing import Dict, Union from dataclass_utils import dataclass_from_dict -from modules.batterx.config import BatterXBatSetup +from modules.devices.batterx.config import BatterXBatSetup from modules.common.component_state import BatState from modules.common.component_type import ComponentDescriptor from modules.common.fault_state import ComponentInfo @@ -14,21 +14,21 @@ class BatterXBat: def __init__(self, device_id: int, component_config: Union[Dict, BatterXBatSetup]) -> None: self.__device_id = device_id self.component_config = dataclass_from_dict(BatterXBatSetup, component_config) - self.__sim_counter = SimCounter(self.__device_id, self.component_config.id, prefix="speicher") - self.__store = get_bat_value_store(self.component_config.id) + self.sim_counter = SimCounter(self.__device_id, self.component_config.id, prefix="speicher") + self.store = get_bat_value_store(self.component_config.id) self.component_info = ComponentInfo.from_component_config(self.component_config) def update(self, resp: Dict) -> None: power = resp["1121"]["1"] soc = resp["1074"]["1"] - imported, exported = self.__sim_counter.sim_count(power) + imported, exported = self.sim_counter.sim_count(power) bat_state = BatState( power=power, soc=soc, imported=imported, exported=exported ) - self.__store.set(bat_state) + self.store.set(bat_state) component_descriptor = ComponentDescriptor(configuration_factory=BatterXBatSetup) diff --git a/packages/modules/batterx/batterx_test.py b/packages/modules/devices/batterx/batterx_test.py similarity index 60% rename from packages/modules/batterx/batterx_test.py rename to packages/modules/devices/batterx/batterx_test.py index 58078b2934..026c258b73 100644 --- a/packages/modules/batterx/batterx_test.py +++ b/packages/modules/devices/batterx/batterx_test.py @@ -1,42 +1,37 @@ from unittest.mock import Mock -import pytest import requests_mock from modules.common.component_state import BatState, CounterState, InverterState -from modules.batterx import bat, counter, device, inverter +from modules.devices.batterx import bat, counter, device, inverter +from modules.devices.batterx.config import (BatterX, BatterXBatSetup, BatterXConfiguration, BatterXCounterSetup, + BatterXInverterSetup) -class TestBatterXDevice: - @pytest.fixture(autouse=True) - def setup(self, monkeypatch, requests_mock: requests_mock.mock): - self.mock_bat_value_store = Mock() - self.mock_counter_value_store = Mock() - self.mock_inverter_value_store = Mock() - self.mock_simcount = Mock() - monkeypatch.setattr(bat, 'get_bat_value_store', Mock(return_value=self.mock_bat_value_store)) - monkeypatch.setattr(counter, 'get_counter_value_store', Mock(return_value=self.mock_counter_value_store)) - monkeypatch.setattr(inverter, 'get_inverter_value_store', Mock(return_value=self.mock_inverter_value_store)) - requests_mock.get("http://1.1.1.1/api.php?get=currentstate", json=SAMPLE) +def test_batterx(monkeypatch, requests_mock: requests_mock.mock): + # setup + mock_bat_value_store = Mock() + mock_counter_value_store = Mock() + mock_inverter_value_store = Mock() + monkeypatch.setattr(bat, 'get_bat_value_store', Mock(return_value=mock_bat_value_store)) + monkeypatch.setattr(counter, 'get_counter_value_store', Mock(return_value=mock_counter_value_store)) + monkeypatch.setattr(inverter, 'get_inverter_value_store', Mock(return_value=mock_inverter_value_store)) + requests_mock.get("http://1.1.1.1/api.php?get=currentstate", json=SAMPLE) - def test_read(self): - # setup - device_config = device.BatterX() - device_config.configuration.ip_address = "1.1.1.1" - dev = device.Device(device_config) - dev = device._add_component(dev, "inverter", 1) - dev = device._add_component(dev, "counter", None) - dev = device._add_component(dev, "bat", None) + dev = device.Device(BatterX(configuration=BatterXConfiguration(ip_address="1.1.1.1"))) + dev.add_component(BatterXBatSetup(id=2)) + dev.add_component(BatterXCounterSetup(id=0)) + dev.add_component(BatterXInverterSetup(id=1)) - # execution - dev.update() + # execution + dev.update() - # evaluation - assert self.mock_counter_value_store.set.call_count == 1 - assert vars(self.mock_bat_value_store.set.call_args[0][0]) == vars(SAMPLE_BAT_STATE) - assert vars(self.mock_counter_value_store.set.call_args[0][0]) == vars(SAMPLE_COUNTER_STATE) - assert vars(self.mock_inverter_value_store.set.call_args[0][0]) == vars(SAMPLE_INVERTER_STATE) + # evaluation + assert mock_counter_value_store.set.call_count == 1 + assert vars(mock_bat_value_store.set.call_args[0][0]) == vars(SAMPLE_BAT_STATE) + assert vars(mock_counter_value_store.set.call_args[0][0]) == vars(SAMPLE_COUNTER_STATE) + assert vars(mock_inverter_value_store.set.call_args[0][0]) == vars(SAMPLE_INVERTER_STATE) SAMPLE_BAT_STATE = BatState( diff --git a/packages/modules/batterx/config.py b/packages/modules/devices/batterx/config.py similarity index 100% rename from packages/modules/batterx/config.py rename to packages/modules/devices/batterx/config.py diff --git a/packages/modules/batterx/counter.py b/packages/modules/devices/batterx/counter.py similarity index 85% rename from packages/modules/batterx/counter.py rename to packages/modules/devices/batterx/counter.py index aa9e0d1adc..e9a5c6de8e 100644 --- a/packages/modules/batterx/counter.py +++ b/packages/modules/devices/batterx/counter.py @@ -3,7 +3,7 @@ from typing import Dict, List, Union from dataclass_utils import dataclass_from_dict -from modules.batterx.config import BatterXCounterSetup +from modules.devices.batterx.config import BatterXCounterSetup from modules.common.component_state import CounterState from modules.common.component_type import ComponentDescriptor from modules.common.fault_state import ComponentInfo @@ -17,8 +17,8 @@ class BatterXCounter: def __init__(self, device_id: int, component_config: Union[Dict, BatterXCounterSetup]) -> None: self.__device_id = device_id self.component_config = dataclass_from_dict(BatterXCounterSetup, component_config) - self.__sim_counter = SimCounter(self.__device_id, self.component_config.id, prefix="bezug") - self.__store = get_counter_value_store(self.component_config.id) + self.sim_counter = SimCounter(self.__device_id, self.component_config.id, prefix="bezug") + self.store = get_counter_value_store(self.component_config.id) self.component_info = ComponentInfo.from_component_config(self.component_config) def update(self, resp: Dict) -> None: @@ -33,7 +33,7 @@ def update(self, resp: Dict) -> None: log.debug( "Powerfaktor sollte laut Doku enthalten sein, ID 2881 kann aber nicht ermittelt werden.") power_factors = None - imported, exported = self.__sim_counter.sim_count(power) + imported, exported = self.sim_counter.sim_count(power) counter_state = CounterState( imported=imported, @@ -46,7 +46,7 @@ def update(self, resp: Dict) -> None: ) if power_factors: counter_state.power_factors = power_factors - self.__store.set(counter_state) + self.store.set(counter_state) def __parse_list_values(self, resp_json: Dict, id: int, factor: int = 1) -> List[float]: diff --git a/packages/modules/batterx/device.py b/packages/modules/devices/batterx/device.py similarity index 92% rename from packages/modules/batterx/device.py rename to packages/modules/devices/batterx/device.py index 99665c15f3..178daa7d05 100644 --- a/packages/modules/batterx/device.py +++ b/packages/modules/devices/batterx/device.py @@ -6,10 +6,10 @@ from helpermodules.cli import run_using_positional_cli_args from modules.common.abstract_device import AbstractDevice, DeviceDescriptor from modules.common.component_context import MultiComponentUpdateContext -from modules.batterx import bat -from modules.batterx import counter -from modules.batterx import inverter -from modules.batterx.config import BatterX, BatterXBatSetup, BatterXCounterSetup, BatterXInverterSetup +from modules.devices.batterx import bat +from modules.devices.batterx import counter +from modules.devices.batterx import inverter +from modules.devices.batterx.config import BatterX, BatterXBatSetup, BatterXCounterSetup, BatterXInverterSetup from modules.common import req log = logging.getLogger(__name__) @@ -44,7 +44,7 @@ def add_component(self, component_config: Union[Dict, component_config = dataclass_from_dict(COMPONENT_TYPE_TO_MODULE[ component_type].component_descriptor.configuration_factory, component_config) if component_type in self.COMPONENT_TYPE_TO_CLASS: - self.components["component"+str(component_config.type)] = (self.COMPONENT_TYPE_TO_CLASS[component_type]( + self.components["component"+str(component_config.id)] = (self.COMPONENT_TYPE_TO_CLASS[component_type]( self.device_config.id, component_config)) else: raise Exception( diff --git a/packages/modules/batterx/inverter.py b/packages/modules/devices/batterx/inverter.py similarity index 75% rename from packages/modules/batterx/inverter.py rename to packages/modules/devices/batterx/inverter.py index 1ce4793929..d889900741 100644 --- a/packages/modules/batterx/inverter.py +++ b/packages/modules/devices/batterx/inverter.py @@ -2,7 +2,7 @@ from typing import Dict, Union from dataclass_utils import dataclass_from_dict -from modules.batterx.config import BatterXInverterSetup +from modules.devices.batterx.config import BatterXInverterSetup from modules.common.component_state import InverterState from modules.common.component_type import ComponentDescriptor from modules.common.fault_state import ComponentInfo @@ -14,20 +14,20 @@ class BatterXInverter: def __init__(self, device_id: int, component_config: Union[Dict, BatterXInverterSetup]) -> None: self.__device_id = device_id self.component_config = dataclass_from_dict(BatterXInverterSetup, component_config) - self.__sim_counter = SimCounter(self.__device_id, self.component_config.id, prefix="pv") - self.__store = get_inverter_value_store(self.component_config.id) + self.sim_counter = SimCounter(self.__device_id, self.component_config.id, prefix="pv") + self.store = get_inverter_value_store(self.component_config.id) self.component_info = ComponentInfo.from_component_config(self.component_config) def update(self, resp: Dict) -> None: power = resp["1634"]["0"] * -1 - _, exported = self.__sim_counter.sim_count(power) + _, exported = self.sim_counter.sim_count(power) inverter_state = InverterState( power=power, exported=exported ) - self.__store.set(inverter_state) + self.store.set(inverter_state) component_descriptor = ComponentDescriptor(configuration_factory=BatterXInverterSetup) diff --git a/packages/modules/enphase/__init__.py b/packages/modules/devices/byd/__init__.py similarity index 100% rename from packages/modules/enphase/__init__.py rename to packages/modules/devices/byd/__init__.py diff --git a/packages/modules/byd/bat.py b/packages/modules/devices/byd/bat.py similarity index 84% rename from packages/modules/byd/bat.py rename to packages/modules/devices/byd/bat.py index 58a6740b05..5baa1b3360 100644 --- a/packages/modules/byd/bat.py +++ b/packages/modules/devices/byd/bat.py @@ -4,7 +4,7 @@ from typing import Dict, List, Union, Tuple from dataclass_utils import dataclass_from_dict -from modules.byd.config import BYDBatSetup +from modules.devices.byd.config import BYDBatSetup from modules.common import req from modules.common.component_state import BatState from modules.common.component_type import ComponentDescriptor @@ -21,21 +21,21 @@ def __init__(self, device_config) -> None: self.__device_config = device_config self.component_config = dataclass_from_dict(BYDBatSetup, component_config) - self.__sim_counter = SimCounter(self.__device_config.id, self.component_config.id, prefix="speicher") - self.__store = get_bat_value_store(self.component_config.id) + self.sim_counter = SimCounter(self.__device_config.id, self.component_config.id, prefix="speicher") + self.store = get_bat_value_store(self.component_config.id) self.component_info = ComponentInfo.from_component_config(self.component_config) def update(self) -> None: power, soc = self.get_values() - imported, exported = self.__sim_counter.sim_count(power) + imported, exported = self.sim_counter.sim_count(power) bat_state = BatState( power=power, soc=soc, imported=imported, exported=exported ) - self.__store.set(bat_state) + self.store.set(bat_state) def get_values(self) -> Tuple[float, float]: '''BYD Speicher bieten zwei HTML-Seiten, auf denen Informationen abgegriffen werden können: @@ -44,7 +44,7 @@ def get_values(self) -> Tuple[float, float]: ''' resp = req.get_http_session().get( 'http://' + self.__device_config.configuration.ip_address + '/asp/Home.asp', - auth=(self.__device_config.configuration.username, self.__device_config.configuration.password)) + auth=(self.__device_config.configuration.user, self.__device_config.configuration.password)) return BydParser.parse(resp.text) diff --git a/packages/modules/byd/byd_test.py b/packages/modules/devices/byd/byd_test.py similarity index 92% rename from packages/modules/byd/byd_test.py rename to packages/modules/devices/byd/byd_test.py index dd1596dd23..a4205559c5 100644 --- a/packages/modules/byd/byd_test.py +++ b/packages/modules/devices/byd/byd_test.py @@ -1,6 +1,6 @@ from pathlib import Path -from modules.byd import bat +from modules.devices.byd import bat def test_byd_rundata(): diff --git a/packages/modules/byd/byd_test_sample_home.html b/packages/modules/devices/byd/byd_test_sample_home.html similarity index 90% rename from packages/modules/byd/byd_test_sample_home.html rename to packages/modules/devices/byd/byd_test_sample_home.html index e11050607c..b7afdd9923 100644 --- a/packages/modules/byd/byd_test_sample_home.html +++ b/packages/modules/devices/byd/byd_test_sample_home.html @@ -1,5 +1,4 @@ - - + Home @@ -12,22 +11,22 @@ window.setInterval(loadXMLDoc, 1000); - function loadXMLDoc() - { - var xmlhttp; + function loadXMLDoc() + { + var xmlhttp; var d1 = []; var str = new Array(); - if (window.XMLHttpRequest) - {// code for IE7+, Firefox, Chrome, Opera, Safari - xmlhttp=new XMLHttpRequest(); - } - else - {// code for IE6, IE5 - xmlhttp=new ActiveXObject("Microsoft.XMLHTTP"); - } - xmlhttp.onreadystatechange=function() - { - if (xmlhttp.readyState==4 && xmlhttp.status==200) + if (window.XMLHttpRequest) + {// code for IE7+, Firefox, Chrome, Opera, Safari + xmlhttp=new XMLHttpRequest(); + } + else + {// code for IE6, IE5 + xmlhttp=new ActiveXObject("Microsoft.XMLHTTP"); + } + xmlhttp.onreadystatechange=function() + { + if (xmlhttp.readyState==4 && xmlhttp.status==200) { strs = xmlhttp.responseText.split(","); for (i=0; i @@ -1191,6 +1191,11 @@

Manuelle SoC-Eingabe - Ladepunkt +
+ openWB - die modulare Wallbox +
+ @@ -1235,6 +1235,11 @@

Achtung

+
+
+ openWB - die modulare Wallbox +
+
@@ -1188,6 +1188,11 @@

Manuelle SoC-Eingabe - Ladepunkt +
+ openWB - die modulare Wallbox +
+ + +
+ + + + + + +
+ + PIKO 8.3 +
+ WittlerPV (15) + + + 		Logo
+ + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ AC-Leistung  + Energie
+ aktuell + xxx  W + Gesamtenergie + 42906  kWh 
+   +    + Tagesenergie + 0  kWh 
+ Status + Aus 
+ + + +
+
+ PV-Generator  + Ausgangsleistung  
+ String 1   + L1   
+ Spannung + xxx  V + Spannung + xxx  V 
  + Strom + xxx  A + Leistung + xxx  W 
+ String 2   + L2   
+ Spannung + xxx  V + Spannung + xxx  V 
  + Strom + xxx  A + Leistung + xxx  W 
+    + L3   
+ +   + + Spannung + xxx  V 
  + +   + + Leistung + xxx  W 
+ + + +
+
+ + + + + + +
+ RS485 Kommunikation
+ Wechselrichter  + + +
+ + +
+ + + + + + +
+ + Historie +     + Infoseite +     + +     + + + + Einstellungen
+
+ + From 17c9c37160eaa706df94a73ef640254416a25086 Mon Sep 17 00:00:00 2001 From: okaegi Date: Mon, 19 Dec 2022 10:41:13 +0100 Subject: [PATCH 121/201] =?UTF-8?q?Leistungsmessung=20=C3=BCber=20Lovato?= =?UTF-8?q?=20Z=C3=A4hler=20f=C3=BCr=20Smarthome?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Neu wird der Lovato Zähler als separate Leistungsmessung unterstützt. Ebenso wurde auf static Types umgestellt. sdm120, sdm630 und Lovato Zähler werden aus openWB 2.0 Verzeichnis genommen Neu werden diese Zähler für Smarthome aus dem Openwb 2.0 Verzeischniss aufgerufen. Die separaten verzeichnisse unter Smarthome wurden gelöscht. Anpassung wegen static Types --- modules/smarthome/sdm120/sdm120.py | 33 ------- modules/smarthome/sdm630/sdm630.py | 33 ------- runs/mqttsub.py | 2 +- runs/usmarthome/smartbase.py | 80 ++++++++-------- runs/usmarthome/smartmeas.py | 147 ++++++++++++++++------------- web/settings/smarthomeconfig.php | 9 +- 6 files changed, 132 insertions(+), 172 deletions(-) delete mode 100644 modules/smarthome/sdm120/sdm120.py delete mode 100644 modules/smarthome/sdm630/sdm630.py diff --git a/modules/smarthome/sdm120/sdm120.py b/modules/smarthome/sdm120/sdm120.py deleted file mode 100644 index 2f5ac4fa50..0000000000 --- a/modules/smarthome/sdm120/sdm120.py +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/python3 -import sys -import os -import time -import getopt -import socket -import struct -import binascii -import json -devicenumber = str(sys.argv[1]) -seradd = str(sys.argv[2]) -sdmid = int(sys.argv[3]) -port = int(sys.argv[4]) - -from pymodbus.client.sync import ModbusTcpClient - -client = ModbusTcpClient(seradd, port=port) - -#KWH Total Import -resp = client.read_input_registers(0x0048,2, unit=sdmid) -vwh = struct.unpack('>f',struct.pack('>HH',*resp.registers)) -vwh2 = float("%.3f" % vwh[0]) * int(1000) -vwh3 = str(vwh2) - -#Aktueller Verbrauch -resp = client.read_input_registers(0x000C,2, unit=sdmid) -watti = struct.unpack('>f',struct.pack('>HH',*resp.registers)) -watt = int(watti[0]) - -answer = '{"power":' + str(watt) + ',"powerc":' + str(vwh3) + '} ' -f1 = open('/var/www/html/openWB/ramdisk/smarthome_device_ret' + str(devicenumber), 'w') -json.dump(answer,f1) -f1.close() diff --git a/modules/smarthome/sdm630/sdm630.py b/modules/smarthome/sdm630/sdm630.py deleted file mode 100644 index c0a5709586..0000000000 --- a/modules/smarthome/sdm630/sdm630.py +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/python3 -import sys -import os -import time -import getopt -import socket -import struct -import binascii -import json -devicenumber = str(sys.argv[1]) -seradd = str(sys.argv[2]) -sdmid = int(sys.argv[3]) -port = int(sys.argv[4]) - -from pymodbus.client.sync import ModbusTcpClient - -client = ModbusTcpClient(seradd, port=port) - -#KWH Total Import -resp = client.read_input_registers(0x0156,2, unit=sdmid) -vwh = struct.unpack('>f',struct.pack('>HH',*resp.registers)) -vwh2 = float("%.3f" % vwh[0]) * int(1000) -vwh3 = str(vwh2) - -#Aktueller Verbrauch -resp = client.read_input_registers(0x0034,2, unit=sdmid) -watti = struct.unpack('>f',struct.pack('>HH',*resp.registers)) -watt = int(watti[0]) - -answer = '{"power":' + str(watt) + ',"powerc":' + str(vwh3) + '} ' -f1 = open('/var/www/html/openWB/ramdisk/smarthome_device_ret' + str(devicenumber), 'w') -json.dump(answer,f1) -f1.close() diff --git a/runs/mqttsub.py b/runs/mqttsub.py index 7d9de345d5..fd223f8305 100755 --- a/runs/mqttsub.py +++ b/runs/mqttsub.py @@ -197,7 +197,7 @@ def on_message(client, userdata, msg): client.publish("openWB/config/get/SmartHome/Devices/"+str(devicenumb)+"/device_type", msg.payload.decode("utf-8"), qos=0, retain=True) if (( "openWB/config/set/SmartHome/Device" in msg.topic) and ("device_measureType" in msg.topic)): devicenumb=re.sub(r'\D', '', msg.topic) - validDeviceMeasureTypes = ['shelly','tasmota','http','mystrom','sdm630','we514','fronius','json','avm','mqtt','sdm120','smaem'] # 'pyt' is deprecated and will be removed! + validDeviceMeasureTypes = ['shelly','tasmota','http','mystrom','sdm630','lovato','we514','fronius','json','avm','mqtt','sdm120','smaem'] # 'pyt' is deprecated and will be removed! if ( 1 <= int(devicenumb) <= numberOfSupportedDevices and len(str(msg.payload.decode("utf-8"))) > 2): try: deviceMeasureTypeIndex = validDeviceMeasureTypes.index(msg.payload.decode("utf-8")) diff --git a/runs/usmarthome/smartbase.py b/runs/usmarthome/smartbase.py index 2a4709b783..bd9293d707 100644 --- a/runs/usmarthome/smartbase.py +++ b/runs/usmarthome/smartbase.py @@ -1,9 +1,10 @@ #!/usr/bin/python3 import time import os +from typing import Dict, Tuple, Any from usmarthome.global0 import log from usmarthome.smartbase0 import Sbase0 -from usmarthome.smartmeas import Slsdm630, Slsdm120, Slwe514, Slfronius +from usmarthome.smartmeas import Slsdm630, Sllovato, Slsdm120, Slwe514, Slfronius from usmarthome.smartmeas import Sljson, Slsmaem, Slshelly, Sltasmota, Slmqtt from usmarthome.smartmeas import Slhttp, Slavm, Slmystrom from usmarthome.smartbut import Sbshelly @@ -22,12 +23,12 @@ class Sbase(Sbase0): nureinschaltinsec = 0 eindevstatus = 0 - def __init__(self): + def __init__(self) -> None: # setting super().__init__() print('__init__ Sbase executed') - self.mqtt_param = {} - self.mqtt_param_del = {} + self.mqtt_param = {} # type: Dict[str, str] + self.mqtt_param_del = {} # type: Dict[str, str] self.device_name = 'none' self.devstatus = 10 # (10 = ueberschuss gesteuert oder manual, @@ -53,7 +54,7 @@ def __init__(self): self.newdevice_manual = 0 self.newdevice_manual_control = 0 self.device_type = 'none' - self._smart_param = {} + self._smart_param = {} # type: Dict[str, str] self._uberschussoffset = 0 self._uberschuss = 0 self.device_canswitch = 0 @@ -75,9 +76,9 @@ def __init__(self): self._device_ip = 'none' self._device_measuretype = 'none' self._device_measureip = 'none' - self._device_measureportsdm = '8899' - self._device_dacport = '8899' - self._device_measureid = '0' + self._device_measureportsdm = 8899 + self._device_dacport = 8899 + self._device_measureid = 0 self._device_finishtime = '00:00' self._device_starttime = '00:00' self._device_endtime = '00:00' @@ -89,8 +90,8 @@ def __init__(self): self._device_pbtype = 'none' self._device_lambdaueb = 'UP' self._old_pbtype = 'none' - self._mydevicepb = 'none' - self._oldrelais = '2' + self._mydevicepb = 'none' # type: Any + self._oldrelais = 2 self._oldwatt = 0 self._device_chan = 0 self._device_updatesec = 0 @@ -123,12 +124,13 @@ def __init__(self): self.device_setauto = 0 self.gruppe = 'none' self.btchange = 0 + self._mydevicemeasure = 'none' # type: Any - def __del__(self): + def __del__(self) -> None: print('__del__ Sbase executed ') - def prewatt(self, uberschuss, uberschussoffset): + def prewatt(self, uberschuss: int, uberschussoffset: int) -> None: self._uberschuss = uberschuss self._uberschussoffset = uberschussoffset if (self._deviceconfiguredold == "9") and (self._deviceconfigured == @@ -154,7 +156,7 @@ def prewatt(self, uberschuss, uberschussoffset): # prepare end self.getueb() - def postwatt(self): + def postwatt(self) -> None: (self.newwatt, self.newwattk) = self.sepwatt(self.newwatt, self.newwattk) # bei reiner Leistungsmessung relais nur nach Watt setzten @@ -168,7 +170,7 @@ def postwatt(self): self.relais = 0 self.mqtt_param = {} pref = 'openWB/SmartHome/Devices/' + str(self.device_nummer) + '/' - self.mqtt_param[pref + 'RelayStatus'] = self.relais + self.mqtt_param[pref + 'RelayStatus'] = str(self.relais) if (self.c_mantime_f == 'Y') and (self.device_manual != 1): # nach Ausschalten manueller Modus mindestens 30 Sek + # max( ausschaltverzögerung,mindeseinschaltdauer @@ -226,7 +228,7 @@ def postwatt(self): else: self.c_oldstampeinschaltdauer = 0 self.c_oldstampeinschaltdauer_f = 'N' - self.mqtt_param[pref + 'RunningTimeToday'] = self.runningtime + self.mqtt_param[pref + 'RunningTimeToday'] = str(self.runningtime) # Einschaltzeit des Relais setzen if (self._oldrelais == 0): if (self.relais == 1): @@ -242,9 +244,9 @@ def postwatt(self): self.mqtt_param[pref + 'TemperatureSensor1'] = self.temp1 if (self.device_temperatur_configured > 2): self.mqtt_param[pref + 'TemperatureSensor2'] = self.temp2 - self.mqtt_param[pref + 'Watt'] = self._oldwatt - self.mqtt_param[pref + 'Wh'] = self._wh - self.mqtt_param[pref + 'WHImported_temp'] = self._wpos + self.mqtt_param[pref + 'Watt'] = str(self._oldwatt) + self.mqtt_param[pref + 'Wh'] = str(self._wh) + self.mqtt_param[pref + 'WHImported_temp'] = str(self._wpos) self.mqtt_param[pref + 'oncountnor'] = self.oncountnor self.mqtt_param[pref + 'OnCntStandby'] = self.oncntstandby # nur bei Status 10 on status mitnehmen @@ -252,7 +254,7 @@ def postwatt(self): sendstatus = self.relais + self.devstatus else: sendstatus = self.devstatus - self.mqtt_param[pref + 'Status'] = sendstatus + self.mqtt_param[pref + 'Status'] = str(sendstatus) if (self.gruppe == 'A'): Sbase.ausschaltwatt = Sbase.ausschaltwatt + self._oldwatt elif (self.gruppe == 'E'): @@ -260,7 +262,7 @@ def postwatt(self): Sbase.einrelais = 1 Sbase.eindevstatus = max(Sbase.eindevstatus, self.devstatus) - def updatepar(self, input_param): + def updatepar(self, input_param: Dict[str, str]) -> None: self._smart_param = input_param.copy() self.device_nummer = int(self._smart_param.get('device_nummer', '0')) for key, value in self._smart_param.items(): @@ -327,11 +329,11 @@ def updatepar(self, input_param): elif (key == 'device_measureip'): self._device_measureip = value elif (key == 'device_measurePortSdm'): - self._device_measureportsdm = value + self._device_measureportsdm = valueint elif (key == 'device_dacport'): - self._device_dacport = value + self._device_dacport = valueint elif (key == 'device_measureid'): - self._device_measureid = value + self._device_measureid = valueint elif (key == 'device_finishTime'): self._device_finishtime = value elif (key == 'device_startTime'): @@ -390,7 +392,7 @@ def updatepar(self, input_param): " " + value) else: log.info("(" + str(self.device_nummer) + ") " - + __class__.__name__ + " überlesen " + key + + + "Sbase überlesen " + key + " " + value) self._first_run = 0 pref = 'openWB/SmartHome/Devices/' + str(self.device_nummer) + '/' @@ -451,6 +453,8 @@ def updatepar(self, input_param): del self._mydevicemeasure if (self._device_measuretype == 'sdm630'): self._mydevicemeasure = Slsdm630() + elif (self._device_measuretype == 'lovato'): + self._mydevicemeasure = Sllovato() elif (self._device_measuretype == 'sdm120'): self._mydevicemeasure = Slsdm120() elif (self._device_measuretype == 'we514'): @@ -494,14 +498,14 @@ def updatepar(self, input_param): str(self.device_nummer), 'w') as f: f.write(str(self.device_homeconsumtion)) - def getueb(self): + def getueb(self) -> None: # (1 = mit Speicher, 2 = mit offset , 0 = manual eingeschaltet) if (self.ueberschussberechnung == 2): self.devuberschuss = self._uberschussoffset else: self.devuberschuss = self._uberschuss - def preturn(self, zustand, ueberschussberechnung, updatecnt): + def preturn(self, zustand: int, ueberschussberechnung: int, updatecnt: int) -> None: self.ueberschussberechnung = ueberschussberechnung with open(self._basePath+'/ramdisk/device' + str(self.device_nummer) + '_req_relais', 'w') as f: @@ -519,7 +523,7 @@ def preturn(self, zustand, ueberschussberechnung, updatecnt): self._c_eintime_f = 'Y' self._c_eintime = int(time.time()) - def sepwatt(self, newwatt, newwattk): + def sepwatt(self, newwatt: int, newwattk: int) -> Tuple[int, int]: if (self._device_differentmeasurement == 0): return newwatt, newwattk # ueberschuss übertragen @@ -529,7 +533,7 @@ def sepwatt(self, newwatt, newwattk): self.newwattk = self._mydevicemeasure.newwattk return self.newwatt, self.newwattk - def conditions(self, speichersoc): + def conditions(self, speichersoc: int) -> None: # do not do anything in case none type or can switch = no # or device manuam mode if ((self.device_canswitch == 0) or @@ -550,8 +554,8 @@ def conditions(self, speichersoc): work_ausschaltschwelle = self._device_ausschaltschwelle work_ausschaltverzoegerung = self._device_ausschaltverzoegerung local_time = datetime.now(timezone.utc).astimezone() - localhour = int(local_time.strftime(format="%H")) - localminute = int(local_time.strftime(format="%M")) + localhour = int(local_time.strftime("%H")) + localminute = int(local_time.strftime("%M")) localinsec = int((localhour * 60 * 60) + (localminute * 60)) if (localinsec < Sbase.nureinschaltinsec) and (Sbase.eindevices > 0): log.info("(" + str(self.device_nummer) + ") " + @@ -966,8 +970,8 @@ def conditions(self, speichersoc): self._c_ausverz_f = 'N' # rechne Zeit exclusive einschaltgruppe local_time = datetime.now(timezone.utc).astimezone() - localh = int(local_time.strftime(format="%H")) - localminute = int(local_time.strftime(format="%M")) + localh = int(local_time.strftime("%H")) + localminute = int(local_time.strftime("%M")) localinsec = int((localh * 60 * 60) + (localminute * 60)) Sbase.nureinschaltinsec = localinsec + Sbase.einverz return @@ -1132,7 +1136,7 @@ def conditions(self, speichersoc): self._c_einverz_f = 'N' self._c_ausverz_f = 'N' - def simcount(self, watt2, pref, importfn, exportfn, nummer, wattks): + def simcount(self, watt2: int, pref: str, importfn: str, exportfn: str, nummer: str, wattks: int) -> None: # Zaehler mitgeliefert in WH , zurueckrechnen fuer simcount if wattks > 0: wattposkh = wattks @@ -1191,8 +1195,8 @@ def simcount(self, watt2, pref, importfn, exportfn, nummer, wattks): wattnegh = wattnegh + watt1 else: wattposh = wattposh + watt1 - wattposkh = wattposh/3600 - wattnegkh = (wattnegh*-1)/3600 + wattposkh = int(wattposh/3600) + wattnegkh = int((wattnegh*-1)/3600) with open(self._basePath+'/ramdisk/'+pref+'watt0pos', 'w') as f: f.write(str(wattposh)) self._wpos = wattposh @@ -1210,17 +1214,17 @@ def simcount(self, watt2, pref, importfn, exportfn, nummer, wattks): with open(self._basePath+'/ramdisk/'+pref+'wh0', 'w') as f: f.write(str(watt2)) - def getwatt(self, uberschuss, uberschussoffset): + def getwatt(self, uberschuss: int, uberschussoffset: int) -> None: self.prewatt(uberschuss, uberschussoffset) self.newwatt = 0 self.newwattk = 0 self.relais = 0 self.postwatt() - def turndevicerelais(self, zustand, ueberschussberechnung, updatecnt): + def turndevicerelais(self, zustand: int, ueberschussberechnung: int, updatecnt: int) -> None: pass - def updatebutton(self): + def updatebutton(self) -> None: self.newdevice_manual = self.device_manual self.newdevice_manual_control = self.device_manual_control self.btchange = 0 diff --git a/runs/usmarthome/smartmeas.py b/runs/usmarthome/smartmeas.py index a2304cab5b..f58a366ffd 100644 --- a/runs/usmarthome/smartmeas.py +++ b/runs/usmarthome/smartmeas.py @@ -1,10 +1,15 @@ from usmarthome.smartbase0 import Sbase0 from usmarthome.global0 import log +from typing import Dict, Tuple +from modules.common import modbus +from modules.common import sdm +from modules.common import lovato + import subprocess class Slbase(Sbase0): - def __init__(self): + def __init__(self) -> None: # # setting super().__init__() @@ -19,14 +24,14 @@ def __init__(self): self.newwatt = 0 self.newwattk = 0 self.relais = 0 - self._smart_param = {} + self._smart_param = {} # type: Dict[str, str] self._device_differentmeasureoment = 0 self._device_configured = '0' self._device_ip = 'none' self._device_measuretype = 'none' self._device_measureip = 'none' - self._device_measureportsdm = '8899' - self._device_measureid = '0' + self._device_measureportsdm = 8899 + self._device_measureid = 0 self._device_measuresmaser = '123' self._device_measuresmaage = 15 self._device_leistungurl = 'none' @@ -45,7 +50,7 @@ def __init__(self): self._device_measchan = 0 self._device_chan = 0 - def updatepar(self, input_param): + def updatepar(self, input_param: Dict[str, str]) -> None: self._smart_param = input_param.copy() self.device_nummer = int(self._smart_param.get('device_nummer', '0')) for key, value in self._smart_param.items(): @@ -88,7 +93,7 @@ def updatepar(self, input_param): elif (key == 'device_measureip'): self._device_measureip = value elif (key == 'device_measurePortSdm'): - self._device_measureportsdm = value + self._device_measureportsdm = valueint elif (key == 'device_measuresmaage'): self._device_measuresmaage = valueint elif (key == 'device_measchan'): @@ -98,7 +103,7 @@ def updatepar(self, input_param): elif (key == 'device_measuresmaser'): self._device_measuresmaser = value elif (key == 'device_measureid'): - self._device_measureid = value + self._device_measureid = valueint elif (key == 'device_leistungurl'): self._device_leistungurl = value elif (key == 'device_measureurl'): @@ -127,27 +132,27 @@ def updatepar(self, input_param): self._device_stateurl = value else: log.info("(" + str(self.device_nummer) + ") " - + __class__.__name__ + " überlesen " + key + + + "Slbase überlesen " + key + " " + value) - def __del__(self): + def __del__(self) -> None: print('__del__ Slbase executed ') class Slmqtt(Slbase): - def __init__(self): + def __init__(self) -> None: # setting super().__init__() print('__init__ Slmqtt excuted') - def getwattread(self): + def getwattread(self) -> None: self._watt(self._device_ip) - def sepwattread(self): + def sepwattread(self) -> Tuple[int, int]: self._watt(self._device_measureip) return self.newwatt, self.newwattk - def _watt(self, ip): + def _watt(self, ip: str) -> None: argumentList = ['python3', self._prefixpy + 'mqtt/watt.py', str(self.device_nummer), str(ip), str(self.devuberschuss)] @@ -164,19 +169,19 @@ def _watt(self, ip): class Slshelly(Slbase): - def __init__(self): + def __init__(self) -> None: # setting super().__init__() print('__init__ Slshelly excuted') - def getwattread(self): + def getwattread(self) -> None: self._watt(self._device_ip, self._device_chan) - def sepwattread(self): + def sepwattread(self) -> Tuple[int, int]: self._watt(self._device_measureip, self._device_measchan) return self.newwatt, self.newwattk - def _watt(self, ip, chan): + def _watt(self, ip: str, chan: int) -> None: argumentList = ['python3', self._prefixpy + 'shelly/watt.py', str(self.device_nummer), str(ip), '0', str(chan)] @@ -214,24 +219,24 @@ def _watt(self, ip, chan): class Slavm(Slbase): - def __init__(self): + def __init__(self) -> None: # setting super().__init__() print('__init__ Slavm excuted') - def getwattread(self): + def getwattread(self) -> None: self._watt(self._device_ip, self._device_actor, self._device_username, self._device_password) - def sepwattread(self): + def sepwattread(self) -> Tuple[int, int]: self._watt(self._device_measureip, self._device_measureavmactor, self._device_measureavmusername, self._device_measureavmpassword) return self.newwatt, self.newwattk - def _watt(self, ip, act, user, pw): + def _watt(self, ip: str, act: str, user: str, pw: str) -> None: argumentList = ['python3', self._prefixpy + 'avmhomeautomation/watt.py', str(self.device_nummer), str(ip), @@ -250,19 +255,19 @@ def _watt(self, ip, act, user, pw): class Sltasmota(Slbase): - def __init__(self): + def __init__(self) -> None: # setting super().__init__() print('__init__ Sltasmota excuted') - def getwattread(self): + def getwattread(self) -> None: self._watt(self._device_ip) - def sepwattread(self): + def sepwattread(self) -> Tuple[int, int]: self._watt(self._device_measureip) return self.newwatt, self.newwattk - def _watt(self, ip): + def _watt(self, ip: str) -> None: argumentList = ['python3', self._prefixpy + 'tasmota/watt.py', str(self.device_nummer), str(ip), '0'] try: @@ -278,21 +283,21 @@ def _watt(self, ip): class Slhttp(Slbase): - def __init__(self): + def __init__(self) -> None: # setting super().__init__() print('__init__ Slhttp excuted') - def getwattread(self): + def getwattread(self) -> None: self._watt(self._device_leistungurl, 'none', self._device_stateurl) - def sepwattread(self): + def sepwattread(self) -> Tuple[int, int]: self._watt(self._device_measureurl, self._device_measureurlc, 'none') return self.newwatt, self.newwattk - def _watt(self, url, urlc, urls): + def _watt(self, url: str, urlc: str, urls: str) -> None: argumentList = ['python3', self._prefixpy + 'http/watt.py', str(self.device_nummer), '0', str(self.devuberschuss), url, urlc, @@ -312,19 +317,19 @@ def _watt(self, url, urlc, urls): class Slmystrom(Slbase): - def __init__(self): + def __init__(self) -> None: # setting super().__init__() print('__init__ Slmystrom excuted') - def getwattread(self): + def getwattread(self) -> None: self._watt(self._device_ip) - def sepwattread(self): + def sepwattread(self) -> Tuple[int, int]: self._watt(self._device_measureip) return self.newwatt, self.newwattk - def _watt(self, ip): + def _watt(self, ip: str) -> None: argumentList = ['python3', self._prefixpy + 'mystrom/watt.py', str(self.device_nummer), str(ip), '0'] try: @@ -347,12 +352,12 @@ def _watt(self, ip): class Slsmaem(Slbase): - def __init__(self): + def __init__(self) -> None: # setting super().__init__() print('__init__ Slsmaem excuted') - def sepwattread(self): + def sepwattread(self) -> Tuple[int, int]: argumentList = ['python3', self._prefixpy + 'smaem/watt.py', str(self.device_nummer), str(self._device_measureip), str(self._device_measuresmaser), @@ -371,12 +376,12 @@ def sepwattread(self): class Slwe514(Slbase): - def __init__(self): + def __init__(self) -> None: # setting super().__init__() print('__init__ Slwe514 excuted') - def sepwattread(self): + def sepwattread(self) -> Tuple[int, int]: argumentList = ['python3', self._prefixpy + 'we514/watt.py', str(self.device_nummer), str(self._device_measureip), str(self._device_measureid)] @@ -394,12 +399,12 @@ def sepwattread(self): class Sljson(Slbase): - def __init__(self): + def __init__(self) -> None: # setting super().__init__() print('__init__ Sljson excuted') - def sepwattread(self): + def sepwattread(self) -> Tuple[int, int]: argumentList = ['python3', self._prefixpy + 'json/watt.py', str(self.device_nummer), self._device_measurejsonurl, @@ -418,12 +423,12 @@ def sepwattread(self): class Slfronius(Slbase): - def __init__(self): + def __init__(self) -> None: # setting super().__init__() print('__init__ Slfronius excuted') - def sepwattread(self): + def sepwattread(self) -> Tuple[int, int]: argumentList = ['python3', self._prefixpy + 'fronius/watt.py', str(self.device_nummer), str(self._device_measureip), str(self._device_measureid)] @@ -440,23 +445,42 @@ def sepwattread(self): return self.newwatt, self.newwattk +class Sllovato(Slbase): + def __init__(self) -> None: + # setting + super().__init__() + print('__init__ Sllovato excuted') + + def sepwattread(self) -> Tuple[int, int]: + try: + # neu aus openwb 2.0 + with modbus.ModbusTcpClient_(self._device_measureip, self._device_measureportsdm) as tcp_client: + lov = lovato.Lovato(self._device_measureid, tcp_client) + _, newwatt = lov.get_power() + self.newwatt = int(newwatt) + self.newwattk = 0 + except Exception as e1: + log.warning("Leistungsmessung %s %d %s Fehlermeldung: %s " + % ('Lovato ', self.device_nummer, + str(self._device_measureip), str(e1))) + return self.newwatt, self.newwattk + + class Slsdm630(Slbase): - def __init__(self): + def __init__(self) -> None: # setting super().__init__() print('__init__ Slsdm630 excuted') - def sepwattread(self): - argumentList = ['python3', self._prefixpy + 'sdm630/sdm630.py', - str(self.device_nummer), str(self._device_measureip), - str(self._device_measureid), - str(self._device_measureportsdm)] + def sepwattread(self) -> Tuple[int, int]: try: - proc = subprocess.Popen(argumentList) - proc.communicate() - answer = self.readret() - self.newwatt = int(answer['power']) - self.newwattk = int(answer['powerc']) + # neu aus openwb 2.0 + with modbus.ModbusTcpClient_(self._device_measureip, self._device_measureportsdm) as tcp_client: + sdm630 = sdm.Sdm630(self._device_measureid, tcp_client) + # log.warning(" sdm630 id %s " % ( str(id(sdm630)))) + _, newwatt = sdm630.get_power() + self.newwatt = int(newwatt) + self.newwattk = int(sdm630.get_imported()) except Exception as e1: log.warning("Leistungsmessung %s %d %s Fehlermeldung: %s " % ('Sdm630 ', self.device_nummer, @@ -465,22 +489,19 @@ def sepwattread(self): class Slsdm120(Slbase): - def __init__(self): + def __init__(self) -> None: # setting super().__init__() print('__init__ Slsdm120 excuted') - def sepwattread(self): - argumentList = ['python3', self._prefixpy + 'sdm120/sdm120.py', - str(self.device_nummer), str(self._device_measureip), - str(self._device_measureid), - str(self._device_measureportsdm)] + def sepwattread(self) -> Tuple[int, int]: try: - proc = subprocess.Popen(argumentList) - proc.communicate() - answer = self.readret() - self.newwatt = int(answer['power']) - self.newwattk = int(answer['powerc']) + # neu aus openwb 2.0 + with modbus.ModbusTcpClient_(self._device_measureip, self._device_measureportsdm) as tcp_client: + sdm120 = sdm.Sdm120(self._device_measureid, tcp_client) + _, newwatt = sdm120.get_power() + self.newwatt = int(newwatt) + self.newwattk = int(sdm120.get_imported()) except Exception as e1: log.warning("Leistungsmessung %s %d %s Fehlermeldung: %s " % ('Sdm120 ', self.device_nummer, diff --git a/web/settings/smarthomeconfig.php b/web/settings/smarthomeconfig.php index f21d4949ed..3a3f94c0ae 100644 --- a/web/settings/smarthomeconfig.php +++ b/web/settings/smarthomeconfig.php @@ -792,10 +792,11 @@ + -
+
@@ -816,19 +817,19 @@
-
+
-
+
Standardeinstellungen verschiedener Geräte:
- SDM630: 8899
+ SDM630/Lovato: 8899
Elgris: 502
From 3f1f1c63cf2c40c33ed1ef0da6ee159a1dd985ea Mon Sep 17 00:00:00 2001 From: rleidner Date: Wed, 21 Dec 2022 10:50:24 +0100 Subject: [PATCH 122/201] keys_exist: parameter type added, funtion renamed --- modules/soc_smarteq/soc_smarteq.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/soc_smarteq/soc_smarteq.py b/modules/soc_smarteq/soc_smarteq.py index 7a0c10aa52..cc33b1f8d4 100755 --- a/modules/soc_smarteq/soc_smarteq.py +++ b/modules/soc_smarteq/soc_smarteq.py @@ -27,12 +27,12 @@ # helper functions -def keys_exist(element, *keys): +def nested_keys_exist(element: dict, *keys) -> bool: # Check if *keys (nested) exists in `element` (dict). if not isinstance(element, dict): - raise AttributeError('keys_exist() expects dict as first argument - got type ' + str(type(element))) + raise AttributeError('nested_keys_exist() expects dict as first argument - got type ' + str(type(element))) if len(keys) == 0: - raise AttributeError('keys_exist() expects at least two arguments, one given.') + raise AttributeError('nested_keys_exist() expects at least two arguments, one given.') _element = element for key in keys: @@ -350,7 +350,7 @@ def get_status(self, vin: str) -> int: response = self.session.get(url, headers=headers) res = json.loads(response.text) res_json = json.dumps(res, indent=4) - if keys_exist(res, 'precond', 'data', 'soc', 'value'): + if nested_keys_exist(res, 'precond', 'data', 'soc', 'value'): res_json = json.dumps(res['precond']['data']['soc'], indent=4) try: soc = res['precond']['data']['soc']['value'] @@ -410,7 +410,7 @@ def fetch_soc(self) -> int: if 'access_token' in self.store['Tokens']: soc = self.get_status(self.vin) self.log.info("Lp" + self.chargepoint + - " SOC: " + str(soc) + '%' + + " SOC: " + str(soc) + '%' + '@' + self.soc_ts + ', Method: ' + self.method) From 43f94bd6d48dd27fe961db71bb9999338106d310 Mon Sep 17 00:00:00 2001 From: rleidner Date: Wed, 21 Dec 2022 12:16:26 +0100 Subject: [PATCH 123/201] nested_key_exists: renamed again, missing parameter type added --- modules/soc_smarteq/soc_smarteq.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/soc_smarteq/soc_smarteq.py b/modules/soc_smarteq/soc_smarteq.py index cc33b1f8d4..f6a015d0ee 100755 --- a/modules/soc_smarteq/soc_smarteq.py +++ b/modules/soc_smarteq/soc_smarteq.py @@ -27,12 +27,12 @@ # helper functions -def nested_keys_exist(element: dict, *keys) -> bool: +def nested_key_exists(element: dict, *keys: str) -> bool: # Check if *keys (nested) exists in `element` (dict). if not isinstance(element, dict): - raise AttributeError('nested_keys_exist() expects dict as first argument - got type ' + str(type(element))) + raise AttributeError('nested_key_exists() expects dict as first argument - got type ' + str(type(element))) if len(keys) == 0: - raise AttributeError('nested_keys_exist() expects at least two arguments, one given.') + raise AttributeError('nested_key_exists() expects at least two arguments, one given.') _element = element for key in keys: @@ -350,7 +350,7 @@ def get_status(self, vin: str) -> int: response = self.session.get(url, headers=headers) res = json.loads(response.text) res_json = json.dumps(res, indent=4) - if nested_keys_exist(res, 'precond', 'data', 'soc', 'value'): + if nested_key_exists(res, 'precond', 'data', 'soc', 'value'): res_json = json.dumps(res['precond']['data']['soc'], indent=4) try: soc = res['precond']['data']['soc']['value'] From bcbc234b225f8112e8f469a60ac917fc1a24fac5 Mon Sep 17 00:00:00 2001 From: Jochen Neidhardt Date: Sat, 3 Dec 2022 13:50:43 +0100 Subject: [PATCH 124/201] allow to configure which CPs will be affected by tariff based charging --- loadvars.sh | 8 ++++ runs/initRamdisk.sh | 8 ++++ runs/mqttsub.py | 6 +++ runs/updateConfig.sh | 5 +++ sofortlademodus.sh | 38 +++++++++---------- web/settings/sofortconfig.php | 31 ++++++++++++++- .../topicsToSubscribe_sofortconfig.js | 13 ++++++- 7 files changed, 85 insertions(+), 24 deletions(-) diff --git a/loadvars.sh b/loadvars.sh index 94f3c574ce..4187863ade 100755 --- a/loadvars.sh +++ b/loadvars.sh @@ -1867,6 +1867,14 @@ loadvars(){ mqttconfvar["config/get/sofort/lp/6/chargeLimitation"]=msmoduslp6 mqttconfvar["config/get/sofort/lp/7/chargeLimitation"]=msmoduslp7 mqttconfvar["config/get/sofort/lp/8/chargeLimitation"]=msmoduslp8 + mqttconfvar["config/get/sofort/lp/1/etBasedCharging"]=lp1etbasedcharging + mqttconfvar["config/get/sofort/lp/2/etBasedCharging"]=lp2etbasedcharging + mqttconfvar["config/get/sofort/lp/3/etBasedCharging"]=lp3etbasedcharging + mqttconfvar["config/get/sofort/lp/4/etBasedCharging"]=lp4etbasedcharging + mqttconfvar["config/get/sofort/lp/5/etBasedCharging"]=lp5etbasedcharging + mqttconfvar["config/get/sofort/lp/6/etBasedCharging"]=lp6etbasedcharging + mqttconfvar["config/get/sofort/lp/7/etBasedCharging"]=lp7etbasedcharging + mqttconfvar["config/get/sofort/lp/8/etBasedCharging"]=lp8etbasedcharging mqttconfvar["config/get/pv/lp/1/socLimitation"]=stopchargepvatpercentlp1 mqttconfvar["config/get/pv/lp/2/socLimitation"]=stopchargepvatpercentlp2 mqttconfvar["config/get/pv/lp/1/maxSoc"]=stopchargepvpercentagelp1 diff --git a/runs/initRamdisk.sh b/runs/initRamdisk.sh index 3b42bc83ef..c3fc53f58b 100755 --- a/runs/initRamdisk.sh +++ b/runs/initRamdisk.sh @@ -517,6 +517,14 @@ initRamdisk(){ "mqtteinschaltverzoegerung:-1" \ "mqttetprovideraktiv:-1" \ "mqttetprovider:notset" \ + "mqttlp1etbasedcharging:-1" \ + "mqttlp2etbasedcharging:-1" \ + "mqttlp3etbasedcharging:-1" \ + "mqttlp4etbasedcharging:-1" \ + "mqttlp5etbasedcharging:-1" \ + "mqttlp6etbasedcharging:-1" \ + "mqttlp7etbasedcharging:-1" \ + "mqttlp8etbasedcharging:-1" \ "mqttevuglaettungakt:-1" \ "mqtthausverbrauch:-1" \ "mqtthausverbrauchstat:-1" \ diff --git a/runs/mqttsub.py b/runs/mqttsub.py index fd223f8305..72501a29f3 100755 --- a/runs/mqttsub.py +++ b/runs/mqttsub.py @@ -640,6 +640,12 @@ def on_message(client, userdata, msg): client.publish("openWB/config/get/sofort/lp/"+str(devicenumb)+"/socToChargeTo", msg.payload.decode("utf-8"), qos=0, retain=True) sendcommand = ["/var/www/html/openWB/runs/replaceinconfig.sh", "sofortsoclp"+str(devicenumb)+"=", msg.payload.decode("utf-8")] subprocess.run(sendcommand) + if (( "openWB/config/set/sofort/lp" in msg.topic) and ("etBasedCharging" in msg.topic)): + devicenumb=re.sub(r'\D', '', msg.topic) + if ( 1 <= int(devicenumb) <= 8 and 0 <= int(msg.payload) <= 1): + client.publish("openWB/config/get/sofort/lp/"+str(devicenumb)+"/etBasedCharging", msg.payload.decode("utf-8"), qos=0, retain=True) + sendcommand = ["/var/www/html/openWB/runs/replaceinconfig.sh", "lp"+str(devicenumb)+"etbasedcharging=", msg.payload.decode("utf-8")] + subprocess.run(sendcommand) if (( "openWB/config/set/sofort/lp" in msg.topic) and ("chargeLimitation" in msg.topic)): devicenumb=re.sub(r'\D', '', msg.topic) if ( 3 <= int(devicenumb) <= 8 and 0 <= int(msg.payload) <= 1): diff --git a/runs/updateConfig.sh b/runs/updateConfig.sh index 1081da26ec..0053d1a93e 100755 --- a/runs/updateConfig.sh +++ b/runs/updateConfig.sh @@ -1297,6 +1297,11 @@ updateConfig(){ if grep -Fq "awattaraktiv=" $ConfigFile; then sed -i '/^awattaraktiv=/d' $ConfigFile fi + for i in $(seq 1 8); do + if ! grep -Fq "lp${i}etbasedcharging=" $ConfigFile; then + echo "lp${i}etbasedcharging=1" >> $ConfigFile + fi + done if ! grep -Fq "plz=" $ConfigFile; then echo "plz=36124" >> $ConfigFile fi diff --git a/sofortlademodus.sh b/sofortlademodus.sh index fe9091394d..891a52b246 100755 --- a/sofortlademodus.sh +++ b/sofortlademodus.sh @@ -10,31 +10,27 @@ sofortlademodus(){ fi if (( etprovideraktiv == 1 )); then actualprice=$(
- Allgemeine Einstellungen + Allgemeine Einstellungen
@@ -154,6 +154,22 @@
+
+ +
+
+ + +
+ + Aktiviert/Deaktiviert Preisbasiertes Laden + +
+
- + @@ -335,6 +351,17 @@ function visibiltycheck(elementId, mqttpayload) { showSection('.lp' + index + 'limitenergy'); } } + if ( elementId.match( /^boolAwattarEnabled*$/i ) ) { + if ( mqttpayload == 1) { + for( $index = 1; $index < 9; $index++ ){ + showSection('.lp' + $index + 'etBased'); + } + } else { + for( $index = 1; $index < 9; $index++ ){ + hideSection('.lp' + $index + 'etBased'); + } + } + } } function saveSettings() { // sends all changed values by mqtt if valid diff --git a/web/settings/topicsToSubscribe_sofortconfig.js b/web/settings/topicsToSubscribe_sofortconfig.js index d2f32fd52c..8120f0a45f 100644 --- a/web/settings/topicsToSubscribe_sofortconfig.js +++ b/web/settings/topicsToSubscribe_sofortconfig.js @@ -51,5 +51,16 @@ var topicsToSubscribe = [ ["openWB/config/get/sofort/lp/1/socToChargeTo", 0], ["openWB/config/get/sofort/lp/2/socToChargeTo", 0], - ["openWB/config/get/global/minEVSECurrentAllowed", 0] + ["openWB/config/get/sofort/lp/1/etBasedCharging", 0], + ["openWB/config/get/sofort/lp/2/etBasedCharging", 0], + ["openWB/config/get/sofort/lp/3/etBasedCharging", 0], + ["openWB/config/get/sofort/lp/4/etBasedCharging", 0], + ["openWB/config/get/sofort/lp/5/etBasedCharging", 0], + ["openWB/config/get/sofort/lp/6/etBasedCharging", 0], + ["openWB/config/get/sofort/lp/7/etBasedCharging", 0], + ["openWB/config/get/sofort/lp/8/etBasedCharging", 0], + + ["openWB/config/get/global/minEVSECurrentAllowed", 0], + + ["openWB/global/awattar/boolAwattarEnabled", 0] ]; From 9ce531235ae733b020848ff72ed45b03c65fba8f Mon Sep 17 00:00:00 2001 From: Lutz Bender Date: Thu, 22 Dec 2022 09:07:36 +0100 Subject: [PATCH 125/201] remove old evsecheck --- runs/cron5min.sh | 4 ---- runs/evsecheck | Bin 37632 -> 0 bytes 2 files changed, 4 deletions(-) delete mode 100755 runs/evsecheck diff --git a/runs/cron5min.sh b/runs/cron5min.sh index e8c3fa0817..fd83647bba 100755 --- a/runs/cron5min.sh +++ b/runs/cron5min.sh @@ -306,10 +306,6 @@ commitId=$(git -C "$OPENWBBASEDIR" log --format="%h" -n 1) echo "$commitId" >"$RAMDISKDIR/currentCommitHash" git -C "$OPENWBBASEDIR" branch -a --contains "$commitId" | perl -nle 'm|.*origin/(.+).*|; print $1' | uniq | xargs >"$RAMDISKDIR/currentCommitBranches" -# EVSE Check -openwbDebugLog "MAIN" 1 "starting evsecheck" -"$OPENWBBASEDIR/runs/evsecheck" - # truncate all logs in ramdisk openwbDebugLog "MAIN" 1 "logfile cleanup triggered" "$OPENWBBASEDIR/runs/cleanup.sh" >>"$RAMDISKDIR/cleanup.log" 2>&1 diff --git a/runs/evsecheck b/runs/evsecheck deleted file mode 100755 index 3a8a2c936a1dbe98b75cd682a40f8f8e1cfc05e0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 37632 zcmeHwe|VI|wf}6gfe->Nu+}uDWz|?y4Pnu!QL$YJKQ+KYf}+xHmSiERNp?*({AlTI zz^M2YYLqBw!K{|vQm?gmrLDDCv6ouvrMI-DSFWXPHsP(2qT*F6Dw_NG%saC?d4;mQ zPye{j^Ywi)nK@_9oS8Xu=FE?s_nogzubSaNYFsk0seVFJV@vzW3E|e}hNWd~(XvYrC27cmbTj9o zQg|p2mYENEc;Sd+{M?Rbj=%isUoI++{l2L2gNeKD{M2t(S0awGAfFL%E}zTOvFL_r ziN#`A*5N<*jy~7*wEvMvSIL%~l5Mwb7qeqWdfi!W->9sPk$Gb8BgG=?)~TM6qsD}@ zK0Ee;hd0}D6=FDe@nKt%Z$8{;IOa1J?qtuIK%NCx09OcC1otU8AKW=`=fQmjj?V>f zB{C$$XW?H6cM;qKxQTFnI11@9IQ>*0a0T3za96=ihPxV$&*$L+4B(jpHx-VunFcol zj?YZES#a0FRl)I@2N#5!4_5=nR=5uCM!1zP|8Us&XWxGCrZ&%rQCqVr_P&2%^XA$M zgYP{2#kXJU-qZZmSI3;ud(qb9<#WG3Y;E03&wuNo@G}>W>wSES`>RFI-20mad;Yqo zYvSCi|N7jB*?EV5@y%ub^{IcFzWmlzNB*sL!pxhz_n&d(x37=hnfK#wwQq@gADHxu z8yCI4Y1Kum?|i>#_fH>R{!;sQpSWiFwXeMU@ctidcw_X61LxE|`_lDi|7F^bmIdBe zP&n!@xmWJyz1(oeQw6ZzV{w{>+9El$MvaCe8KZC zXMFu@YirJY^0DH_SJX`IZhPqJ?brUt72h7WVcUX3nmPplmsd6X(wcYi+OG4? zKmWPP>AyQ#_xXF~@BMwj7oNQIjeX-kRlehl3B%reXnEFwwF?Sg`Emcft9xEbzCQ5h zoTB$`s{HqdKY7+X*Z0Z?zV_Z@2S5D9b(j67`}G-fUKsU*H5H>G)@wi6I&9{50vB%H zaoNFJ78Ui}_4Rvh7}vB1q8;*3Z}j6sV3G#l6Ar-X$A9&*4>qkMZC()2yx z>tA3KjfIs+I?8vU1773c_Y%rG&}xb=K?2zYI9rP`l7(VHzJL>y0(CT^+SH&XS^Z*GoAb$>AM{8Cmrx^)SvR@L;0_E$oCDDcfin(yB+m?!@;i) z@G;0=*Y8%q!7rut<$xpozc}*y?vV1FCH~7%zu!9O_sf#o|0th7I^chGz&~@O--_}T z82ZxZ(1#Bk<-N>No_t6AaYy{G9Q-bE$ZN8rJU1fVYv}*i9r4#X^7{(vw;S!Z2fnm_ zp!cCZ8s6(D&(0z8EfAjvzx9o2`rY8;Gx8Uh!^Bp_8=@^2mtD@;%cL^D2+gjU6RMB2 zMwT_U#UrgXb1IvnEs>h=lBS3Vg_bo(TS9H|aBDmi5}|9BhZZQh%BFBzTcpiSe$vFj zRdd^$mqc1avs>aKxN1gIG#n4rtcrncV@o4Z^Ok%mQWp=+jKpWhBh4bT6nLO(+G9-- zn=-g+PNW%mhMStAb%>h2vMw|?+#H$S+8S*I%(T}um}VLWxl7P*pT~b9*dJ zzo4s1CKY#F%y|pvoETEp>4SMN84nFEpby+B_rL+8kyM%VNOaZxt=0;X1{Jgrl_SV)&Ju4roY>3p|ydVNhTjTPG5|b*@?6#WLc3F0`j4e95 zZ78*d)=0R%Iv$QkLX~7^>p?5pPnU~jPz7@46m6+$Y?f-`tV~U7xGpj^Tz7M57SvXi zxUwk{Zk5Glfl%M}I#$xCxE-9*QeWNpWu}r!p{k6+Q?iXq+T$tRvK5vhn-*3pSJ=lF4bxl-Ov%+l+NTr~;QHs}Yq98N{02>9|Z34o&f-)mn zLz2v8_n?qc4G3D5zfoyg(zw)b+EG6(YcoTaG1MM!Y?9`cK)noJ%wU~O5nciV1KUai z3QMyz+}H$&@ygORhZ|c&C{iDehY_))tbKYu{h-1-iyUB=Q!Ta zfidP{UPz5|VlNiG980}7*mE8)7N#7_y$kF)t@m8;A&dnk=iFXwc5rUx#ey~;<@*E{ z+aCH@w0h}dky}6?3*936Sit(|PeFS6Sj?8t$AY_*J}U30k402D{X8Km=wq=xnLZZR z0s2@>PowX{nwUNo+g0?j01wi~g1Cl07H5m-V?$su{j-IrrH{pQJ$)?P8|YUG(L^5$ z_89$73lXP}3E4{eSlq9sf3Xl9^n=(lqW=lVojxXu>*=F?y69t(*G>O=AvV)56=Dnh zfDj4#Be5?0{&JG5S?#U;5L~zVxwK@D%+rA$HN9gZ8FBSBO3I$D!Tmdxh9X zzgmd>^e+|S0R78_I7q)(h(q*;3DHX*nsu1|7_=XK>^U8!KOK5OKUavi=%0^0l)!{n zLT8A-YjPPV5TyBI*jc~CME;7PiBb;x9-A4Gt`{{bUWrU9!;loDwkP$v$ zg!dWYJw|w!5#DKpA2Y(+jPMpC+--!{8{tkPyxIuIjc}6@t~bJqjc|<-t}?>YjPPV5 zTyBI*jc~CME;7PiBb;x9-A4Gtdxrdt@KGat*a#mo!Uv4-J|n!x2=8JTPxQtKhYO7x!ai!4^sfMymB^3f~>j;oB|YS!b1tZmXiU8+sb-pB(JA%6*;C z?M`d5r_;i42)*kv^rHhZrQUT}X`Q=H>D>JW-R(-}?ze_P4r$tj{Y;P1t>3eML*KDA z&kP6wT@3`F*ENvAZPq)3gWx|@SN|JrBI^`Hxq~QoaGmNC_ZoSwRe9cvGN$v)6;p?#~{5@8dFVI`QyT=+kF`9hj+(a^41e00* z#2A-x#yOW8{p=WYCJ@_#a$n!ivK*W8%)oP? z?_wUoL{ikk`8Hav4&)I?B=dJe4!hU)Jq(<4YuSJ&7dS;d0st zU$>PHyF^=(?_X<)K(G(flESY+zZi!7DD)#AzXyE8M(ax8vDI>U>kA{$@wGaoEPJVu5oa=kQ?hEbvU@u>IBdH+Aga@@nyM%=N>EH2mSJ`?Q@}D z<-?YsU%oJ0mG{!WQQqoPly|gI-U?OTBN>#JWzDKhB#%>mLD+3ybsy?ocogM63fxhY z`zU1aWyy14{{eqbPOq;g=YXdt=aA^hfnMaXuELMLjPmC|Hv2!YWqJYn(Jt^|o7sIc zF)qv3>A|$Ma6Rzbz<)jXC&2&Dv_E4uy)48%7Wymt#TqMn%-WZsJAK2@@6kV=rro0K z{{;T|=qrrN_uqywXs9ixp4j7rZO?T-w9~NtZ4dOZYo;*pG+%AYaIs{epRTA;V#Ssjq9n zL+d5iINW1DHV-zqE0HWJXWP#2E8jn-Pjn=bY;O_RXkmF$I4prM?XbA9AJg2tw=U_i zyfN12`hHBq^YV9WwDOSeNaVxv)=53Mi9Z9p)G_G}j3FCge{M{6%-=NpF3^tv%|onD zSFmpu_?Oe(-TlnK7VyoE(XMaAIIscyVRu3AM}37a(O;72wn}$&TP3i=rEq?@63{&b zUZsB9mSHT*%k^wR+AeDq^Y91zV6Y0Ood@1x(<^rphq_?dfU#`jD;oy^`+|L?z75uS zNV}B0FphY~p^hjI%iw~Y5+2wE&lKp~eCY66D+fH?z|l^ztOe+=lOS)F@=&{g1FuCL(?Ck6a7fuc!-{zXZS| z$Dc@cfG6$N>Z~4Xx#Gt*qih$o_E-hJO;(YAlU0m5c~Q1}v0=bNACBWH`(csTU}Yok zZ17>Ze6^@U*9I$#{QM6{8)(m`?u1_GzVd*@w$pt@_%|DL>(m&t8RL&ZgL2=_`apNQ z9ht1$_U0G~T^jlpw&pGIm z;73{cFlMk%ee(olgK>a;I8fVZ9V9Hvrstlgo=;Av3>-EnAjiwJ{ek`+@u1zZ#ZBl( zqA;-IE{r*7*D;CYPUh7S>^lfP-i|vg&ko23?VPnckz6}zU2nd)0d`e9eJ8>kGu(+= z5r2opx;_p$jQ64uN-ZCwk%V+on_ygr)&wwG1xhd#~hbw z1GmEs&cysYkw^xo^jI#)y#({7Vo$fVi*_Iu>>FO2a8Y-KxS=1qG!FB_Lh8{B)+re5 z%jrst$q6J}IiT}_t`zBi!?@aD-!R~@<&gIy!jQciG+63`S8x9_N+!9$Ve$s~CiY<=ElDJEl&VC3!BY(i|D{uA;-J5 z)&Ry7R|5Jg=R4I&Y{$IdML8=m2AzX)a85}ZmJ8f)*s2l!gbQPb3$k*Jl=7|VKkM_+ zr&czw+A|hd|XI_aGxAgf_52mQGcu(2iAd}c9itC z+>tlN#auB?=FPE+{m~`Bqjsxx=zXQ{!G!Cmv>o?btTWqJ_;0u60~_QPpk$O~JfA6c(pd_EFXZGgU$$_sP5y!-(2mGxj9Q8)0X?8?zbEDy%aynGdY zi84WZaUIV2757lNe=GM2P^PL{Ti!l#zqLZi61>&Auk%clqmX4ULHxaxA8iY81%8bC zzT5hw4qzVgU8L3JVB2%=_DSd&=S`J=!dwY9hhr|x6uqv>A#Tux;5_xo$$f1NcMX-HEf)>$|JCS_ff-D4e6X$ycqk!$12fnTZU-vzD&{7Nu?Vp%93&NEhn zM(10Kv~Msi^o(Pbz}n_ImEMOqG!ASk*Vfd74yzaQoEKESC5S)65x)oVKUMK=#E($% zC9o@+$F{LOR;k!*{aDe#?tim;YR|VY4}7$1L65Zzdg=DpK+me}IjzSl#}Ur?Ji=>j zMmn$Gi}>5%IQI?qb8WZ?X%``FmP!kIlSleppr`H52Oq-ZvjI5H>nR6sptBDr4*RiR zlIIPQ@4|le*S3*8ukJ-W`L9D=*e_@kvXp!Rz$JmpGTLz(aI~qIEA$^%X=efVB5)&t zdsE@6fcp(_9^hV6xFB%91g_iFW4)qqHNfo!ZUDH$3bzQje*^CRQHlOPDcoYlDbb0d3ag z*(}@YA(c<={GRU*V9zNlkm!$Oiz6q{M`4?#UUB~VTSeD_@*IL*1;Jwxcu+?BR9q+G zeuubqz*C;jEBt!ke+7IO(yUZzo>g((h})~;HmkU&RNNNCJ%>2jpakms3~dP7OhDH? zVuOXBQwkRad#qp6-pZ%<^ZQ{p#xHb<|AgO-%JNLizasoLI&?2=%ejavgS#58Ae<$h z2hCo%R}ru6&OyMxgyVk5Yw)>-uwPQ~}lcWpgIJ7>)IDaF_A;JXiepHh7Pp!mL!DPMmA^B#NboTk#U-#{O+ zAH?-O_VDD`z;z7g1#8j9TdmzFOP`uYdO`mr=rhs5UA5qeJh>O*h0b!!?xsz}e5M@s zCwK{T6n5zg>9XYHz?Rno@Aci@*D%hG{|@3k!3|ctdc1Y-aIDud(0}Hq=Lx6lE3hB^ zdmz*O+01u?^_Q@=kd4qqXUo~%fY!yY0Y?y^<9`#R%4CZ zm4k6I3w;+=7I`-*zRYh4@?+lnRGxJzE|g)OUEPqI%5#x;;FNiO&d3vXOy;@Y^8jqZ z1J(=`H#5UL14yIuJXIafHS)Ve<##~kccF^&XP93sf;tAUr{cr>%6~uhg6!WfxWA6M zV4pXz!MYqg-JAy@j~L2FJLkr}H)VW9mdHB@{QC-54BTbF9RiN+`nJNee~btIXV8D9 zEdg8t*wjI{Y|oF{VD2?(y{BwAH$AN`#_mta(T}=e4%=6Xx^WGhjrw?eTdiItvp*cS z?aF@4C(ZJlYD{1mdLak)!!gRPuzuTJBJVJGepl%|<@3+LWy(|6aka7$$t5W)Uiy;SYp&GQ@xrRf}Kkw`fIKnFZZvx2T`9l-s(-9ZyiB< z=lC%PhQ07AThWO+=0R@j(MXg9nV%Q=TX{Ej^a_d{p+8v@tl)D_wn*i;$TI*@k? z+eSH4Uz~dom^Nb`I`sEa?l--FytuA@k+R2JBfZbpY3y|m-G}4)>?bJyUEo=B?Rc#1 z)AbP8L-+vo@CLD81y=&6?c`{2&%iGc_kXb+1@x<6GV~06m2Fs(k9zIE90Rh4F7&Yt zOVEZK$HqZcBhiN4&`~+Q0mr)CkGkFZ#YF$O!2d#5VJkA$(F|!z{q|aPdXC8Rsj!>& z=xWS&lz!!o8gB(qNA3sEUSWv@JCo=y#lDBuwNs5-m4Cv1CVs1$HD|mv7V`T9)^|aK z`TJlE{CD9mg3rCp#qfD%LiWoH%df|vzsJs-eK^y8PyJ+_IS=4?&bB-cZMgxzNqXjv zx8}0k@T=he)7(V=HSm3aXTdLqpNT!!{qpljQ-d_z-&_R$D)@`xUje@s{^jsFZz_kr zanH9HWy9Em-`=-cul#lJFS{^L$mLuedkHhpu0H^dzYSc7@KN6b)-jAT&kzS0pP3_` z-V6E@oIl{VhnL*;Z=!F3hI{W%D!Sjf#nU2#J^sbue_W;Arqbg5u%`pSpHTRR6#i}C zX8|u@+nLv9g@0YqyA}Rkg?|P3VbIAU@S#0=9`fgU_+so8(+=>rYPM0MlKGwB$=@#0X_Y*I zBb`nweBUr=?o#}}VPT&wP2(6-PS$p87ca{1L%l|;@;}V-JND5}Himg!4_ebyyR1dI z3&015AEd1A&8F_0zFnwqA99REn?P06cOLF}C^Ox~1@ee$_Iu$3G;xkrm}Gs8UJ zV_lJFg{qRzvW&P+#ni%{ontaB{bcW#E|-~P5OBc>1d9<-=G-y;ro zV$r2EPSn(B{39dn~)%H=^A)T3ssdu^G1ecIe9Us?FRemk;Hy zQ|<1OCZ+4-KTUkc*<==zvwMyoP5k3l;A4A>? zRK1_brmcQZt`XRdkAsH&`YlzyS&D8u=rZZo9aq`E*)PW4(Q(g4t3svUg!J_)E`Ycb zh?}J1x)3)@#mO@}V>VhBs<=B5S8AklBknvEw-#|8#-Y6I`$gb+ozj`FP@exFJMq|+ zw$9`tZ|Y38%Kv`kpGlu@n&&qgWu;;$Jti7Z|x^mDR0Np1{*3AdqPK^nj%4VyvRE-Ilwb$wG zz=@T19lT>Up}jU)n^nS~MLmnmIvry^kYqIT6UoJ0re49L=FYjVqUH~4`$RmL{mgI4I`;mus39E7p z$TS#FQs=h+pWQD02QAX+b2!|u-7&n!I!ERGqYTT-^-K=MA{|m~#-zn4lW6HlBx>c^q)(XBplXxRUCIzTFdb=VuWozO zZimkRu7SRpzcqMjZ^K!X+pMjmL7LA&Z>C|~;#^@Hap=nh=y&Xo+^e9iIjHQ~SXrji z_k&DqZ6-QKd#C4+UsYwpp%>VM)7vSw-xiFsG00~-%a8VZ9d&hsXEEx^d1-^<`Af<3 z^z|x6dp)G|^$>WKfX`KIFUav(+5b+@gLB&r6bW`wz~w*|f%IGhR9l4+9Qoe~z?*AJgsuZa8p11a6ZXbu1rapON`M(e1%m7lH9z+C%Y9q12MHLsKcb#*Vo#KN z+EGkvv*{$~-U4A=%}_oPn8{xuBvVMzM}MFagwK8bJ+ z@GmR>P5AC0)-j0Feee6g;kS@};<>->x^=PN<$0^U`d7>7D% z^E^D?$+-snUpz+Lx{h`zPtU=h2X3+-=WfBXHgK!lbGeXZ!5BrodJplXs%$)eFdAXb zt9bVF7l@-xVwiS?@)W)Ny<+R(Q9j7Xhxe()1k1AcP|hWeJsvhX~v{car3JM)YxVdxn4N+-O+bG;s%gZ(|?j^Z1K ze0W|QI+>hR+hffNVoh3mcW+J*u69PRs{`kdyAsJoknN1{jwH@!=d!(BIFpER=I{u} zHP>UW!^zt%u1n(gj6$B{c8_w26ZtNI`X%{ZJKt&NR~AF~ddEsQ{V9>qjBs0=-+Y-H zy>^9|xIElCam9)i6C2{qO%tQBNXzw8C*ngL^^I*ePi%@^99iBLS$bNsNs5f0hY2-A zo9gkcoRI#8P@9OYYL3<~X>Tj5Yih(dW6IiAwbTiOTO#;yP$Z>YL z1Hrb#2W{$ZE~^vEnxad>O>Mq&uJ)0Gh~r~N@kj~`g<{a9*s7)SQ!e;|6KG@j-ccyJ zbZHwTc7B_$)nBlsc|K0?Mrz&}a?-B<@U!SUgL?XJzS!#62EqWo6n^Sg3*-%EZ+7@z)<-#f;8k@B1K zIPWUlaCk{l3}F3*Prym|?GFc|J6$e;q@p0tC9u{N4Q_7A3h@SzBjMvcc!7`5$Oq>i zguss|T)`bg!SG2ke9zVXrh3O1mkjsf*74Ci zz<=+<@8j#I9^Xs;|HbJ#({I9es9(mO0c9&6wBL5%=2g4ocknf?0k|0s+z#NbcHo`@ z?tb8~^=Lof_Y~Ik2ON1E0^N^5M;(z5=neyy2ORay#^DP^zX40diFLre2^_XN zQ@8`bjlsKRsTKvl#lYPSIMsEhIeT>G@DYT(KpbVa}=9XKy= zhk#>0(0SAVmxuC6ohK6cZUgQ`2i<1ihCAqDzS>3+ks#lW56sBbrLzj5%}1>AO| z#rw0{06?+C{+a0nTiXoxm*u&XmD!;GT8R zbpiKH;LI|Y0JjD*y&zRzd{Yv*8y&a+aHAY;bP%|$4u1Q9dk<-88|8!cIN39^vhqq_ z$%1ejwqn99zRSukDf3U5RB=&jtZ~vs^^ql4v`_l1jrCpZpLDtZ(n*(zDfkYg2uH$8 z8ilJE!JNy)uwl8b5w5(fvF>p$uj@?LS=j}yPr3@Tid^TOJYU{Z!Y5mf9`@ZKHf;B{ zu2j6O-5dk#c)Mjd2H3FO0vsD`*p{lc-PuZ8Xxr_0yLC7Q*s!e;92;!d)>i$k`)t*# zX~*q&j$lFrKA~aTvgmL3XUiKt@EZ$c&nH{pjb1#R`2B=WwrY{}DVU>^JqFUxmLror z2HLP~MfIL!wj9wgKB;jgTlZj$c{V*h28!oI3buQx-ZRa{x9QC%Tiz6t#^6|@Y7raf z7Hky%A4(-Cmp#5Z3L%8&@6ytRKz4R<)<5FIVkF`d2hDd`++0TOj|pfhSx8pXH(I zbpzg}U?1R$v(j({;6s3M?qAX~t5^ZXCiqOh6n;&iOWvoV>(>p~en!dqBn)^pq6qI* z{3y?wvxm|*7;qP&2=6fH-MnB&J~saX1O5)82>apd^7uYAlzx^0GoR085zX|~yo2yDz-h-bTLJ5N4B>kL>vTy4ETA#B?gS|1j)68 zE>97rya6M=1n@xvt^mySgQlMay_V+&WCth^3lL9O$F~CBX~1^?-UXO5W%h^7fcF~l zj{@Fjz`FqNH{d;h4;t`3z=sU@0APOWg=-t~=SP{38S$?He#?O01AN?ohr#fjFyL`C zghqXRfZYZ>5pb>ne-3cI0nY*KGvHdlr3M@Y>^I zfU6An1;B9wei5*KIDhQ}tk(}X!6E09Znb~M`Rwb6*RY=Nlo;`xzmyyB8=%*)rmr>P zsV~B?mrSqs3z?sLWE$4#yNvXOi08Qt&Oq3{nM9UE0rB@deOpm^*`vXa4qsySxyuAH5#nSs44V*CWNL^@Ba1;+Yv8?`#k9 z*Xuv-PObxg4ReQ*@w&aZgLyyVHO%%iAC~74#A|u*wzMY!>-8abcy41A3@LFsU44{AVA-{JV@ovPY^E*q71ng1$nf1NU-eQpH zng5jzxY_|XIN%Q;f4v^&-GXh1=X&8-iQOJ+0Gs98;7GsK0YC15cLO%>Lfr3&KjMHt zaKQO!AN{a?1rGQ#4)|)o{4Q5Y9~|*Z9B`Wh?r^{x9q=O#_;J8me>~8iA3NfI1K7O# z?ua9PxV;4=tH}DD4cNR}?z2X`5AhWSO!{erl|3Dkb(WY9nENSq{m&4!4*FXhaEAll z>VO}0z`Fp`zSSaI_Sb!Y&AT`shd!D5(xgp=q{sKq9Q<}d9(uos{Ej%{kCVUAKhzc( zxG{e?4D{w*i07m>HSPE^!0G-|Ag*M5L;5bh6_}rMJ-bfw8zruBq+jTO8v&blbH)Li zcl&h!Ht%BG;7I?71AfAQeJI1v0GoFczG%d=zJCU6-rc#@A>a2M^tsqV)b*!+cmbPt z4;I^7jNoj`>rw;u0XNTpnSU){^Dfg{9Pw)%@bhRtz5g~A`)_wU;G*xuGEFM(cGS2q#&KdYOdm$kHW6S`sP#LFg@m8rjzMc1{)CzVA-alI%G|09?+ zf*FtVg;qquH;0zC{3Cd_fM@Cy8_xIHhe6YK*;R*^^H3sBh^CPXB0S4yV{wBTz<9JZ zGP^}y{0BVG04{07p}}~FS2Bj|BZs&-(&mF(G4>PUvn)pd=jbn2|5ecNMoEK-Nlr79A4Ldv@b<>^zKlYQl3SzQ$OJjPn1F%u!jpF*dlSRyHiKJstY~GnCFBHV_T!ZPQDlISL!}(Yoi<~LX zXv!P+P_hNnYie!?%~&|MvS#+YxuHpM*qgrJF-I-W$U4-Vl%XhV0|LA$7br zgyX##(xv&G;)JixPM`D**=J)z@}#ehJjsb)9d(kEzdFi!0$Ag55ICd{0&86QK(K*P z2ZJ>xbwF4nQU`@KB6VOmh0q6wQwV*4SR?d7Vh!s9#Tr%zi&LO|z&Hik2aPqDI&f?^ zp?y|0)l$ps!^fIf9YWTieHd9o_Mv1A>BGr3TX{q|#nnEjtSRMzWeuo<%XTUrUrr^G zhnO{)Jj|>Cb*R}+!&A1YH1<`9N;@Ms;+%@%L1&$w2cA>mTT($BfYw+Xgw{b^*s1v8 zzEBlfszMMv&!We}OB4c^--b@9ZH!DE4!2oJ)X?^qD1E3rO*Nz?NOMYkwW}I($;?)ga9Uynbu}3tq8LOBQ5+%+*-KC#Y-ck`ggk$bBlGD>8Er=jqg^Ga8-akK z020(~B?0vYz)9=^qjkH9*H5%=us$}_BM$8d#8A!$q^oJX*E$r!(%qcF=U8TkDi={0!8Wq#bb zEkXSXg3(K4c|)m86?lnCpg>MB$Zn~;QQIHVxv6LesEejzby;jsU{=}|Z(q7pPWG;; zTo9_7U0s70AL>&Vf`{VG=!Ur7m=dawhU|AfLiL#BwS~g%E9H9`cr7DRkGC%_xq`W$ zgi7A+9SXO$hF8%@wXPEOOCj~`&CRQj#DL`O;6q3wO-m>64U4j9HArVHm@;R2X!_h~ z^0gP1S%*oJN{Hs3cEj8$b7of}jS+)aRCxRD%&K`)r&NXJ&6rU=y(UyMWop&*5O4Z5 z?jTlo^47Jr>zm2VOPYsVFm7Dr{E@qY(>G3k^wMQ{6FDZBeBTJuVe?|=zjZJBklWPt zJ;(O#(CO=fA)cYPD4X{`+w)fAmh;q{n>R3Plj2ALc=rU4|O%aUzsj zHXu_b8FJM!;FI2~tR}ugZ&FWPMb1V`vo)_fPGw;W8(At&YGMq;Z1h)oUvuiRZRb_& zs-ZyWywCb1S3^6ljAsqao7xwoZ>UF1YCWUx{zlWD{4(^R*S3G;Vslk1`!?&7+(#}i z&`#HxrBe5xhj@9kzBU?)b&@;Wsc$A)U%38}tEdBk^o`Ody9+yoQyRFe85hsXZYEW* zhBjEUi}NTx8WVHR1+%wQ)-mDh&~n1)t_EkK|bo9^Uw^u zSJqI4*TtAnU+t~#E;l+db;@~RJ6mT}EE2MpeCd+NE5-S89&gx&uuwAd{&LE1$X)Yu z+nbl*H9ja5EKd5?ZeuB`E-;tPHsoe=YU&K$JkD#&sk(~Nyl`ILQ=Ym5KCSTNX5X-` zbzWZK9=c|EXhCF|oW@i(@vd>+2Tv1Z_kAc!v=tax7*vf5N=3l_&s)qRnudy{iWdsi z%&Als*Jj71r6$BwnMMIBNw#R?nmMVrF_DhLNKJSNT0hmCAZ2zyRO(i>>nLwYAF6tD zBF&*WX#Qv&$ZfS!m%B5^>+E*|5oMa`^quY64iC9_eP{;Kj7!lAymi{lWk4C01h(Ix zLyfc;F;Rv$10!Wqrp}%a4=+;?c7w_|tk+M#w785=1Mj6Tt6$XuezuRw${6(y;}8H- z+p^Y36Y1?htSK(aq|%nfBP$Wc8)ZpO$gB+szcfHrK!W&H5`Jhut?D+A9~^5+|#t=Es< zLOc%${M;?+c&0Cg2%jc`&pl;6li)NR&ti6gu2{y{|1{k+fOv;K%6xf7b0_F_0>GB5 zd`L$(7mhy*k&b6K8-UyaA{;G{rI{xP4UyzPtJbCeX2#$2jioYdPfNnMguO3bJ&wxP}TMM6O zJUbWK{Pa&an(hgkPV(b#nd?EPL>>@J58x8NOFD2*>h4#icGA#TGSR5#n{|w0<-{qD;EV4d{0|5^*~C EKVf%#H2?qr From 5055caf35b003ce0fafa575602002e306f93c5d1 Mon Sep 17 00:00:00 2001 From: okaegi Date: Fri, 23 Dec 2022 16:28:26 +0100 Subject: [PATCH 126/201] Acthor Temperatur Anzeige... MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Falls Acthor als Gerät 1 oder 2 definiert ist, werden folgende Temperaturen angezeigt Modbus 1001 -> Warmwasser Modbus 1030 -> Reserve 1 Modbus 1031 -> Reserve 2 Reserve 1 / 2 nur falls angeschlossen (von 0 abweichend). Sonst wurden auf static Types , Python log und neues Filehandling umgestellt. Ebenso wurde on / off triggerr stark vereinfacht. --- modules/smarthome/acthor/off.py | 78 +++++++-------------- modules/smarthome/acthor/on.py | 73 ++++++-------------- modules/smarthome/acthor/watt.py | 112 ++++++++++++++++--------------- runs/usmarthome/smartacthor.py | 31 +++++++-- web/settings/smarthomeconfig.php | 2 + 5 files changed, 130 insertions(+), 166 deletions(-) diff --git a/modules/smarthome/acthor/off.py b/modules/smarthome/acthor/off.py index e103854986..28f48f8a98 100644 --- a/modules/smarthome/acthor/off.py +++ b/modules/smarthome/acthor/off.py @@ -1,61 +1,31 @@ #!/usr/bin/python3 import sys import os -import time -import json -import getopt -import socket -import struct -import codecs -from pymodbus.client.sync import ModbusTcpClient -named_tuple = time.localtime() # getstruct_time -time_string = time.strftime("%m/%d/%Y, %H:%M:%S acthor off.py", named_tuple) -devicenumber=str(sys.argv[1]) -ipadr=str(sys.argv[2]) -uberschuss=int(sys.argv[3]) -# standard -file_string= '/var/www/html/openWB/ramdisk/smarthome_device_' + str(devicenumber) + '_acthor.log' -file_stringpv= '/var/www/html/openWB/ramdisk/smarthome_device_' + str(devicenumber) + '_pv' -file_stringcount= '/var/www/html/openWB/ramdisk/smarthome_device_' + str(devicenumber) + '_count' -file_stringcount5= '/var/www/html/openWB/ramdisk/smarthome_device_' + str(devicenumber) + '_count5' -file_stringold= '/var/www/html/openWB/ramdisk/smarthome_device_' + str(devicenumber) + '_oldpower' -if os.path.isfile(file_string): - f = open( file_string , 'a') -else: - f = open( file_string , 'w') -print ('%s devicenr %s ipadr %s ueberschuss %6d try to connect (modbus)' % (time_string,devicenumber,ipadr,uberschuss),file=f) -client = ModbusTcpClient(ipadr, port=502) -start = 1000 -resp=client.read_holding_registers(start,10,unit=1) -#start = 3524 -#resp=client.read_input_registers(start,10,unit=1) -value1 = resp.registers[0] -all = format(value1, '04x') -aktpower= int(struct.unpack('>h',codecs.decode(all, 'hex') )[0]) -value1 = resp.registers[3] -all = format(value1, '04x') -status= int(struct.unpack('>h',codecs.decode(all, 'hex') )[0]) -print ('%s devicenr %s ipadr %s Akt Leistung %6d Status %2d' % (time_string,devicenumber,ipadr,aktpower,status),file=f) -f.close() +import logging +from smarthome.smartlog import initlog +bp = '/var/www/html/openWB/ramdisk/smarthome_device_' +devicenumber = int(sys.argv[1]) +ipadr = str(sys.argv[2]) +uberschuss = int(sys.argv[3]) +initlog("acthor", devicenumber) +log = logging.getLogger("acthor") +file_stringpv = bp + str(devicenumber) + '_pv' +file_stringcount = bp + str(devicenumber) + '_count' +file_stringcount5 = bp + str(devicenumber) + '_count5' +log.info("off devicenr %d ipadr %s ueberschuss %6d" % + (devicenumber, ipadr, uberschuss)) pvmodus = 0 if os.path.isfile(file_stringpv): - f = open( file_stringpv , 'r') - pvmodus =int(f.read()) - f.close() -#wenn vorher pvmodus an, dann watt.py signaliseren einmalig 0 ueberschuss zu schicken + with open(file_stringpv, 'r') as f: + pvmodus = int(f.read()) +# wenn vorher pvmodus an, dann watt.py signalsieren einmalig 0 ueberschuss zu schicken if pvmodus == 1: - pvmodus = 99 -f = open( file_stringpv , 'w') -f.write(str(pvmodus)) -f.close() + pvmodus = 99 +with open(file_stringpv, 'w') as f: + f.write(str(pvmodus)) count1 = 999 -f = open( file_stringcount , 'w') -f.write(str(count1)) -f.close() -count5= 999 -f = open( file_stringcount5 , 'w') -f.write(str(count5)) -f.close() -f = open( file_stringold , 'w') -f.write(str(1000)) -f.close() \ No newline at end of file +with open(file_stringcount, 'w') as f: + f.write(str(count1)) +count5 = 999 +with open(file_stringcount5, 'w') as f: + f.write(str(count5)) diff --git a/modules/smarthome/acthor/on.py b/modules/smarthome/acthor/on.py index 8b344b9ccd..1d43a2f175 100644 --- a/modules/smarthome/acthor/on.py +++ b/modules/smarthome/acthor/on.py @@ -1,56 +1,23 @@ #!/usr/bin/python3 import sys -import os -import time -import json -import getopt -import socket -import struct -import codecs -from pymodbus.client.sync import ModbusTcpClient -#from pymodbus.client.sync import ModbusTcpClient -named_tuple = time.localtime() # getstruct_time -time_string = time.strftime("%m/%d/%Y, %H:%M:%S acthor on.py", named_tuple) -devicenumber=str(sys.argv[1]) -ipadr=str(sys.argv[2]) -uberschuss=int(sys.argv[3]) -# standard -# lesen -# own log -file_string= '/var/www/html/openWB/ramdisk/smarthome_device_' + str(devicenumber) + '_acthor.log' -file_stringpv= '/var/www/html/openWB/ramdisk/smarthome_device_' + str(devicenumber) + '_pv' -file_stringcount= '/var/www/html/openWB/ramdisk/smarthome_device_' + str(devicenumber) + '_count' -file_stringcount5= '/var/www/html/openWB/ramdisk/smarthome_device_' + str(devicenumber) + '_count5' -file_stringold= '/var/www/html/openWB/ramdisk/smarthome_device_' + str(devicenumber) + '_oldpower' -if os.path.isfile(file_string): - f = open( file_string , 'a') -else: - f = open( file_string , 'w') -print ('%s devicenr %s ipadr %s ueberschuss %6d try to connect (modbus)' % (time_string,devicenumber,ipadr,uberschuss),file=f) -client = ModbusTcpClient(ipadr, port=502) -start = 1000 -resp=client.read_holding_registers(start,10,unit=1) -#start = 3524 -#resp=client.read_input_registers(start,10,unit=1) -value1 = resp.registers[0] -all = format(value1, '04x') -aktpower= int(struct.unpack('>h',codecs.decode(all, 'hex') )[0]) -value1 = resp.registers[3] -all = format(value1, '04x') -status= int(struct.unpack('>h',codecs.decode(all, 'hex') )[0]) -print ('%s devicenr %s ipadr %s Akt Leistung %6d Status %2d' % (time_string,devicenumber,ipadr,aktpower,status),file=f) -f.close() -f = open( file_stringpv , 'w') -f.write(str(1)) -f.close() +import logging +from smarthome.smartlog import initlog +bp = '/var/www/html/openWB/ramdisk/smarthome_device_' +devicenumber = int(sys.argv[1]) +ipadr = str(sys.argv[2]) +uberschuss = int(sys.argv[3]) +initlog("acthor", devicenumber) +log = logging.getLogger("acthor") +file_stringpv = bp + str(devicenumber) + '_pv' +file_stringcount = bp + str(devicenumber) + '_count' +file_stringcount5 = bp + str(devicenumber) + '_count5' +log.info(" on devicenr %d ipadr %s ueberschuss %6d" % + (devicenumber, ipadr, uberschuss)) +with open(file_stringpv, 'w') as f: + f.write(str(1)) count1 = 999 -f = open( file_stringcount , 'w') -f.write(str(count1)) -f.close() -count5= 999 -f = open( file_stringcount5 , 'w') -f.write(str(count5)) -f.close() -f = open( file_stringold , 'w') -f.write(str(1000)) -f.close() +with open(file_stringcount, 'w') as f: + f.write(str(count1)) +count5 = 999 +with open(file_stringcount5, 'w') as f: + f.write(str(count5)) diff --git a/modules/smarthome/acthor/watt.py b/modules/smarthome/acthor/watt.py index e1bf53ec81..b482ec5eec 100644 --- a/modules/smarthome/acthor/watt.py +++ b/modules/smarthome/acthor/watt.py @@ -1,32 +1,31 @@ #!/usr/bin/python3 import sys import os -import time -import json import struct import codecs +import logging from pymodbus.client.sync import ModbusTcpClient -named_tuple = time.localtime() # getstruct_time -time_string = time.strftime("%m/%d/%Y, %H:%M:%S acthor watty.py", named_tuple) -devicenumber = str(sys.argv[1]) +from smarthome.smartlog import initlog +from smarthome.smartret import writeret +bp = '/var/www/html/openWB/ramdisk/smarthome_device_' +devicenumber = int(sys.argv[1]) ipadr = str(sys.argv[2]) uberschuss = int(sys.argv[3]) atype = str(sys.argv[4]) instpower = int(sys.argv[5]) forcesend = int(sys.argv[6]) -# forcesend = 0 default acthor time period applies +# forcesend = 0 default time period applies # forcesend = 1 default overwritten send now # forcesend = 9 default overwritten no send -fp = '/var/www/html/openWB/ramdisk/smarthome_device_' -file_string = fp + str(devicenumber) + '_acthor.log' -file_stringpv = fp + str(devicenumber) + '_pv' -file_stringcount = fp + str(devicenumber) + '_count' -file_stringcount5 = fp + str(devicenumber) + '_count5' +initlog("acthor", devicenumber) +log = logging.getLogger("acthor") +file_stringpv = bp + str(devicenumber) + '_pv' +file_stringcount = bp + str(devicenumber) + '_count' +file_stringcount5 = bp + str(devicenumber) + '_count5' count5 = 999 if os.path.isfile(file_stringcount5): - f = open(file_stringcount5, 'r') - count5 = int(f.read()) - f.close() + with open(file_stringcount5, 'r') as f: + count5 = int(f.read()) if (forcesend == 0): count5 = count5 + 1 elif (forcesend == 1): @@ -35,9 +34,8 @@ count5 = 1 if count5 > 3: count5 = 0 -f = open(file_stringcount5, 'w') -f.write(str(count5)) -f.close() +with open(file_stringcount5, 'w') as f: + f.write(str(count5)) faktor = 1.0 modbuswrite = 0 neupower = 0 @@ -55,27 +53,45 @@ faktor = 3000/instpower pvmodus = 0 if os.path.isfile(file_stringpv): - f = open(file_stringpv, 'r') - pvmodus = int(f.read()) - f.close() + with open(file_stringpv, 'r') as f: + pvmodus = int(f.read()) powerc = 0 # aktuelle Leistung lesen client = ModbusTcpClient(ipadr, port=502) # -# start = 1000 -resp=client.read_holding_registers(start,10,unit=1) +resp = client.read_holding_registers(start, 35, unit=1) +# Test only # start = 3524 -# resp = client.read_input_registers(start, 10, unit=1) +# resp = client.read_input_registers(start, 35, unit=1) value1 = resp.registers[0] all = format(value1, '04x') aktpower = int(struct.unpack('>h', codecs.decode(all, 'hex'))[0]) +# Wassertemperatur lesen +# Temp0 Warmwasser 1001 +# Temp1 1030 <- Optional wenn 0, nicht angeschlossen dann ersetzt durch 300 (keine Anzeige) +# Temp2 1031 <- Optional wenn 0, nicht angeschlossen dann ersetzt durch 300 (keine Anzeige) +value1 = resp.registers[1] +all = format(value1, '04x') +temp0int = int(struct.unpack('>h', codecs.decode(all, 'hex'))[0]) +temp0 = temp0int / 10 +value1 = resp.registers[30] +all = format(value1, '04x') +temp1int = int(struct.unpack('>h', codecs.decode(all, 'hex'))[0]) +temp1 = temp1int / 10 +if temp1 == 0: + temp1 = 300 +value1 = resp.registers[31] +all = format(value1, '04x') +temp2int = int(struct.unpack('>h', codecs.decode(all, 'hex'))[0]) +temp2 = temp2int / 10 +if temp2 == 0: + temp2 = 300 if count5 == 0: count1 = 999 if os.path.isfile(file_stringcount): - f = open(file_stringcount, 'r') - count1 = int(f.read()) - f.close() + with open(file_stringcount, 'r') as f: + count1 = int(f.read()) count1 = count1+1 value1 = resp.registers[3] all = format(value1, '04x') @@ -101,10 +117,9 @@ if pvmodus == 99: modbuswrite = 1 neupower = 0 - f = open(file_stringpv, 'w') pvmodus = 0 - f.write(str(pvmodus)) - f.close() + with open(file_stringpv, 'w') as f: + f.write(str(pvmodus)) # sonst wenn pv modus lauft , ueberschuss schicken else: if pvmodus == 1: @@ -112,38 +127,29 @@ # logschreiben if count1 > 80: count1 = 0 + with open(file_stringcount, 'w') as f: + f.write(str(count1)) + # mehr log schreiben if count1 < 3: - if os.path.isfile(file_string): - f = open(file_string, 'a') - else: - f = open(file_string, 'w') - helpstr = '%s devicenr %s ipadr %s ueberschuss %6d Akt Leistung' - helpstr += ' %6d Status %2d type %s inst. Leistung %6d Skalierung %.2f' - print(helpstr % (time_string, devicenumber, ipadr, uberschuss, - aktpower, status, atype, instpower, faktor), file=f) - helpstr = '%s devicenr %s ipadr %s Neu Leistung %6d ' - helpstr += 'pvmodus %1d modbuswrite %1d' - print(helpstr % (time_string, devicenumber, ipadr, neupower, - pvmodus, modbuswrite), file=f) - f.close() + log.info(" watt devicenr %d ipadr %s ueberschuss %6d Akt Leistung %6d Status %2d" % + (devicenumber, ipadr, uberschuss, aktpower, status)) + log.info(" watt devicenr %d ipadr %s Neu Leistung %6d pvmodus %1d modbuswrite %1d" % + (devicenumber, ipadr, neupower, pvmodus, modbuswrite)) + log.info(" watt devicenr %d ipadr %s type %s inst. Leistung %6d Skalierung %.2f" % + (devicenumber, ipadr, atype, instpower, faktor)) # modbus write if modbuswrite == 1: rq = client.write_register(1000, neupower, unit=1) if count1 < 3: - f = open(file_string, 'a') - print('%s devicenr %s ipadr %s device written by modbus ' % - (time_string, devicenumber, ipadr), file=f) - f.close() - f = open(file_stringcount, 'w') - f.write(str(count1)) - f.close() + log.info("watt devicenr %d ipadr %s device written by modbus " % + (devicenumber, ipadr)) else: if pvmodus == 99: pvmodus = 0 answer = '{"power":' + str(aktpower) + ',"powerc":' + str(powerc) answer += ',"send":' + str(modbuswrite) + ',"sendpower":' + str(neupower) +answer += ',"temp0":' + str(temp0) +answer += ',"temp1":' + str(temp1) +answer += ',"temp2":' + str(temp2) answer += ',"on":' + str(pvmodus) + '}' -f1 = open('/var/www/html/openWB/ramdisk/smarthome_device_ret' + - str(devicenumber), 'w') -json.dump(answer, f1) -f1.close() +writeret(answer, devicenumber) diff --git a/runs/usmarthome/smartacthor.py b/runs/usmarthome/smartacthor.py index 5f7feb4ba5..2abb14134b 100644 --- a/runs/usmarthome/smartacthor.py +++ b/runs/usmarthome/smartacthor.py @@ -1,25 +1,32 @@ #!/usr/bin/python3 from usmarthome.smartbase import Sbase from usmarthome.global0 import log +from typing import Dict import subprocess class Sacthor(Sbase): - def __init__(self): + def __init__(self) -> None: # setting super().__init__() print('__init__ Sacthor executed') - self._smart_paramadd = {} + self._smart_paramadd = {} # type: Dict[str, str] self._device_acthortype = 'none' self._device_acthorpower = 'none' self.device_nummer = 0 self._dynregel = 1 - def updatepar(self, input_param): + def updatepar(self, input_param: Dict[str, str]) -> None: super().updatepar(input_param) self._smart_paramadd = input_param.copy() self.device_nummer = int(self._smart_paramadd.get('device_nummer', '0')) + # fest 3 setzen + # Wassertemperatur lesen + # Temp0 Warmwasser 1001 + # Temp1 1030 <- Optional wenn 0, nicht angeschlossen dann ersetzt durch 300 (keine Anzeige) + # Temp2 1031 <- Optional wenn 0, nicht angeschlossen dann ersetzt durch 300 (keine Anzeige) + self.device_temperatur_configured = 3 for key, value in self._smart_paramadd.items(): if (key == 'device_nummer'): pass @@ -29,10 +36,10 @@ def updatepar(self, input_param): self._device_acthorpower = value else: log.warning("(" + str(self.device_nummer) + ") " + - __class__.__name__ + " überlesen " + key + + "Sacthor überlesen " + key + " " + value) - def getwatt(self, uberschuss, uberschussoffset): + def getwatt(self, uberschuss: int, uberschussoffset: int) -> None: self.prewatt(uberschuss, uberschussoffset) forcesend = self.checkbefsend() argumentList = ['python3', self._prefixpy + 'acthor/watt.py', @@ -46,6 +53,18 @@ def getwatt(self, uberschuss, uberschussoffset): self.newwatt = int(self.answer['power']) self.newwattk = int(self.answer['powerc']) self.relais = int(self.answer['on']) + self.temp0 = str(self.answer['temp0']) + with open(self._basePath+'/ramdisk/device' + + str(self.device_nummer) + '_temp0', 'w') as f: + f.write(str(self.temp0)) + self.temp1 = str(self.answer['temp1']) + with open(self._basePath+'/ramdisk/device' + + str(self.device_nummer) + '_temp1', 'w') as f: + f.write(str(self.temp1)) + self.temp2 = str(self.answer['temp2']) + with open(self._basePath+'/ramdisk/device' + + str(self.device_nummer) + '_temp2', 'w') as f: + f.write(str(self.temp2)) self.checksend(self.answer) except Exception as e1: log.warning("(" + str(self.device_nummer) + @@ -54,7 +73,7 @@ def getwatt(self, uberschuss, uberschussoffset): str(self._device_ip), str(e1))) self.postwatt() - def turndevicerelais(self, zustand, ueberschussberechnung, updatecnt): + def turndevicerelais(self, zustand: int, ueberschussberechnung: int, updatecnt: int) -> None: self.preturn(zustand, ueberschussberechnung, updatecnt) if (zustand == 1): pname = "/on.py" diff --git a/web/settings/smarthomeconfig.php b/web/settings/smarthomeconfig.php index 3a3f94c0ae..16ffad99bb 100644 --- a/web/settings/smarthomeconfig.php +++ b/web/settings/smarthomeconfig.php @@ -106,6 +106,7 @@ Mit dem Parameter Updategerät kann eine abweichende Sekundenzahl angegeben werden.
Wenn die Ausschaltbedingung erreicht ist wird einmalig 0 als Überschuss übertragen. Die Ausschaltschwelle/ Ausschaltverzögerung in OpenWB ist sinnvoll zu wählen (z.B. 500 / 3) um die Regelung von Acthor nicht zu stören. + Wenn Acthor als Gerät 1 oder 2 definiert ist, wird die Warmwassertemperatur als Temp1 angezeigt (Modbusadresse 1001). Ebenso wird Temp2 (Modbusadresse 1030) und Temp3 (Modbusadresse 1031) angezeigt (falls angeschlossen). Wp der Firma lambda
@@ -152,6 +153,7 @@ Wenn die Ausschaltbedingung erreicht ist wird einmalig 0 als Überschuss übertragen. Die Ausschaltschwelle/ Ausschaltverzögerung in OpenWB ist sinnvoll zu wählen (z.B. 500 / 3) um die Regelung von Elwa nicht zu stören. Die Warmwassersicherstellung in Elwa kann genutzt werden. OpenWB erkennt dieses am Status und überträgt dann keinen Überschuss. + Wenn Elwa als Gerät 1 oder 2 definiert ist, wird die Warmwassertemperatur als Temp1 angezeigt (Modbusadresse 1001). Wärmepumpe der Firma IDM mit Navigatorregelung 1.7/2.0
From 52a72989846220fb7765c80e26f6e6a74af4e2fc Mon Sep 17 00:00:00 2001 From: Lutz Bender Date: Tue, 3 Jan 2023 11:15:23 +0100 Subject: [PATCH 127/201] allow up to 100% for speichersocminpv --- web/settings/pvconfig.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/settings/pvconfig.html b/web/settings/pvconfig.html index 295368f894..40e9e33e4a 100644 --- a/web/settings/pvconfig.html +++ b/web/settings/pvconfig.html @@ -516,7 +516,7 @@

Einstellungen für Min+PV-Laden

- +
Parameter in Prozent [%] für den Einschalt-SoC der Laderegelung im Modus Min+PV-Laden. Definiert einen Speicher-SoC, der überschritten werden muss, damit die Ladereglung startet. Der Wert 0 schaltet die Funktion aus. Der Einschalt-SoC muss größer als der Ausschalt-SoC sein. Unterhalb des Ausschalt-SoC wird die Ladung nicht freigegeben. From 917d3db994349829512ad7a1cf29c0df250cf550 Mon Sep 17 00:00:00 2001 From: LKuemmel <76958050+LKuemmel@users.noreply.github.com> Date: Tue, 3 Jan 2023 11:25:49 +0100 Subject: [PATCH 128/201] fix isss rfid, daemon (#2571) * fix isss: don't reset rfid, because it will be published only if it is changed * flake 8 * fix daemon mode * fix imported factor * fix local_charge_point_num as modbus id --- .../internal_openwb/chargepoint_module.py | 13 ++++----- packages/modules/common/store/_chargepoint.py | 4 +-- runs/isss.py | 28 +++++++++---------- 3 files changed, 21 insertions(+), 24 deletions(-) diff --git a/packages/modules/chargepoints/internal_openwb/chargepoint_module.py b/packages/modules/chargepoints/internal_openwb/chargepoint_module.py index 8c01930c6c..eda0df578a 100644 --- a/packages/modules/chargepoints/internal_openwb/chargepoint_module.py +++ b/packages/modules/chargepoints/internal_openwb/chargepoint_module.py @@ -8,7 +8,7 @@ from modules.common.component_state import ChargepointState from modules.common.fault_state import ComponentInfo, FaultState from modules.common.modbus import ModbusSerialClient_ -from modules.common.store import ramdisk_read, ramdisk_write +from modules.common.store import ramdisk_read from modules.common import sdm from modules.common import evse from modules.common import b32 @@ -61,20 +61,20 @@ def _check_meter(serial_client: ModbusSerialClient_, meters: List[meter_config]) else: raise Exception("Es konnte keines der Meter in "+str(meters)+" zugeordnet werden.") - meter_client = _check_meter(serial_client, meter_configuration_options[self.local_charge_point_num - 1]) - evse_client = evse.Evse(self.local_charge_point_num, serial_client) + meter_client = _check_meter(serial_client, meter_configuration_options[self.local_charge_point_num]) + evse_client = evse.Evse(self.local_charge_point_num + 1, serial_client) return meter_client, evse_client def get_pins_phase_switch(self, new_phases: int) -> Tuple[int, int]: # return gpio_cp, gpio_relay - if self.local_charge_point_num == 1: + if self.local_charge_point_num == 0: return 22, 29 if new_phases == 1 else 37 else: return 15, 11 if new_phases == 1 else 13 def get_pins_cp_interruption(self) -> int: # return gpio_cp, gpio_relay - if self.local_charge_point_num == 1: + if self.local_charge_point_num == 0: return 22 else: return 15 @@ -112,9 +112,6 @@ def get_values(self, phase_switch_cp_active: bool) -> Tuple[ChargepointState, fl self.__client.read_error = 0 rfid = ramdisk_read("readtag") - # reset tag - if rfid != "0" and plug_state is False: - ramdisk_write("readtag", "0") if phase_switch_cp_active: # Während des Threads wird die CP-Leitung unterbrochen, das EV soll aber als angesteckt betrachtet diff --git a/packages/modules/common/store/_chargepoint.py b/packages/modules/common/store/_chargepoint.py index 5df7e9f7d5..00a79dbff7 100644 --- a/packages/modules/common/store/_chargepoint.py +++ b/packages/modules/common/store/_chargepoint.py @@ -15,9 +15,9 @@ def set(self, cp_state: ChargepointState): charge_point.is_charging.write(cp_state.charge_state) charge_point.voltages.write(cp_state.voltages) charge_point.currents.write(cp_state.currents) - charge_point.energy.write(cp_state.imported) + charge_point.energy.write(cp_state.imported/1000) charge_point.is_plugged.write(cp_state.plug_state) - charge_point.power.write(cp_state.power) + charge_point.power.write(int(cp_state.power)) class ChargepointValueStoreBroker(ValueStore[ChargepointState]): diff --git a/runs/isss.py b/runs/isss.py index 850c2e5056..84c7aa7401 100755 --- a/runs/isss.py +++ b/runs/isss.py @@ -118,7 +118,7 @@ def __init__(self, cp_module: chargepoint_module.ChargepointModule) -> None: self.__set_current_error = 0 def update_state(self) -> None: - if self.cp_module.config.id == 1: + if self.cp_module.config.id == 0: suffix = "" else: suffix = "s1" @@ -196,15 +196,15 @@ class Isss: def __init__(self) -> None: log.debug("Init isss") self.serial_client = ModbusSerialClient_(self.detect_modbus_usb_port()) - self.cp1 = IsssChargepoint(self.serial_client, 1) + self.cp0 = IsssChargepoint(self.serial_client, 0) try: if int(ramdisk_read("issslp2act")) == 1: - self.cp2 = IsssChargepoint(self.serial_client, 2) + self.cp1 = IsssChargepoint(self.serial_client, 1) else: - self.cp2 = None + self.cp1 = None except (FileNotFoundError, ValueError) as e: log.error("Error reading issslp2act! Guessing cp2 is not configured.") - self.cp2 = None + self.cp1 = None self.init_gpio() def init_gpio(self) -> None: @@ -228,9 +228,9 @@ def loop(self) -> None: while True: log.setLevel(MAP_LOG_LEVEL[int(os.environ.get('debug'))]) log.debug("***Start***") - self.cp1.update() - if self.cp2: - self.cp2.update() + self.cp0.update() + if self.cp1: + self.cp1.update() time.sleep(1.1) def detect_modbus_usb_port(self) -> str: @@ -244,7 +244,7 @@ def detect_modbus_usb_port(self) -> str: @staticmethod def get_cp_num(local_charge_point_num: int) -> int: try: - if local_charge_point_num == 1: + if local_charge_point_num == 0: return int(re.sub(r'\D', '', ramdisk_read("parentCPlp1"))) else: return int(re.sub(r'\D', '', ramdisk_read("parentCPlp2"))) @@ -265,15 +265,15 @@ def get_parent_wb() -> str: class IsssChargepoint: def __init__(self, serial_client: ModbusSerialClient_, local_charge_point_num: int) -> None: self.local_charge_point_num = local_charge_point_num - if local_charge_point_num == 1: + if local_charge_point_num == 0: try: with open('/home/pi/ppbuchse', 'r') as f: max_current = int(f.read()) - self.module = socket.Socket(max_current, InternalOpenWB(1, serial_client)) + self.module = socket.Socket(max_current, InternalOpenWB(0, serial_client)) except (FileNotFoundError, ValueError): - self.module = chargepoint_module.ChargepointModule(InternalOpenWB(1, serial_client)) + self.module = chargepoint_module.ChargepointModule(InternalOpenWB(0, serial_client)) else: - self.module = chargepoint_module.ChargepointModule(InternalOpenWB(2, serial_client)) + self.module = chargepoint_module.ChargepointModule(InternalOpenWB(1, serial_client)) self.update_values = UpdateValues(local_charge_point_num) self.update_state = UpdateState(self.module) self.old_plug_state = False @@ -285,7 +285,7 @@ def __thread_active(thread: Optional[threading.Thread]) -> bool: else: return False try: - if self.local_charge_point_num == 2: + if self.local_charge_point_num == 1: time.sleep(0.1) phase_switch_cp_active = __thread_active(self.update_state.cp_interruption_thread) or __thread_active( self.update_state.phase_switch_thread) From e52f25d9b2e9a81b702922b1cf655d3c0e28aa5e Mon Sep 17 00:00:00 2001 From: rleidner <89418596+rleidner@users.noreply.github.com> Date: Tue, 3 Jan 2023 11:41:37 +0100 Subject: [PATCH 129/201] soc_smarteq: fix token comparison, handle missing store file (#2569) Co-authored-by: rleidner --- modules/soc_smarteq/soc_smarteq.py | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/modules/soc_smarteq/soc_smarteq.py b/modules/soc_smarteq/soc_smarteq.py index f6a015d0ee..e5a7921957 100755 --- a/modules/soc_smarteq/soc_smarteq.py +++ b/modules/soc_smarteq/soc_smarteq.py @@ -10,6 +10,7 @@ import pkce import logging import pickle +import copy # Constants BASE_URL = "https://id.mercedes-benz.com" @@ -70,16 +71,12 @@ def __init__(self, storeFile: str): # currently is contains: # Tokens: refresh- and access-tokens of OAUTH # refresh_timestamp: epoch of last refresh_tokens. - self.store = {} - self.store['Tokens'] = {} - self.store['refresh_timestamp'] = int(0) self.session = requests.session() self.load_store() - self.oldTokens = self.store['Tokens'] + self.oldTokens = copy.deepcopy(self.store['Tokens']) self.init = True - self.init = False # test!! def load_store(self): try: @@ -89,8 +86,14 @@ def load_store(self): self.store['Tokens'] = {} self.store['refresh_timestamp'] = int(0) tf.close() + except FileNotFoundError: + self.log.warning("init: no store file found, full reconnect required") + self.store = {} + self.store['Tokens'] = {} + self.store['refresh_timestamp'] = int(0) except Exception as e: self.log.debug("init: loading stored data failed, file: " + self.storeFile) + self.store = {} self.store['Tokens'] = {} self.store['refresh_timestamp'] = int(0) @@ -416,8 +419,8 @@ def fetch_soc(self) -> int: if self.store['Tokens'] != self.oldTokens: self.log.debug("reconnect: tokens changed, store token file") + self.write_store() - self.write_store() return soc From 147a2d739af1bac8c3ef6863da9ae1d441b077f8 Mon Sep 17 00:00:00 2001 From: okaegi Date: Tue, 3 Jan 2023 12:52:42 +0100 Subject: [PATCH 130/201] E3DC Driver... MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Für Openwb 2.0 muss offensichtlich der die type Variable dem Verzeichnissnamen entsprechen , sonst Absturz im Online beim konfigurieren Bei der Verarbeitung des Befehls 'addDevice' mit den Parametern '[object Object]' ist ein Fehler aufgetreten: Es ist ein interner Fehler aufgetreten: Traceback (most recent call last): File "/var/www/html/openWB/packages/helpermodules/command.py", line 112, in on_message func(connection_id, payload) File "/var/www/html/openWB/packages/helpermodules/command.py", line 123, in addDevice dev = importlib.import_module(".devices."+payload["data"]["type"]+".device", "modules") File "/usr/lib/python3.9/importlib/__init__.py", line 127, in import_module return _bootstrap._gcd_import(name[level:], package, level) File "", line 1030, in _gcd_import File "", line 1007, in _find_and_load File "", line 972, in _find_and_load_unlocked File "", line 228, in _call_with_frames_removed File "", line 1030, in _gcd_import File "", line 1007, in _find_and_load File "", line 984, in _find_and_load_unlocked ModuleNotFoundError: No module named 'modules.devices.E3DC' Für openwb 1.9 keine Auswirkungen --- packages/modules/devices/e3dc/config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/modules/devices/e3dc/config.py b/packages/modules/devices/e3dc/config.py index f249addb2b..d238903697 100644 --- a/packages/modules/devices/e3dc/config.py +++ b/packages/modules/devices/e3dc/config.py @@ -12,7 +12,7 @@ def __init__(self, address: str = None): class E3dc: def __init__(self, name: str = "E3DC", - type: str = "E3DC", + type: str = "e3dc", id: int = 0, configuration: E3dcConfiguration = None) -> None: self.name = name From afb4a8b2b1d50ad5402f3f50d2db78b6f752bce8 Mon Sep 17 00:00:00 2001 From: LKuemmel <76958050+LKuemmel@users.noreply.github.com> Date: Wed, 4 Jan 2023 10:31:14 +0100 Subject: [PATCH 131/201] new isss for buchse master (#2550) * new isss for daemon * review * renaming --- .../chargepoints/internal_openwb/socket.py | 13 +- runs/buchse.py | 440 ------------------ runs/initRamdisk.sh | 1 + runs/isss.py | 41 +- runs/services.sh | 51 +- 5 files changed, 56 insertions(+), 490 deletions(-) delete mode 100755 runs/buchse.py diff --git a/packages/modules/chargepoints/internal_openwb/socket.py b/packages/modules/chargepoints/internal_openwb/socket.py index d02b23dd9d..0762db6481 100644 --- a/packages/modules/chargepoints/internal_openwb/socket.py +++ b/packages/modules/chargepoints/internal_openwb/socket.py @@ -48,8 +48,9 @@ class ActorState(IntEnum): class Socket(ChargepointModule): - def __init__(self, max_current: int, config: InternalOpenWB) -> None: - self.max_current = max_current + def __init__(self, socket_max_current: int, config: InternalOpenWB) -> None: + log.debug("Konfiguration als Buchse.") + self.socket_max_current = socket_max_current super().__init__(config) def set_current(self, current: float) -> None: @@ -60,12 +61,12 @@ def set_current(self, current: float) -> None: log.error("Error getting actor status! Using default 'opened'.") actor = ActorState.OPENED - if actor == ActorState.CLOSED: - if current == self.set_current_evse or self.chargepoint_state.plug_state is False: + if actor == ActorState.CLOSED or self.chargepoint_state.plug_state is False: + if current == self.set_current_evse: return else: current = 0 - super().set_current(min(current, self.max_current)) + super().set_current(min(current, self.socket_max_current)) def get_values(self, phase_switch_cp_active: bool) -> Tuple[ChargepointState, float]: try: @@ -94,6 +95,6 @@ def __close_actor(self): def __set_actor(self, open: bool): GPIO.output(23, GPIO.LOW if open else GPIO.HIGH) GPIO.output(26, GPIO.HIGH) - time.sleep(2 if open else 3) + time.sleep(1) GPIO.output(26, GPIO.LOW) log.debug("Actor opened" if open else "Actor closed") diff --git a/runs/buchse.py b/runs/buchse.py deleted file mode 100755 index 1552b4989b..0000000000 --- a/runs/buchse.py +++ /dev/null @@ -1,440 +0,0 @@ -#!/usr/bin/python -import os -import time -import struct -import traceback -from typing import Tuple -import RPi.GPIO as GPIO -from pymodbus.client.sync import ModbusSerialClient -import paho.mqtt.client as mqtt - -basePath = "/var/www/html/openWB" -ramdiskPath = basePath + "/ramdisk" -logFilename = ramdiskPath + "/buchse.log" - -DeviceValues = {} -Values = {} - - -# handling of all logging statements -def log_debug(level: int, msg: str, traceback_str: str = None) -> None: - if level >= loglevel: - with open(logFilename, 'a') as log_file: - log_file.write(time.ctime() + ': ' + msg + '\n') - if traceback_str is not None: - log_file.write(traceback_str + '\n') - - -# write value to file in ramdisk -def write_to_ramdisk(filename: str, content: str) -> None: - with open(ramdiskPath + "/" + filename, "w") as file: - file.write(content) - - -# read value from file in ramdisk -def read_from_ramdisk(filename: str) -> str: - try: - with open(ramdiskPath + "/" + filename, 'r') as file: - return file.read() - except FileNotFoundError: - log_debug(2, "Error reading file '" + filename + "' from ramdisk!", traceback.format_exc()) - return "" - - -def init_gpio() -> None: - GPIO.setwarnings(False) - GPIO.setmode(GPIO.BOARD) - GPIO.setup(37, GPIO.OUT) - GPIO.setup(13, GPIO.OUT) - GPIO.setup(22, GPIO.OUT) - GPIO.setup(29, GPIO.OUT) - GPIO.setup(11, GPIO.OUT) - # GPIOs for socket - GPIO.setup(23, GPIO.OUT) - GPIO.setup(26, GPIO.OUT) - GPIO.setup(19, GPIO.IN, pull_up_down=GPIO.PUD_UP) - - -def init_values() -> None: - global DeviceValues - global Values - # values LP1 - DeviceValues.update({'lp1voltage1': str(5)}) - DeviceValues.update({'lp1voltage2': str(5)}) - DeviceValues.update({'lp1voltage3': str(5)}) - DeviceValues.update({'lp1lla1': str(5)}) - DeviceValues.update({'lp1lla2': str(5)}) - DeviceValues.update({'lp1lla3': str(5)}) - DeviceValues.update({'lp1llkwh': str(5)}) - DeviceValues.update({'lp1watt': str(5)}) - DeviceValues.update({'lp1chargestat': str(5)}) - DeviceValues.update({'lp1plugstat': str(5)}) - DeviceValues.update({'lp1readerror': str(0)}) - Values.update({'lp1plugstat': str(5)}) - Values.update({'lp1chargestat': str(5)}) - Values.update({'lp1evsell': str(1)}) - - -# read all meter values and publish to mqtt broker -def read_meter(): - global evsefailure - global client - global llmeterconfiglp1 - global sdmid - - if (llmeterconfiglp1 == 0): - log_debug(2, "Erkenne verbauten Zaehler.") - # check sdm - try: - resp = client.read_input_registers(0x00, 2, unit=105) - voltage = struct.unpack('>f', struct.pack('>HH', *resp.registers))[0] - if int(voltage) > 20: - llmeterconfiglp1 = 105 - sdmid = 105 - log_debug(2, "SDM Zaehler erkannt") - except AttributeError: - log_debug(2, "SDM check failed", traceback.format_exc()) - # check B23 - try: - resp = client.read_holding_registers(0x5B00, 2, unit=201) - voltage = resp.registers[1] - if int(voltage) > 20: - llmeterconfiglp1 = 201 - sdmid = 201 - log_debug(2, "B23 Zaehler erkannt") - except AttributeError: - log_debug(2, "B23 check failed", traceback.format_exc()) - else: - sdmid = llmeterconfiglp1 - try: - if sdmid < 200: - # SDM - resp = client.read_input_registers(0x0C, 2, unit=sdmid) - lp1llw1 = struct.unpack('>f', struct.pack('>HH', *resp.registers))[0] - lp1llw1 = int(lp1llw1) - resp = client.read_input_registers(0x0E, 2, unit=sdmid) - lp1llw2 = struct.unpack('>f', struct.pack('>HH', *resp.registers))[0] - lp1llw2 = int(lp1llw2) - resp = client.read_input_registers(0x10, 2, unit=sdmid) - lp1llw3 = struct.unpack('>f', struct.pack('>HH', *resp.registers))[0] - lp1llw3 = int(lp1llw3) - lp1llg = lp1llw1 + lp1llw2 + lp1llw3 - if lp1llg < 10: - lp1llg = 0 - write_to_ramdisk("llaktuell", str(lp1llg)) - resp = client.read_input_registers(0x00, 2, unit=sdmid) - voltage = struct.unpack('>f', struct.pack('>HH', *resp.registers))[0] - lp1voltage1 = float("%.1f" % voltage) - write_to_ramdisk("llv1", str(lp1voltage1)) - resp = client.read_input_registers(0x02, 2, unit=sdmid) - voltage = struct.unpack('>f', struct.pack('>HH', *resp.registers))[0] - lp1voltage2 = float("%.1f" % voltage) - write_to_ramdisk("llv2", str(lp1voltage2)) - resp = client.read_input_registers(0x04, 2, unit=sdmid) - voltage = struct.unpack('>f', struct.pack('>HH', *resp.registers))[0] - lp1voltage3 = float("%.1f" % voltage) - write_to_ramdisk("llv3", str(lp1voltage3)) - resp = client.read_input_registers(0x06, 2, unit=sdmid) - lp1lla1 = float(struct.unpack('>f', struct.pack('>HH', *resp.registers))[0]) - lp1lla1 = float("%.1f" % lp1lla1) - write_to_ramdisk("lla1", str(lp1lla1)) - resp = client.read_input_registers(0x08, 2, unit=sdmid) - lp1lla2 = float(struct.unpack('>f', struct.pack('>HH', *resp.registers))[0]) - lp1lla2 = float("%.1f" % lp1lla2) - write_to_ramdisk("lla2", str(lp1lla2)) - resp = client.read_input_registers(0x0A, 2, unit=sdmid) - lp1lla3 = struct.unpack('>f', struct.pack('>HH', *resp.registers))[0] - lp1lla3 = float("%.1f" % lp1lla3) - write_to_ramdisk("lla3", str(lp1lla3)) - resp = client.read_input_registers(0x0156, 2, unit=sdmid) - lp1llkwh = struct.unpack('>f', struct.pack('>HH', *resp.registers))[0] - lp1llkwh = float("%.3f" % lp1llkwh) - write_to_ramdisk("llkwh", str(lp1llkwh)) - resp = client.read_input_registers(0x46, 2, unit=sdmid) - hz = struct.unpack('>f', struct.pack('>HH', *resp.registers))[0] - hz = float("%.2f" % hz) - write_to_ramdisk("llhz", str(hz)) - else: - # B23 - # llkwh - resp = client.read_holding_registers(0x5000, 4, unit=sdmid) - lp1llkwh = struct.unpack('>Q', struct.pack('>HHHH', *resp.registers))[0]/100 - write_to_ramdisk("llkwh", str(lp1llkwh)) - # Voltage - resp = client.read_holding_registers(0x5B00, 2, unit=sdmid) - voltage = resp.registers[1] - lp1voltage1 = float(voltage) / 10 - write_to_ramdisk("llv1", str(lp1voltage1)) - resp = client.read_holding_registers(0x5B02, 2, unit=sdmid) - lp1voltage2 = resp.registers[1] - lp1voltage2 = float(lp1voltage2) / 10 - write_to_ramdisk("llv2", str(lp1voltage2)) - resp = client.read_holding_registers(0x5B04, 2, unit=sdmid) - voltage = resp.registers[1] - lp1voltage3 = float(voltage) / 10 - write_to_ramdisk("llv3", str(lp1voltage3)) - # Ampere - resp = client.read_holding_registers(0x5B0C, 2, unit=sdmid) - amp = resp.registers[1] - lp1lla1 = float(amp) / 100 - write_to_ramdisk("lla1", str(lp1lla1)) - resp = client.read_holding_registers(0x5B0E, 2, unit=sdmid) - amp = resp.registers[1] - lp1lla2 = float(amp) / 100 - write_to_ramdisk("lla2", str(lp1lla2)) - resp = client.read_holding_registers(0x5B10, 2, unit=sdmid) - amp = resp.registers[1] - lp1lla3 = float(amp) / 100 - write_to_ramdisk("lla3", str(lp1lla3)) - # Gesamt watt - resp = client.read_holding_registers(0x5B14, 2, unit=sdmid) - lp1llg = int(struct.unpack('>i', struct.pack('>HH', *resp.registers))[0]/100) - write_to_ramdisk("llaktuell", str(lp1llg)) - # LL Hz - resp = client.read_holding_registers(0x5B2C, 2, unit=sdmid) - hz = float(resp.registers[0]) / 100 - write_to_ramdisk("llhz", str(hz)) - - try: - time.sleep(0.1) - rq = client.read_holding_registers(1000, 1, unit=1) - lp1ll = rq.registers[0] - evsefailure = 0 - except: - lp1ll = 0 - evsefailure = 1 - try: - time.sleep(0.1) - rq = client.read_holding_registers(1002, 1, unit=1) - lp1var = rq.registers[0] - evsefailure = 0 - DeviceValues.update({'lp1readerror': str(0)}) - except: - DeviceValues.update({'lp1readerror': str(int(DeviceValues['lp1readerror'])+1)}) - log_debug(2, "Fehler!", traceback.format_exc()) - lp1var = 5 - evsefailure = 1 - if (lp1var == 5 and int(DeviceValues['lp1readerror']) > MaxEvseError): - log_debug(2, "Anhaltender Fehler beim Auslesen der EVSE von lp1! (" + - str(DeviceValues['lp1readerror']) + ")") - log_debug(2, "Plugstat und Chargestat werden zurückgesetzt.") - Values.update({'lp1plugstat': 0}) - Values.update({'lp1chargestat': 0}) - elif (lp1var == 1): - Values.update({'lp1plugstat': 0}) - Values.update({'lp1chargestat': 0}) - elif (lp1var == 2): - Values.update({'lp1plugstat': 1}) - Values.update({'lp1chargestat': 0}) - elif (lp1var == 3 and lp1ll > 0): - Values.update({'lp1plugstat': 1}) - Values.update({'lp1chargestat': 1}) - elif (lp1var == 3 and lp1ll == 0): - Values.update({'lp1plugstat': 1}) - Values.update({'lp1chargestat': 0}) - write_to_ramdisk("plugstat", str(Values["lp1plugstat"])) - write_to_ramdisk("chargestat", str(Values["lp1chargestat"])) - Values.update({'lp1evsell': lp1ll}) - log_debug(0, "EVSE lp1plugstat: " + str(lp1var) + " EVSE lp1LL: " + str(lp1ll)) - - mclient = mqtt.Client("openWB-buchse-bulkpublisher-" + str(os.getpid())) - mclient.connect("localhost") - mclient.loop(timeout=2.0) - for key in DeviceValues: - if ("lp1watt" in key): - if (DeviceValues[str(key)] != str(lp1llg)): - mclient.publish("openWB/lp/1/W", payload=str(lp1llg), qos=0, retain=True) - mclient.loop(timeout=2.0) - DeviceValues.update({'lp1watt': str(lp1llg)}) - if ("lp1voltage1" in key): - if (DeviceValues[str(key)] != str(lp1voltage1)): - mclient.publish("openWB/lp/1/VPhase1", payload=str(lp1voltage1), qos=0, retain=True) - mclient.loop(timeout=2.0) - DeviceValues.update({'lp1voltage1': str(lp1voltage1)}) - if ("lp1voltage2" in key): - if (DeviceValues[str(key)] != str(lp1voltage2)): - mclient.publish("openWB/lp/1/VPhase2", payload=str(lp1voltage2), qos=0, retain=True) - mclient.loop(timeout=2.0) - DeviceValues.update({'lp1voltage2': str(lp1voltage2)}) - if ("lp1voltage3" in key): - if (DeviceValues[str(key)] != str(lp1voltage3)): - mclient.publish("openWB/lp/1/VPhase3", payload=str(lp1voltage3), qos=0, retain=True) - mclient.loop(timeout=2.0) - DeviceValues.update({'lp1voltage3': str(lp1voltage3)}) - if ("lp1lla1" in key): - if (DeviceValues[str(key)] != str(lp1lla1)): - mclient.publish("openWB/lp/1/APhase1", payload=str(lp1lla1), qos=0, retain=True) - mclient.loop(timeout=2.0) - DeviceValues.update({'lp1lla1': str(lp1lla1)}) - if ("lp1lla2" in key): - if (DeviceValues[str(key)] != str(lp1lla2)): - mclient.publish("openWB/lp/1/APhase2", payload=str(lp1lla2), qos=0, retain=True) - mclient.loop(timeout=2.0) - DeviceValues.update({'lp1lla2': str(lp1lla2)}) - if ("lp1lla3" in key): - if (DeviceValues[str(key)] != str(lp1lla3)): - mclient.publish("openWB/lp/1/APhase3", payload=str(lp1lla3), qos=0, retain=True) - mclient.loop(timeout=2.0) - DeviceValues.update({'lp1lla3': str(lp1lla3)}) - if ("lp1llkwh" in key): - if (DeviceValues[str(key)] != str(lp1llkwh)): - mclient.publish("openWB/lp/1/kWhCounter", payload=str(lp1llkwh), qos=0, retain=True) - mclient.loop(timeout=2.0) - DeviceValues.update({'lp1llkwh': str(lp1llkwh)}) - if ("lp1plugstat" in key): - if (DeviceValues[str(key)] != Values["lp1plugstat"]): - mclient.publish("openWB/lp/1/boolPlugStat", payload=Values["lp1plugstat"], qos=0, retain=True) - mclient.loop(timeout=2.0) - DeviceValues.update({'lp1plugstat': Values["lp1plugstat"]}) - if ("lp1chargestat" in key): - if (DeviceValues[str(key)] != Values["lp1chargestat"]): - mclient.publish("openWB/lp/1/boolChargeStat", payload=Values["lp1chargestat"], qos=0, retain=True) - mclient.loop(timeout=2.0) - DeviceValues.update({'lp1chargestat': Values["lp1chargestat"]}) - mclient.disconnect() - except Exception: - log_debug(2, "Get meter Fehler!", traceback.format_exc()) - - -# control of socket lock -# GPIO 23: control direction of lock motor -# GPIO 26: power to lock motor -def set_socket_actuator(action): - if action == "auf": - GPIO.output(23, GPIO.LOW) - GPIO.output(26, GPIO.HIGH) - time.sleep(2) - GPIO.output(26, GPIO.LOW) - log_debug(1, "Aktor auf") - if action == "zu": - GPIO.output(23, GPIO.HIGH) - GPIO.output(26, GPIO.HIGH) - time.sleep(3) - GPIO.output(26, GPIO.LOW) - log_debug(1, "Aktor zu") - - -# get actual socket lock state -def get_socket_state() -> int: - actorstat_tmp = GPIO.input(19) - if actorstat_tmp == GPIO.LOW: - return 1 - else: - return 0 - - -# get all values to control our chargepoint -def load_control_values(): - global actorstat - global lp1solla - global u1p3pstat - global u1p3ptmpstat - global evsefailure - - actorstat = get_socket_state() - try: - lp1solla = int(read_from_ramdisk("llsoll")) - except ValueError: - lp1solla = 0 - log_debug(0, "LL Soll: " + str(lp1solla) + " ActorStatus: " + str(actorstat)) - if socket_configured: - if (evsefailure == 0): - if (Values["lp1plugstat"] == 1): - if (actorstat == 0): - set_socket_actuator("zu") - if (Values["lp1plugstat"] == 0): - if (actorstat == 1): - writelp1evse(0) - set_socket_actuator("auf") - if (actorstat == 1): - if (Values["lp1evsell"] != lp1solla and Values["lp1plugstat"] == 1): - writelp1evse(lp1solla) - else: - if (Values["lp1evsell"] != 0): - writelp1evse(0) - else: - if (Values["lp1evsell"] != lp1solla): - writelp1evse(lp1solla) - try: - u1p3ptmpstat = int(read_from_ramdisk("u1p3pstat")) - except ValueError: - u1p3ptmpstat = 3 - try: - u1p3pstat - except: - u1p3pstat = 3 - u1p3pstat = switch_phases_cp1(u1p3ptmpstat, u1p3pstat) - - -def __switch_phases(gpio_cp: int, gpio_relay: int): - GPIO.output(gpio_cp, GPIO.HIGH) # CP on - GPIO.output(gpio_relay, GPIO.HIGH) # 3 on/off - time.sleep(2) - GPIO.output(gpio_relay, GPIO.LOW) # 3 on/off - time.sleep(5) - GPIO.output(gpio_cp, GPIO.LOW) # CP off - time.sleep(1) - - -def switch_phases_cp1(new_phases: int, old_phases: int) -> int: - if (new_phases != old_phases): - log_debug(1, "switching phases on cp1: old=" + str(old_phases) + " new=" + str(new_phases)) - gpio_cp = 22 - if (new_phases == 1): - gpio_relay = 29 - else: - gpio_relay = 37 - __switch_phases(gpio_cp, gpio_relay) - else: - log_debug(0, "no need to switch phases on cp1: old=" + str(old_phases) + " new=" + str(new_phases)) - return new_phases - - -def writelp1evse(lla): - if (lla > pp): - lla = pp - client.write_registers(1000, lla, unit=1) - log_debug(1, "Write to EVSE lp1 " + str(lla)) - - -# check for "openWB Buchse" -def check_for_socket() -> Tuple[bool, int]: - try: - with open('/home/pi/ppbuchse', 'r') as value: - pp_value = int(value.read()) - except (FileNotFoundError, ValueError): - pp_value = 32 - # here we always have a socket - socket_is_configured = True - log_debug(1, "check for socket: " + str(socket_is_configured) + " " + str(pp_value)) - return [socket_is_configured, pp_value] - - -# guess USB/modbus device name -def detect_modbus_usb_port() -> str: - try: - with open("/dev/ttyUSB0"): - return "/dev/ttyUSB0" - except FileNotFoundError: - return "/dev/serial0" - - -loglevel = 1 - -MaxEvseError = 5 -sdmid = 105 -actorstat = 0 -evsefailure = 0 -llmeterconfiglp1 = 0 - -init_gpio() -init_values() -socket_configured, pp = check_for_socket() -seradd = detect_modbus_usb_port() -# connect with USB/modbus device -with ModbusSerialClient(method="rtu", port=seradd, baudrate=9600, stopbits=1, bytesize=8, timeout=1) as client: - # start our control loop - while True: - read_meter() - load_control_values() - time.sleep(1) diff --git a/runs/initRamdisk.sh b/runs/initRamdisk.sh index c3fc53f58b..ffe5f85d89 100755 --- a/runs/initRamdisk.sh +++ b/runs/initRamdisk.sh @@ -373,6 +373,7 @@ initRamdisk(){ echo 0 > $RamdiskPath/socketApproved echo 0 > $RamdiskPath/socketActivated echo 0 > $RamdiskPath/socketActivationRequested + echo "unknown" > $RamdiskPath/prev_isss_mode # diverse Dateien echo 0 > $RamdiskPath/AllowedTotalCurrentPerPhase diff --git a/runs/isss.py b/runs/isss.py index 84c7aa7401..e0fa579027 100755 --- a/runs/isss.py +++ b/runs/isss.py @@ -1,20 +1,22 @@ #!/usr/bin/python +from enum import Enum import logging import os import re +import sys import threading import time -from typing import Dict, List, Optional +from typing import List, Optional import RPi.GPIO as GPIO from helpermodules.pub import pub_single -from helpermodules import compatibility from modules.common.store import ramdisk_read, ramdisk_write from modules.common.store._util import get_rounding_function_by_digits from modules.common.fault_state import FaultState from modules.common.component_state import ChargepointState from modules.common.modbus import ModbusSerialClient_ -from modules.chargepoints.internal_openwb import chargepoint_module, socket +from modules.chargepoints.internal_openwb import chargepoint_module +from modules.chargepoints.internal_openwb.socket import Socket from modules.chargepoints.internal_openwb.chargepoint_module import InternalOpenWB basePath = "/var/www/html/openWB" @@ -23,6 +25,12 @@ MAP_LOG_LEVEL = [logging.ERROR, logging.WARNING, logging.DEBUG] +class IsssMode(Enum): + SOCKET = "socket" + DUO = "duo" + DAEMON = "daemon" + + logging.basicConfig(filename=ramdiskPath+'/isss.log', format='%(asctime)s - {%(name)s:%(lineno)s} - %(levelname)s - %(message)s', level=MAP_LOG_LEVEL[int(os.environ.get('debug'))]) @@ -193,17 +201,14 @@ def __thread_cp_interruption(self, duration: int) -> None: class Isss: - def __init__(self) -> None: + def __init__(self, mode: IsssMode, socket_max_current: int) -> None: log.debug("Init isss") self.serial_client = ModbusSerialClient_(self.detect_modbus_usb_port()) - self.cp0 = IsssChargepoint(self.serial_client, 0) - try: - if int(ramdisk_read("issslp2act")) == 1: - self.cp1 = IsssChargepoint(self.serial_client, 1) - else: - self.cp1 = None - except (FileNotFoundError, ValueError) as e: - log.error("Error reading issslp2act! Guessing cp2 is not configured.") + self.cp0 = IsssChargepoint(self.serial_client, 0, mode, socket_max_current) + if mode == IsssMode.DUO: + log.debug("Zweiter Ladepunkt für Duo konfiguriert.") + self.cp1 = IsssChargepoint(self.serial_client, 1, mode, socket_max_current) + else: self.cp1 = None self.init_gpio() @@ -263,14 +268,12 @@ def get_parent_wb() -> str: class IsssChargepoint: - def __init__(self, serial_client: ModbusSerialClient_, local_charge_point_num: int) -> None: + def __init__(self, serial_client: ModbusSerialClient_, local_charge_point_num: int, mode: IsssMode, socket_max_current: int) -> None: self.local_charge_point_num = local_charge_point_num if local_charge_point_num == 0: - try: - with open('/home/pi/ppbuchse', 'r') as f: - max_current = int(f.read()) - self.module = socket.Socket(max_current, InternalOpenWB(0, serial_client)) - except (FileNotFoundError, ValueError): + if mode == IsssMode.SOCKET: + self.module = Socket(socket_max_current, InternalOpenWB(0, serial_client)) + else: self.module = chargepoint_module.ChargepointModule(InternalOpenWB(0, serial_client)) else: self.module = chargepoint_module.ChargepointModule(InternalOpenWB(1, serial_client)) @@ -297,4 +300,4 @@ def __thread_active(thread: Optional[threading.Thread]) -> bool: log.exception("Fehler bei Ladepunkt "+str(self.local_charge_point_num)) -Isss().loop() +Isss(IsssMode(sys.argv[1]), int(sys.argv[2])).loop() diff --git a/runs/services.sh b/runs/services.sh index c64db615f3..c8492e6ac0 100755 --- a/runs/services.sh +++ b/runs/services.sh @@ -63,18 +63,37 @@ start() { fi - if (( isss == 1 )) || [[ "$evsecon" == "daemon" ]]; then - openwbDebugLog "MAIN" 1 "external openWB or daemon mode configured" - if pgrep -f '^python.*/isss.py' > /dev/null + if (( isss == 1 )) || [[ "$evsecon" == "daemon" ]] || [[ "$evsecon" == "buchse" ]]; then + if [[ "$evsecon" == "buchse" ]]; then + isss_mode="socket" + elif [[ $lastmanagement == 1 ]]; then + isss_mode="duo" + else + isss_mode="daemon" + fi + prev_isss_mode=$(< $OPENWBBASEDIR/ramdisk/isss_mode) + + openwbDebugLog "MAIN" 1 "external openWB, daemon mode or socket mode configured" + if pgrep -f '^python.*/isss.py' > /dev/null && [[ $prev_isss_mode == $isss_mode ]]; then openwbDebugLog "MAIN" 1 "isss handler already running" else - openwbDebugLog "MAIN" 0 "isss handler not running! restarting process" - echo "$lastmanagement" > "$OPENWBBASEDIR/ramdisk/issslp2act" - nohup python3 "$OPENWBBASEDIR/runs/isss.py" >>"$OPENWBBASEDIR/ramdisk/isss.log" 2>&1 & + openwbDebugLog "MAIN" 0 "Start/restart isss handler in mode $isss_mode." + if [ -f /home/pi/ppbuchse ]; then + ppbuchse=$(< /home/pi/ppbuchse) + re='^[0-9]+$' + if ! [[ $ppbuchse =~ $re ]] ; then + openwbDebugLog "MAIN" 0 "Invalid value in ppbuchse. Set ppbuchse to 32." + ppbuchse=32 + fi + else + ppbuchse=32 + fi + nohup python3 "$OPENWBBASEDIR/runs/isss.py" "$isss_mode" "$ppbuchse">>"$OPENWBBASEDIR/ramdisk/isss.log" 2>&1 & fi + echo "$isss_mode" > $OPENWBBASEDIR/ramdisk/isss_mode else - openwbDebugLog "MAIN" 1 "external openWB or daemon mode not configured; checking network setup" + openwbDebugLog "MAIN" 1 "external openWB, daemon mode or socket mode not configured; checking network setup" local ethstate=$( /home/pi/ppbuchse - - if pgrep -f '^python.*/buchse.py' > /dev/null - then - openwbDebugLog "MAIN" 1 "socket handler already running" - else - openwbDebugLog "MAIN" 0 "socket handler not running! restarting process" - nohup python3 "$OPENWBBASEDIR/runs/buchse.py" >> "$OPENWBBASEDIR/ramdisk/openWB.log" 2>&1 & - fi - else - sudo pkill -f '^python.*/buchse.py' - fi - rseSetup "$rseenabled" 0 pushButtonsSetup "$ladetaster" 0 From 691fafdab79923200127106da02181f71487c21f Mon Sep 17 00:00:00 2001 From: LKuemmel <76958050+LKuemmel@users.noreply.github.com> Date: Wed, 4 Jan 2023 12:09:10 +0100 Subject: [PATCH 132/201] Bump version 1.9.290 --- web/version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/version b/web/version index cbf5776325..47d6740bf5 100644 --- a/web/version +++ b/web/version @@ -1 +1 @@ -1.9.289 +1.9.290 From 2d92eb59ee2af3ad8e93ac4bf4c5172cf58114a9 Mon Sep 17 00:00:00 2001 From: LKuemmel <76958050+LKuemmel@users.noreply.github.com> Date: Wed, 4 Jan 2023 12:13:06 +0100 Subject: [PATCH 133/201] Bump version 1.9.291 --- web/version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/version b/web/version index 47d6740bf5..68d05d0d27 100644 --- a/web/version +++ b/web/version @@ -1 +1 @@ -1.9.290 +1.9.291 From 487722b472e5412c8bea55742ee51a5af3caf11e Mon Sep 17 00:00:00 2001 From: LKuemmel Date: Fri, 6 Jan 2023 14:36:52 +0100 Subject: [PATCH 134/201] batterx: fix ids --- packages/modules/common/fault_state.py | 3 ++- packages/modules/devices/batterx/device.py | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/modules/common/fault_state.py b/packages/modules/common/fault_state.py index e87fd7d93d..8f5c36096a 100644 --- a/packages/modules/common/fault_state.py +++ b/packages/modules/common/fault_state.py @@ -45,13 +45,14 @@ def store_error(self, component_info: ComponentInfo) -> None: if ramdisk: topic = component_type.type_topic_mapping_comp(component_info.type) prefix = "openWB/set/" + topic + "/" - if component_info.id is not None: + if component_info.type != "counter" and component_info.type != "bat": if component_type == "vehicle": prefix += str(component_info.id) + "/socFault" else: prefix += str(component_info.id) + "/fault" else: prefix += "fault" + log.debug(prefix + "Str") pub.pub_single(prefix + "Str", self.fault_str, hostname=component_info.hostname) pub.pub_single(prefix + "State", self.fault_state.value, hostname=component_info.hostname) if "chargepoint" in component_info.type: diff --git a/packages/modules/devices/batterx/device.py b/packages/modules/devices/batterx/device.py index 178daa7d05..99566e2bf0 100644 --- a/packages/modules/devices/batterx/device.py +++ b/packages/modules/devices/batterx/device.py @@ -87,9 +87,9 @@ def read_legacy( dev = Device(device_config) dev = _add_component(dev, component_type, num) if evu_counter == "bezug_batterx": - dev = _add_component(dev, "counter", None) + dev = _add_component(dev, "counter", 0) if bat == "speicher_batterx": - dev = _add_component(dev, "bat", None) + dev = _add_component(dev, "bat", 3) log.debug('BatterX IP-Adresse: ' + ip_address) From 4092831f5c8a878de248d0182b0bacbe442ea8f8 Mon Sep 17 00:00:00 2001 From: LKuemmel Date: Fri, 6 Jan 2023 15:46:04 +0100 Subject: [PATCH 135/201] remove unneccessary log msg --- packages/modules/common/fault_state.py | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/modules/common/fault_state.py b/packages/modules/common/fault_state.py index 8f5c36096a..c45c25243e 100644 --- a/packages/modules/common/fault_state.py +++ b/packages/modules/common/fault_state.py @@ -52,7 +52,6 @@ def store_error(self, component_info: ComponentInfo) -> None: prefix += str(component_info.id) + "/fault" else: prefix += "fault" - log.debug(prefix + "Str") pub.pub_single(prefix + "Str", self.fault_str, hostname=component_info.hostname) pub.pub_single(prefix + "State", self.fault_state.value, hostname=component_info.hostname) if "chargepoint" in component_info.type: From d7581537eb3a825a265004aa5ad9cbdffcbb9fad Mon Sep 17 00:00:00 2001 From: Lutz Bender Date: Fri, 25 Nov 2022 08:23:10 +0100 Subject: [PATCH 136/201] add footer to main page --- web/themes/EvenDarker/style.css | 2 +- web/themes/EvenDarker/theme.html | 7 ++++++- web/themes/Gauges/style.css | 2 +- web/themes/Gauges/theme.html | 7 ++++++- web/themes/dark/style.css | 2 +- web/themes/dark/theme.html | 7 ++++++- web/themes/standard/style.css | 2 +- 7 files changed, 22 insertions(+), 7 deletions(-) diff --git a/web/themes/EvenDarker/style.css b/web/themes/EvenDarker/style.css index a13cb8d493..db7090ebd9 100644 --- a/web/themes/EvenDarker/style.css +++ b/web/themes/EvenDarker/style.css @@ -14,7 +14,7 @@ body { color: white; } body > .container { - padding: 55px 15px 0; + padding: 55px 15px 25px; } @keyframes alertPulsation { diff --git a/web/themes/EvenDarker/theme.html b/web/themes/EvenDarker/theme.html index 30c86d5595..b5482e8a18 100644 --- a/web/themes/EvenDarker/theme.html +++ b/web/themes/EvenDarker/theme.html @@ -98,7 +98,7 @@ } var themeCookie = getCookie('openWBTheme'); // include special Theme style - $('head').append(''); + $('head').append(''); @@ -1191,6 +1191,11 @@

Manuelle SoC-Eingabe - Ladepunkt +
+ openWB - die modulare Wallbox +
+ @@ -1235,6 +1235,11 @@

Achtung

+
+
+ openWB - die modulare Wallbox +
+
@@ -1188,6 +1188,11 @@

Manuelle SoC-Eingabe - Ladepunkt +
+ openWB - die modulare Wallbox +
+ + +
+ + + + + + +
+ + PIKO 8.3 +
+ WittlerPV (15) + + + 		Logo
+ + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ AC-Leistung  + Energie
+ aktuell + xxx  W + Gesamtenergie + 42906  kWh 
+   +    + Tagesenergie + 0  kWh 
+ Status + Aus 
+ + + +
+
+ PV-Generator  + Ausgangsleistung  
+ String 1   + L1   
+ Spannung + xxx  V + Spannung + xxx  V 
  + Strom + xxx  A + Leistung + xxx  W 
+ String 2   + L2   
+ Spannung + xxx  V + Spannung + xxx  V 
  + Strom + xxx  A + Leistung + xxx  W 
+    + L3   
+ +   + + Spannung + xxx  V 
  + +   + + Leistung + xxx  W 
+ + + +
+
+ + + + + + +
+ RS485 Kommunikation
+ Wechselrichter  + + +
+ + +
+ + + + + + +
+ + Historie +     + Infoseite +     + +     + + + + Einstellungen
+
+ + From 23deb8800142159edd76fec2624c17b5bb9f0550 Mon Sep 17 00:00:00 2001 From: Lutz Bender Date: Tue, 20 Dec 2022 09:09:54 +0100 Subject: [PATCH 182/201] do not stop charging on additional charge points --- nurpv.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nurpv.sh b/nurpv.sh index c6b23d6c32..3b4d3e3bcf 100755 --- a/nurpv.sh +++ b/nurpv.sh @@ -97,10 +97,10 @@ nurpvlademodus(){ fi fi if grep -q 0 "/var/www/html/openWB/ramdisk/ladestatus"; then - if (( ladestatuss1 == 1 )) || (( ladestatuss2 == 1 )); then - runs/set-current.sh 0 all - openwbDebugLog "CHARGESTAT" 0 "alle Ladepunkte, Lademodus NurPV. Ladung gestoppt" - fi + # if (( ladestatuss1 == 1 )) || (( ladestatuss2 == 1 )); then + # runs/set-current.sh 0 all + # openwbDebugLog "CHARGESTAT" 0 "alle Ladepunkte, Lademodus NurPV. Ladung gestoppt" + # fi openwbDebugLog "MAIN" 1 "Überschuss $uberschuss; mindestens $mindestuberschussphasen" if (( mindestuberschussphasen <= uberschuss )); then openwbDebugLog "PV" 0 "Überschuss $uberschuss ist größer als nötiger Überschuss, Wert: $mindestuberschussphasen" From b4d6718574165ade178b899d60480c17bc8d3d64 Mon Sep 17 00:00:00 2001 From: okaegi Date: Wed, 14 Dec 2022 18:23:19 +0100 Subject: [PATCH 183/201] Elwa Warmwassertemperatur... Die ausgelesene Temperatur ist in 0.1 Gradeinheiten. Somit braucht es noch einen /10 --- modules/smarthome/elwa/watt.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/smarthome/elwa/watt.py b/modules/smarthome/elwa/watt.py index 51d4586776..d673047858 100644 --- a/modules/smarthome/elwa/watt.py +++ b/modules/smarthome/elwa/watt.py @@ -40,7 +40,8 @@ # Wassertemperatur lesen value1 = resp.registers[1] all = format(value1, '04x') -temp0 = int(struct.unpack('>h', codecs.decode(all, 'hex'))[0]) +temp0int = int(struct.unpack('>h', codecs.decode(all, 'hex'))[0]) +temp0 = float(temp0int) / 10 count5 = 999 if os.path.isfile(file_stringcount5): with open(file_stringcount5, 'r') as f: From 6ccbca643935542f91e7efb4c00cf04c2c9b9d51 Mon Sep 17 00:00:00 2001 From: okaegi Date: Fri, 16 Dec 2022 12:22:07 +0100 Subject: [PATCH 184/201] =?UTF-8?q?=C3=84nderung=20=C3=BCbernommen?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/smarthome/elwa/watt.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/smarthome/elwa/watt.py b/modules/smarthome/elwa/watt.py index d673047858..625153a726 100644 --- a/modules/smarthome/elwa/watt.py +++ b/modules/smarthome/elwa/watt.py @@ -41,7 +41,7 @@ value1 = resp.registers[1] all = format(value1, '04x') temp0int = int(struct.unpack('>h', codecs.decode(all, 'hex'))[0]) -temp0 = float(temp0int) / 10 +temp0 = temp0int / 10 count5 = 999 if os.path.isfile(file_stringcount5): with open(file_stringcount5, 'r') as f: From 1a09f9996b1dd452f7289c9c98cd987ab8e8f87a Mon Sep 17 00:00:00 2001 From: okaegi Date: Mon, 19 Dec 2022 10:41:13 +0100 Subject: [PATCH 185/201] =?UTF-8?q?Leistungsmessung=20=C3=BCber=20Lovato?= =?UTF-8?q?=20Z=C3=A4hler=20f=C3=BCr=20Smarthome?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Neu wird der Lovato Zähler als separate Leistungsmessung unterstützt. Ebenso wurde auf static Types umgestellt. sdm120, sdm630 und Lovato Zähler werden aus openWB 2.0 Verzeichnis genommen Neu werden diese Zähler für Smarthome aus dem Openwb 2.0 Verzeischniss aufgerufen. Die separaten verzeichnisse unter Smarthome wurden gelöscht. Anpassung wegen static Types --- modules/smarthome/sdm120/sdm120.py | 33 ------- modules/smarthome/sdm630/sdm630.py | 33 ------- runs/mqttsub.py | 2 +- runs/usmarthome/smartbase.py | 80 ++++++++-------- runs/usmarthome/smartmeas.py | 147 ++++++++++++++++------------- web/settings/smarthomeconfig.php | 9 +- 6 files changed, 132 insertions(+), 172 deletions(-) delete mode 100644 modules/smarthome/sdm120/sdm120.py delete mode 100644 modules/smarthome/sdm630/sdm630.py diff --git a/modules/smarthome/sdm120/sdm120.py b/modules/smarthome/sdm120/sdm120.py deleted file mode 100644 index 2f5ac4fa50..0000000000 --- a/modules/smarthome/sdm120/sdm120.py +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/python3 -import sys -import os -import time -import getopt -import socket -import struct -import binascii -import json -devicenumber = str(sys.argv[1]) -seradd = str(sys.argv[2]) -sdmid = int(sys.argv[3]) -port = int(sys.argv[4]) - -from pymodbus.client.sync import ModbusTcpClient - -client = ModbusTcpClient(seradd, port=port) - -#KWH Total Import -resp = client.read_input_registers(0x0048,2, unit=sdmid) -vwh = struct.unpack('>f',struct.pack('>HH',*resp.registers)) -vwh2 = float("%.3f" % vwh[0]) * int(1000) -vwh3 = str(vwh2) - -#Aktueller Verbrauch -resp = client.read_input_registers(0x000C,2, unit=sdmid) -watti = struct.unpack('>f',struct.pack('>HH',*resp.registers)) -watt = int(watti[0]) - -answer = '{"power":' + str(watt) + ',"powerc":' + str(vwh3) + '} ' -f1 = open('/var/www/html/openWB/ramdisk/smarthome_device_ret' + str(devicenumber), 'w') -json.dump(answer,f1) -f1.close() diff --git a/modules/smarthome/sdm630/sdm630.py b/modules/smarthome/sdm630/sdm630.py deleted file mode 100644 index c0a5709586..0000000000 --- a/modules/smarthome/sdm630/sdm630.py +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/python3 -import sys -import os -import time -import getopt -import socket -import struct -import binascii -import json -devicenumber = str(sys.argv[1]) -seradd = str(sys.argv[2]) -sdmid = int(sys.argv[3]) -port = int(sys.argv[4]) - -from pymodbus.client.sync import ModbusTcpClient - -client = ModbusTcpClient(seradd, port=port) - -#KWH Total Import -resp = client.read_input_registers(0x0156,2, unit=sdmid) -vwh = struct.unpack('>f',struct.pack('>HH',*resp.registers)) -vwh2 = float("%.3f" % vwh[0]) * int(1000) -vwh3 = str(vwh2) - -#Aktueller Verbrauch -resp = client.read_input_registers(0x0034,2, unit=sdmid) -watti = struct.unpack('>f',struct.pack('>HH',*resp.registers)) -watt = int(watti[0]) - -answer = '{"power":' + str(watt) + ',"powerc":' + str(vwh3) + '} ' -f1 = open('/var/www/html/openWB/ramdisk/smarthome_device_ret' + str(devicenumber), 'w') -json.dump(answer,f1) -f1.close() diff --git a/runs/mqttsub.py b/runs/mqttsub.py index 7d9de345d5..fd223f8305 100755 --- a/runs/mqttsub.py +++ b/runs/mqttsub.py @@ -197,7 +197,7 @@ def on_message(client, userdata, msg): client.publish("openWB/config/get/SmartHome/Devices/"+str(devicenumb)+"/device_type", msg.payload.decode("utf-8"), qos=0, retain=True) if (( "openWB/config/set/SmartHome/Device" in msg.topic) and ("device_measureType" in msg.topic)): devicenumb=re.sub(r'\D', '', msg.topic) - validDeviceMeasureTypes = ['shelly','tasmota','http','mystrom','sdm630','we514','fronius','json','avm','mqtt','sdm120','smaem'] # 'pyt' is deprecated and will be removed! + validDeviceMeasureTypes = ['shelly','tasmota','http','mystrom','sdm630','lovato','we514','fronius','json','avm','mqtt','sdm120','smaem'] # 'pyt' is deprecated and will be removed! if ( 1 <= int(devicenumb) <= numberOfSupportedDevices and len(str(msg.payload.decode("utf-8"))) > 2): try: deviceMeasureTypeIndex = validDeviceMeasureTypes.index(msg.payload.decode("utf-8")) diff --git a/runs/usmarthome/smartbase.py b/runs/usmarthome/smartbase.py index 2a4709b783..bd9293d707 100644 --- a/runs/usmarthome/smartbase.py +++ b/runs/usmarthome/smartbase.py @@ -1,9 +1,10 @@ #!/usr/bin/python3 import time import os +from typing import Dict, Tuple, Any from usmarthome.global0 import log from usmarthome.smartbase0 import Sbase0 -from usmarthome.smartmeas import Slsdm630, Slsdm120, Slwe514, Slfronius +from usmarthome.smartmeas import Slsdm630, Sllovato, Slsdm120, Slwe514, Slfronius from usmarthome.smartmeas import Sljson, Slsmaem, Slshelly, Sltasmota, Slmqtt from usmarthome.smartmeas import Slhttp, Slavm, Slmystrom from usmarthome.smartbut import Sbshelly @@ -22,12 +23,12 @@ class Sbase(Sbase0): nureinschaltinsec = 0 eindevstatus = 0 - def __init__(self): + def __init__(self) -> None: # setting super().__init__() print('__init__ Sbase executed') - self.mqtt_param = {} - self.mqtt_param_del = {} + self.mqtt_param = {} # type: Dict[str, str] + self.mqtt_param_del = {} # type: Dict[str, str] self.device_name = 'none' self.devstatus = 10 # (10 = ueberschuss gesteuert oder manual, @@ -53,7 +54,7 @@ def __init__(self): self.newdevice_manual = 0 self.newdevice_manual_control = 0 self.device_type = 'none' - self._smart_param = {} + self._smart_param = {} # type: Dict[str, str] self._uberschussoffset = 0 self._uberschuss = 0 self.device_canswitch = 0 @@ -75,9 +76,9 @@ def __init__(self): self._device_ip = 'none' self._device_measuretype = 'none' self._device_measureip = 'none' - self._device_measureportsdm = '8899' - self._device_dacport = '8899' - self._device_measureid = '0' + self._device_measureportsdm = 8899 + self._device_dacport = 8899 + self._device_measureid = 0 self._device_finishtime = '00:00' self._device_starttime = '00:00' self._device_endtime = '00:00' @@ -89,8 +90,8 @@ def __init__(self): self._device_pbtype = 'none' self._device_lambdaueb = 'UP' self._old_pbtype = 'none' - self._mydevicepb = 'none' - self._oldrelais = '2' + self._mydevicepb = 'none' # type: Any + self._oldrelais = 2 self._oldwatt = 0 self._device_chan = 0 self._device_updatesec = 0 @@ -123,12 +124,13 @@ def __init__(self): self.device_setauto = 0 self.gruppe = 'none' self.btchange = 0 + self._mydevicemeasure = 'none' # type: Any - def __del__(self): + def __del__(self) -> None: print('__del__ Sbase executed ') - def prewatt(self, uberschuss, uberschussoffset): + def prewatt(self, uberschuss: int, uberschussoffset: int) -> None: self._uberschuss = uberschuss self._uberschussoffset = uberschussoffset if (self._deviceconfiguredold == "9") and (self._deviceconfigured == @@ -154,7 +156,7 @@ def prewatt(self, uberschuss, uberschussoffset): # prepare end self.getueb() - def postwatt(self): + def postwatt(self) -> None: (self.newwatt, self.newwattk) = self.sepwatt(self.newwatt, self.newwattk) # bei reiner Leistungsmessung relais nur nach Watt setzten @@ -168,7 +170,7 @@ def postwatt(self): self.relais = 0 self.mqtt_param = {} pref = 'openWB/SmartHome/Devices/' + str(self.device_nummer) + '/' - self.mqtt_param[pref + 'RelayStatus'] = self.relais + self.mqtt_param[pref + 'RelayStatus'] = str(self.relais) if (self.c_mantime_f == 'Y') and (self.device_manual != 1): # nach Ausschalten manueller Modus mindestens 30 Sek + # max( ausschaltverzögerung,mindeseinschaltdauer @@ -226,7 +228,7 @@ def postwatt(self): else: self.c_oldstampeinschaltdauer = 0 self.c_oldstampeinschaltdauer_f = 'N' - self.mqtt_param[pref + 'RunningTimeToday'] = self.runningtime + self.mqtt_param[pref + 'RunningTimeToday'] = str(self.runningtime) # Einschaltzeit des Relais setzen if (self._oldrelais == 0): if (self.relais == 1): @@ -242,9 +244,9 @@ def postwatt(self): self.mqtt_param[pref + 'TemperatureSensor1'] = self.temp1 if (self.device_temperatur_configured > 2): self.mqtt_param[pref + 'TemperatureSensor2'] = self.temp2 - self.mqtt_param[pref + 'Watt'] = self._oldwatt - self.mqtt_param[pref + 'Wh'] = self._wh - self.mqtt_param[pref + 'WHImported_temp'] = self._wpos + self.mqtt_param[pref + 'Watt'] = str(self._oldwatt) + self.mqtt_param[pref + 'Wh'] = str(self._wh) + self.mqtt_param[pref + 'WHImported_temp'] = str(self._wpos) self.mqtt_param[pref + 'oncountnor'] = self.oncountnor self.mqtt_param[pref + 'OnCntStandby'] = self.oncntstandby # nur bei Status 10 on status mitnehmen @@ -252,7 +254,7 @@ def postwatt(self): sendstatus = self.relais + self.devstatus else: sendstatus = self.devstatus - self.mqtt_param[pref + 'Status'] = sendstatus + self.mqtt_param[pref + 'Status'] = str(sendstatus) if (self.gruppe == 'A'): Sbase.ausschaltwatt = Sbase.ausschaltwatt + self._oldwatt elif (self.gruppe == 'E'): @@ -260,7 +262,7 @@ def postwatt(self): Sbase.einrelais = 1 Sbase.eindevstatus = max(Sbase.eindevstatus, self.devstatus) - def updatepar(self, input_param): + def updatepar(self, input_param: Dict[str, str]) -> None: self._smart_param = input_param.copy() self.device_nummer = int(self._smart_param.get('device_nummer', '0')) for key, value in self._smart_param.items(): @@ -327,11 +329,11 @@ def updatepar(self, input_param): elif (key == 'device_measureip'): self._device_measureip = value elif (key == 'device_measurePortSdm'): - self._device_measureportsdm = value + self._device_measureportsdm = valueint elif (key == 'device_dacport'): - self._device_dacport = value + self._device_dacport = valueint elif (key == 'device_measureid'): - self._device_measureid = value + self._device_measureid = valueint elif (key == 'device_finishTime'): self._device_finishtime = value elif (key == 'device_startTime'): @@ -390,7 +392,7 @@ def updatepar(self, input_param): " " + value) else: log.info("(" + str(self.device_nummer) + ") " - + __class__.__name__ + " überlesen " + key + + + "Sbase überlesen " + key + " " + value) self._first_run = 0 pref = 'openWB/SmartHome/Devices/' + str(self.device_nummer) + '/' @@ -451,6 +453,8 @@ def updatepar(self, input_param): del self._mydevicemeasure if (self._device_measuretype == 'sdm630'): self._mydevicemeasure = Slsdm630() + elif (self._device_measuretype == 'lovato'): + self._mydevicemeasure = Sllovato() elif (self._device_measuretype == 'sdm120'): self._mydevicemeasure = Slsdm120() elif (self._device_measuretype == 'we514'): @@ -494,14 +498,14 @@ def updatepar(self, input_param): str(self.device_nummer), 'w') as f: f.write(str(self.device_homeconsumtion)) - def getueb(self): + def getueb(self) -> None: # (1 = mit Speicher, 2 = mit offset , 0 = manual eingeschaltet) if (self.ueberschussberechnung == 2): self.devuberschuss = self._uberschussoffset else: self.devuberschuss = self._uberschuss - def preturn(self, zustand, ueberschussberechnung, updatecnt): + def preturn(self, zustand: int, ueberschussberechnung: int, updatecnt: int) -> None: self.ueberschussberechnung = ueberschussberechnung with open(self._basePath+'/ramdisk/device' + str(self.device_nummer) + '_req_relais', 'w') as f: @@ -519,7 +523,7 @@ def preturn(self, zustand, ueberschussberechnung, updatecnt): self._c_eintime_f = 'Y' self._c_eintime = int(time.time()) - def sepwatt(self, newwatt, newwattk): + def sepwatt(self, newwatt: int, newwattk: int) -> Tuple[int, int]: if (self._device_differentmeasurement == 0): return newwatt, newwattk # ueberschuss übertragen @@ -529,7 +533,7 @@ def sepwatt(self, newwatt, newwattk): self.newwattk = self._mydevicemeasure.newwattk return self.newwatt, self.newwattk - def conditions(self, speichersoc): + def conditions(self, speichersoc: int) -> None: # do not do anything in case none type or can switch = no # or device manuam mode if ((self.device_canswitch == 0) or @@ -550,8 +554,8 @@ def conditions(self, speichersoc): work_ausschaltschwelle = self._device_ausschaltschwelle work_ausschaltverzoegerung = self._device_ausschaltverzoegerung local_time = datetime.now(timezone.utc).astimezone() - localhour = int(local_time.strftime(format="%H")) - localminute = int(local_time.strftime(format="%M")) + localhour = int(local_time.strftime("%H")) + localminute = int(local_time.strftime("%M")) localinsec = int((localhour * 60 * 60) + (localminute * 60)) if (localinsec < Sbase.nureinschaltinsec) and (Sbase.eindevices > 0): log.info("(" + str(self.device_nummer) + ") " + @@ -966,8 +970,8 @@ def conditions(self, speichersoc): self._c_ausverz_f = 'N' # rechne Zeit exclusive einschaltgruppe local_time = datetime.now(timezone.utc).astimezone() - localh = int(local_time.strftime(format="%H")) - localminute = int(local_time.strftime(format="%M")) + localh = int(local_time.strftime("%H")) + localminute = int(local_time.strftime("%M")) localinsec = int((localh * 60 * 60) + (localminute * 60)) Sbase.nureinschaltinsec = localinsec + Sbase.einverz return @@ -1132,7 +1136,7 @@ def conditions(self, speichersoc): self._c_einverz_f = 'N' self._c_ausverz_f = 'N' - def simcount(self, watt2, pref, importfn, exportfn, nummer, wattks): + def simcount(self, watt2: int, pref: str, importfn: str, exportfn: str, nummer: str, wattks: int) -> None: # Zaehler mitgeliefert in WH , zurueckrechnen fuer simcount if wattks > 0: wattposkh = wattks @@ -1191,8 +1195,8 @@ def simcount(self, watt2, pref, importfn, exportfn, nummer, wattks): wattnegh = wattnegh + watt1 else: wattposh = wattposh + watt1 - wattposkh = wattposh/3600 - wattnegkh = (wattnegh*-1)/3600 + wattposkh = int(wattposh/3600) + wattnegkh = int((wattnegh*-1)/3600) with open(self._basePath+'/ramdisk/'+pref+'watt0pos', 'w') as f: f.write(str(wattposh)) self._wpos = wattposh @@ -1210,17 +1214,17 @@ def simcount(self, watt2, pref, importfn, exportfn, nummer, wattks): with open(self._basePath+'/ramdisk/'+pref+'wh0', 'w') as f: f.write(str(watt2)) - def getwatt(self, uberschuss, uberschussoffset): + def getwatt(self, uberschuss: int, uberschussoffset: int) -> None: self.prewatt(uberschuss, uberschussoffset) self.newwatt = 0 self.newwattk = 0 self.relais = 0 self.postwatt() - def turndevicerelais(self, zustand, ueberschussberechnung, updatecnt): + def turndevicerelais(self, zustand: int, ueberschussberechnung: int, updatecnt: int) -> None: pass - def updatebutton(self): + def updatebutton(self) -> None: self.newdevice_manual = self.device_manual self.newdevice_manual_control = self.device_manual_control self.btchange = 0 diff --git a/runs/usmarthome/smartmeas.py b/runs/usmarthome/smartmeas.py index a2304cab5b..f58a366ffd 100644 --- a/runs/usmarthome/smartmeas.py +++ b/runs/usmarthome/smartmeas.py @@ -1,10 +1,15 @@ from usmarthome.smartbase0 import Sbase0 from usmarthome.global0 import log +from typing import Dict, Tuple +from modules.common import modbus +from modules.common import sdm +from modules.common import lovato + import subprocess class Slbase(Sbase0): - def __init__(self): + def __init__(self) -> None: # # setting super().__init__() @@ -19,14 +24,14 @@ def __init__(self): self.newwatt = 0 self.newwattk = 0 self.relais = 0 - self._smart_param = {} + self._smart_param = {} # type: Dict[str, str] self._device_differentmeasureoment = 0 self._device_configured = '0' self._device_ip = 'none' self._device_measuretype = 'none' self._device_measureip = 'none' - self._device_measureportsdm = '8899' - self._device_measureid = '0' + self._device_measureportsdm = 8899 + self._device_measureid = 0 self._device_measuresmaser = '123' self._device_measuresmaage = 15 self._device_leistungurl = 'none' @@ -45,7 +50,7 @@ def __init__(self): self._device_measchan = 0 self._device_chan = 0 - def updatepar(self, input_param): + def updatepar(self, input_param: Dict[str, str]) -> None: self._smart_param = input_param.copy() self.device_nummer = int(self._smart_param.get('device_nummer', '0')) for key, value in self._smart_param.items(): @@ -88,7 +93,7 @@ def updatepar(self, input_param): elif (key == 'device_measureip'): self._device_measureip = value elif (key == 'device_measurePortSdm'): - self._device_measureportsdm = value + self._device_measureportsdm = valueint elif (key == 'device_measuresmaage'): self._device_measuresmaage = valueint elif (key == 'device_measchan'): @@ -98,7 +103,7 @@ def updatepar(self, input_param): elif (key == 'device_measuresmaser'): self._device_measuresmaser = value elif (key == 'device_measureid'): - self._device_measureid = value + self._device_measureid = valueint elif (key == 'device_leistungurl'): self._device_leistungurl = value elif (key == 'device_measureurl'): @@ -127,27 +132,27 @@ def updatepar(self, input_param): self._device_stateurl = value else: log.info("(" + str(self.device_nummer) + ") " - + __class__.__name__ + " überlesen " + key + + + "Slbase überlesen " + key + " " + value) - def __del__(self): + def __del__(self) -> None: print('__del__ Slbase executed ') class Slmqtt(Slbase): - def __init__(self): + def __init__(self) -> None: # setting super().__init__() print('__init__ Slmqtt excuted') - def getwattread(self): + def getwattread(self) -> None: self._watt(self._device_ip) - def sepwattread(self): + def sepwattread(self) -> Tuple[int, int]: self._watt(self._device_measureip) return self.newwatt, self.newwattk - def _watt(self, ip): + def _watt(self, ip: str) -> None: argumentList = ['python3', self._prefixpy + 'mqtt/watt.py', str(self.device_nummer), str(ip), str(self.devuberschuss)] @@ -164,19 +169,19 @@ def _watt(self, ip): class Slshelly(Slbase): - def __init__(self): + def __init__(self) -> None: # setting super().__init__() print('__init__ Slshelly excuted') - def getwattread(self): + def getwattread(self) -> None: self._watt(self._device_ip, self._device_chan) - def sepwattread(self): + def sepwattread(self) -> Tuple[int, int]: self._watt(self._device_measureip, self._device_measchan) return self.newwatt, self.newwattk - def _watt(self, ip, chan): + def _watt(self, ip: str, chan: int) -> None: argumentList = ['python3', self._prefixpy + 'shelly/watt.py', str(self.device_nummer), str(ip), '0', str(chan)] @@ -214,24 +219,24 @@ def _watt(self, ip, chan): class Slavm(Slbase): - def __init__(self): + def __init__(self) -> None: # setting super().__init__() print('__init__ Slavm excuted') - def getwattread(self): + def getwattread(self) -> None: self._watt(self._device_ip, self._device_actor, self._device_username, self._device_password) - def sepwattread(self): + def sepwattread(self) -> Tuple[int, int]: self._watt(self._device_measureip, self._device_measureavmactor, self._device_measureavmusername, self._device_measureavmpassword) return self.newwatt, self.newwattk - def _watt(self, ip, act, user, pw): + def _watt(self, ip: str, act: str, user: str, pw: str) -> None: argumentList = ['python3', self._prefixpy + 'avmhomeautomation/watt.py', str(self.device_nummer), str(ip), @@ -250,19 +255,19 @@ def _watt(self, ip, act, user, pw): class Sltasmota(Slbase): - def __init__(self): + def __init__(self) -> None: # setting super().__init__() print('__init__ Sltasmota excuted') - def getwattread(self): + def getwattread(self) -> None: self._watt(self._device_ip) - def sepwattread(self): + def sepwattread(self) -> Tuple[int, int]: self._watt(self._device_measureip) return self.newwatt, self.newwattk - def _watt(self, ip): + def _watt(self, ip: str) -> None: argumentList = ['python3', self._prefixpy + 'tasmota/watt.py', str(self.device_nummer), str(ip), '0'] try: @@ -278,21 +283,21 @@ def _watt(self, ip): class Slhttp(Slbase): - def __init__(self): + def __init__(self) -> None: # setting super().__init__() print('__init__ Slhttp excuted') - def getwattread(self): + def getwattread(self) -> None: self._watt(self._device_leistungurl, 'none', self._device_stateurl) - def sepwattread(self): + def sepwattread(self) -> Tuple[int, int]: self._watt(self._device_measureurl, self._device_measureurlc, 'none') return self.newwatt, self.newwattk - def _watt(self, url, urlc, urls): + def _watt(self, url: str, urlc: str, urls: str) -> None: argumentList = ['python3', self._prefixpy + 'http/watt.py', str(self.device_nummer), '0', str(self.devuberschuss), url, urlc, @@ -312,19 +317,19 @@ def _watt(self, url, urlc, urls): class Slmystrom(Slbase): - def __init__(self): + def __init__(self) -> None: # setting super().__init__() print('__init__ Slmystrom excuted') - def getwattread(self): + def getwattread(self) -> None: self._watt(self._device_ip) - def sepwattread(self): + def sepwattread(self) -> Tuple[int, int]: self._watt(self._device_measureip) return self.newwatt, self.newwattk - def _watt(self, ip): + def _watt(self, ip: str) -> None: argumentList = ['python3', self._prefixpy + 'mystrom/watt.py', str(self.device_nummer), str(ip), '0'] try: @@ -347,12 +352,12 @@ def _watt(self, ip): class Slsmaem(Slbase): - def __init__(self): + def __init__(self) -> None: # setting super().__init__() print('__init__ Slsmaem excuted') - def sepwattread(self): + def sepwattread(self) -> Tuple[int, int]: argumentList = ['python3', self._prefixpy + 'smaem/watt.py', str(self.device_nummer), str(self._device_measureip), str(self._device_measuresmaser), @@ -371,12 +376,12 @@ def sepwattread(self): class Slwe514(Slbase): - def __init__(self): + def __init__(self) -> None: # setting super().__init__() print('__init__ Slwe514 excuted') - def sepwattread(self): + def sepwattread(self) -> Tuple[int, int]: argumentList = ['python3', self._prefixpy + 'we514/watt.py', str(self.device_nummer), str(self._device_measureip), str(self._device_measureid)] @@ -394,12 +399,12 @@ def sepwattread(self): class Sljson(Slbase): - def __init__(self): + def __init__(self) -> None: # setting super().__init__() print('__init__ Sljson excuted') - def sepwattread(self): + def sepwattread(self) -> Tuple[int, int]: argumentList = ['python3', self._prefixpy + 'json/watt.py', str(self.device_nummer), self._device_measurejsonurl, @@ -418,12 +423,12 @@ def sepwattread(self): class Slfronius(Slbase): - def __init__(self): + def __init__(self) -> None: # setting super().__init__() print('__init__ Slfronius excuted') - def sepwattread(self): + def sepwattread(self) -> Tuple[int, int]: argumentList = ['python3', self._prefixpy + 'fronius/watt.py', str(self.device_nummer), str(self._device_measureip), str(self._device_measureid)] @@ -440,23 +445,42 @@ def sepwattread(self): return self.newwatt, self.newwattk +class Sllovato(Slbase): + def __init__(self) -> None: + # setting + super().__init__() + print('__init__ Sllovato excuted') + + def sepwattread(self) -> Tuple[int, int]: + try: + # neu aus openwb 2.0 + with modbus.ModbusTcpClient_(self._device_measureip, self._device_measureportsdm) as tcp_client: + lov = lovato.Lovato(self._device_measureid, tcp_client) + _, newwatt = lov.get_power() + self.newwatt = int(newwatt) + self.newwattk = 0 + except Exception as e1: + log.warning("Leistungsmessung %s %d %s Fehlermeldung: %s " + % ('Lovato ', self.device_nummer, + str(self._device_measureip), str(e1))) + return self.newwatt, self.newwattk + + class Slsdm630(Slbase): - def __init__(self): + def __init__(self) -> None: # setting super().__init__() print('__init__ Slsdm630 excuted') - def sepwattread(self): - argumentList = ['python3', self._prefixpy + 'sdm630/sdm630.py', - str(self.device_nummer), str(self._device_measureip), - str(self._device_measureid), - str(self._device_measureportsdm)] + def sepwattread(self) -> Tuple[int, int]: try: - proc = subprocess.Popen(argumentList) - proc.communicate() - answer = self.readret() - self.newwatt = int(answer['power']) - self.newwattk = int(answer['powerc']) + # neu aus openwb 2.0 + with modbus.ModbusTcpClient_(self._device_measureip, self._device_measureportsdm) as tcp_client: + sdm630 = sdm.Sdm630(self._device_measureid, tcp_client) + # log.warning(" sdm630 id %s " % ( str(id(sdm630)))) + _, newwatt = sdm630.get_power() + self.newwatt = int(newwatt) + self.newwattk = int(sdm630.get_imported()) except Exception as e1: log.warning("Leistungsmessung %s %d %s Fehlermeldung: %s " % ('Sdm630 ', self.device_nummer, @@ -465,22 +489,19 @@ def sepwattread(self): class Slsdm120(Slbase): - def __init__(self): + def __init__(self) -> None: # setting super().__init__() print('__init__ Slsdm120 excuted') - def sepwattread(self): - argumentList = ['python3', self._prefixpy + 'sdm120/sdm120.py', - str(self.device_nummer), str(self._device_measureip), - str(self._device_measureid), - str(self._device_measureportsdm)] + def sepwattread(self) -> Tuple[int, int]: try: - proc = subprocess.Popen(argumentList) - proc.communicate() - answer = self.readret() - self.newwatt = int(answer['power']) - self.newwattk = int(answer['powerc']) + # neu aus openwb 2.0 + with modbus.ModbusTcpClient_(self._device_measureip, self._device_measureportsdm) as tcp_client: + sdm120 = sdm.Sdm120(self._device_measureid, tcp_client) + _, newwatt = sdm120.get_power() + self.newwatt = int(newwatt) + self.newwattk = int(sdm120.get_imported()) except Exception as e1: log.warning("Leistungsmessung %s %d %s Fehlermeldung: %s " % ('Sdm120 ', self.device_nummer, diff --git a/web/settings/smarthomeconfig.php b/web/settings/smarthomeconfig.php index f21d4949ed..3a3f94c0ae 100644 --- a/web/settings/smarthomeconfig.php +++ b/web/settings/smarthomeconfig.php @@ -792,10 +792,11 @@ +

-
+
@@ -816,19 +817,19 @@
-
+
-
+
Standardeinstellungen verschiedener Geräte:
- SDM630: 8899
+ SDM630/Lovato: 8899
Elgris: 502
From b6f3b82012f427d149e7e60027a969ff60209523 Mon Sep 17 00:00:00 2001 From: rleidner Date: Sat, 17 Dec 2022 11:54:05 +0100 Subject: [PATCH 186/201] implement token refresh, improve logging --- modules/soc_smarteq/README.txt | 9 + modules/soc_smarteq/main.sh | 4 +- modules/soc_smarteq/soc_smarteq.py | 356 +++++++++++++++++++++-------- 3 files changed, 266 insertions(+), 103 deletions(-) diff --git a/modules/soc_smarteq/README.txt b/modules/soc_smarteq/README.txt index 8236bde085..f3d5404a0d 100755 --- a/modules/soc_smarteq/README.txt +++ b/modules/soc_smarteq/README.txt @@ -1,3 +1,12 @@ Das smart SOC Modul ist vom smartEQ Modul des iobroker inspiriert. Der js code wurde in python implementiert und etwas vereinfacht. +Es wird in OAUTh ein Token Refresh durchgeführt. +Da alle Token nur 2 Stunden gültig sind und der Refresh mit gültigem refresh_token erfolgen muss, +sollten die Intervalle in der Modulkonfiguration weniger als 2 Stunden betragen. +90 Minuten im Standby und 10 Minuten während des Ladens haben sich im Test bewährt. + +Wenn die Intervalle auf mehr als 2 Stunden konfiguriert sind, wird bei der nächsten Abfrage ein Login durchgeführt. +Das benötigt deutlich mehr Zeit und es können die Token anderer Sitzungen, z.B. der smart Control App, +ungültig werden und einen neuen Login benötigen mit Eingabe von User und Passwort. + diff --git a/modules/soc_smarteq/main.sh b/modules/soc_smarteq/main.sh index d0d19110b1..24d921cc24 100755 --- a/modules/soc_smarteq/main.sh +++ b/modules/soc_smarteq/main.sh @@ -67,7 +67,7 @@ incrementTimer(){ } getAndWriteSoc(){ - openwbDebugLog ${DMOD} 0 "Lp$CHARGEPOINT: Requesting SoC" + openwbDebugLog ${DMOD} 2 "Lp$CHARGEPOINT: Requesting SoC" echo 0 > $soctimerfile #Prepare for secrets used in soc module libvwid in Python if ! python3 -c "import secrets" &> /dev/null ; then @@ -80,7 +80,7 @@ getAndWriteSoc(){ if [ $? -eq 0 ]; then # we got a valid answer echo $answer > $socfile - openwbDebugLog ${DMOD} 0 "Lp$CHARGEPOINT: SoC: $answer" + openwbDebugLog ${DMOD} 2 "Lp$CHARGEPOINT: SoC: $answer" else # we have a problem openwbDebugLog ${DMOD} 0 "Lp$CHARGEPOINT: Error from soc_smart: $answer" diff --git a/modules/soc_smarteq/soc_smarteq.py b/modules/soc_smarteq/soc_smarteq.py index e6744f6363..7a0c10aa52 100755 --- a/modules/soc_smarteq/soc_smarteq.py +++ b/modules/soc_smarteq/soc_smarteq.py @@ -5,6 +5,8 @@ import json import bs4 import os +import time +import datetime import pkce import logging import pickle @@ -21,10 +23,29 @@ GUID = "280C6B55-F179-4428-88B6-E0CCF5C22A7C" ACCEPT_LANGUAGE = "de-de" +TOKENS_REFRESH_THRESHOLD = 3600 + + +# helper functions +def keys_exist(element, *keys): + # Check if *keys (nested) exists in `element` (dict). + if not isinstance(element, dict): + raise AttributeError('keys_exist() expects dict as first argument - got type ' + str(type(element))) + if len(keys) == 0: + raise AttributeError('keys_exist() expects at least two arguments, one given.') + + _element = element + for key in keys: + try: + _element = _element[key] + except KeyError: + return False + return True + class smarteq: - def __init__(self, tokensFile: str): - self.tokensFile = tokensFile + def __init__(self, storeFile: str): + self.storeFile = storeFile self.log = logging.getLogger("soc_smarteq") debug = os.environ.get('debug', '0') LOGLEVEL = 'WARN' @@ -34,45 +55,81 @@ def __init__(self, tokensFile: str): LOGLEVEL = 'DEBUG' RAMDISKDIR = os.environ.get("RAMDISKDIR", "undefined") logFile = RAMDISKDIR+'/soc.log' - format = '%(asctime)s %(name)s:%(levelname)s: %(message)s' + format = '%(asctime)s %(levelname)s:%(name)s:%(message)s' datefmt = '%Y-%m-%d %H:%M:%S' logging.basicConfig(filename=logFile, filemode='a', format=format, datefmt=datefmt, level=LOGLEVEL) - # self.log.error("init logging: debug=" + debug + ", LOGLEVEL=" + LOGLEVEL) + + # self.method keeps a high level trach of actions + self.method = '' + self.soc_ts = 'n/a' + # self.store is read from ramdisk at start and saved at end. + # currently is contains: + # Tokens: refresh- and access-tokens of OAUTH + # refresh_timestamp: epoch of last refresh_tokens. + self.store = {} + self.store['Tokens'] = {} + self.store['refresh_timestamp'] = int(0) self.session = requests.session() - self.Tokens = {} - self.code_verifier, self.code_challenge = pkce.generate_pkce_pair() - self.code_challenge_method = "S256" + self.load_store() + self.oldTokens = self.store['Tokens'] + self.init = True + self.init = False # test!! + + def load_store(self): try: - tf = open(self.tokensFile, "rb") - self.Tokens = pickle.load(tf) + tf = open(self.storeFile, "rb") + self.store = pickle.load(tf) + if 'Tokens' not in self.store: + self.store['Tokens'] = {} + self.store['refresh_timestamp'] = int(0) tf.close() except Exception as e: - self.log.warn("init: loading tokens failed, file: " + self.tokensFile) - self.Tokens = {} + self.log.debug("init: loading stored data failed, file: " + self.storeFile) + self.store['Tokens'] = {} + self.store['refresh_timestamp'] = int(0) + + def write_store(self): + try: + tf = open(self.storeFile, "wb") + except Exception as e: + self.log.debug("write_store: Exception " + str(e)) + os.system("sudo rm -f " + self.storeFile) + tf = open(self.storeFile, "wb") + pickle.dump(self.store, tf) + tf.close() + try: + os.chmod(self.storeFile, 0o777) + except Exception as e: + os.system("sudo chmod 0777 " + self.storeFile) + # set username and password def set_credentials(self, username: str, password: str): self.username = username self.password = password + # set vin def set_vin(self, vin: str): self.vin = vin + # set chargepoint number def set_chargepoint(self, chargepoint: str): self.chargepoint = chargepoint - # ===== step1 get resume ====== + # ===== get resume string ====== def get_resume(self) -> str: response_type = "code" - url1 = OAUTH_URL + '?client_id=' + CLIENT_ID + '&response_type=' + response_type + '&scope=' + SCOPE - url1 = url1 + '&redirect_uri=' + REDIRECT_URI - url1 = url1 + '&code_challenge=' + self.code_challenge + '&code_challenge_method=' + self.code_challenge_method - headers1 = { + self.code_verifier, self.code_challenge = pkce.generate_pkce_pair() + self.code_challenge_method = "S256" + url = OAUTH_URL + '?client_id=' + CLIENT_ID + '&response_type=' + response_type + '&scope=' + SCOPE + url = url + '&redirect_uri=' + REDIRECT_URI + url = url + '&code_challenge=' + self.code_challenge + '&code_challenge_method=' + self.code_challenge_method + headers = { "Accept": "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8", "Accept-Language": ACCEPT_LANGUAGE, "User-Agent": "Mozilla/5.0 (iPhone; CPU iPhone OS 12_5_1 like Mac OS X)\ @@ -80,31 +137,30 @@ def get_resume(self) -> str: } try: - response1 = self.session.get(url1, headers=headers1) - self.log.debug("response1.status_code = " + str(response1.status_code)) - soup = bs4.BeautifulSoup(response1.text, 'html.parser') - + response = self.session.get(url, headers=headers) + self.log.debug("get_resume: status_code = " + str(response.status_code)) + self.log.debug("get_resume: text = " + str(response.text)) + soup = bs4.BeautifulSoup(response.text, 'html.parser') + for cd in soup.findAll(text=True): - self.log.debug("cd= " + str(cd)) - # if isinstance(cd, bs4.CData): if "CDATA" in cd: - self.log.debug("cd.CData= " + str(cd)) + self.log.debug("get_resume: cd.CData= " + str(cd)) for w in cd.split(','): if w.find("const initialState = ") != -1: iS = w if iS: js = iS.split('{')[1].split('}')[0].replace('\\', '').replace('\\"', '"').replace('""', '"') self.resume = js[1:len(js)-1].split(':')[1][2:] - self.log.debug("Step1 get_resume: resume = " + self.resume) + self.log.debug("get_resume: resume = " + self.resume) except Exception as e: - self.log.error('Step1 get_resume Exception: ' + str(e)) + self.log.error('get_resume: Exception: ' + str(e)) return self.resume - # step2: login to website, return token + # login to website, return (intermediate) token def login(self) -> str: - - url3 = LOGIN_URL + "/pass" - headers3 = { + self.resume = self.get_resume() + url = LOGIN_URL + "/pass" + headers = { "Content-Type": "application/json", "Accept": "application/json, text/plain, */*", "User-Agent": "Mozilla/5.0 (iPhone; CPU iPhone OS 12_5_1 like Mac OS X)\ @@ -116,17 +172,20 @@ def login(self) -> str: d['username'] = self.username d['password'] = self.password d['rememberMe'] = 'true' - data3 = json.dumps(d) + data = json.dumps(d) + data = json.dumps({'username': self.username, + 'password': self.password, + 'rememberMe': 'true'}) try: - response3 = self.session.post(url3, headers=headers3, data=data3) - self.log.debug("response3.status_code = " + str(response3.status_code)) - # self.log.debug("response3.text = " + str(response3.text)) - if response3.status_code > 400: - self.log.error("login: failed, status_code = " + str(response3.status_code) + ", check username/password" ) + response = self.session.post(url, headers=headers, data=data) + self.log.debug("login: status_code = " + str(response.status_code)) + if response.status_code > 400: + self.log.error("login: failed, status_code = " + str(response.status_code) + + ", check username/password") token = "" else: - result_json = json.loads(str(bs4.BeautifulSoup(response3.text, 'html.parser'))) + result_json = json.loads(str(bs4.BeautifulSoup(response.text, 'html.parser'))) self.log.debug("login: result_json:\n" + json.dumps(result_json)) token = result_json['token'] self.log.debug("login: token = " + token) @@ -136,9 +195,13 @@ def login(self) -> str: return token # get code - def get_code(self, token: str) -> str: - url4 = BASE_URL + '/' + self.resume - headers4 = { + def get_code(self) -> str: + token = self.login() + if token == "": + self.log.error("login: Login failed - check username/password") + return "" + url = BASE_URL + '/' + self.resume + headers = { "Content-Type": "application/x-www-form-urlencoded", "Accept": "application/json, text/plain, */*", "User-Agent": "Mozilla/5.0 (iPhone; CPU iPhone OS 12_5_1 like Mac OS X)\ @@ -146,67 +209,137 @@ def get_code(self, token: str) -> str: "Referer": LOGIN_URL, "Accept-Language": ACCEPT_LANGUAGE, } - d = {} - d['token'] = token - data4 = json.dumps(d) + # d = {} + # d['token'] = token + # data = json.dumps(d) + data = json.dumps({'token': token}) try: - response4 = self.session.post(url4, headers=headers4, data=data4) - code = response4.url.split('?')[1].split('=')[1] - self.log.debug("get_ ode, code=" + code) + response = self.session.post(url, headers=headers, data=data) + code = response.url.split('?')[1].split('=')[1] + self.log.debug("get_code: code=" + code) except Exception as e: - self.log.error("get_code Exception: " + str(e)) + self.log.error("get_code: Exception: " + str(e)) return code # get Tokens - def get_Tokens(self, code: str) -> dict: - url5 = TOKEN_URL - headers5 = { + def get_tokens(self) -> dict: + self.method += " 3-full (re)connect" + code = self.get_code() + if code == "": + self.log.warn("get_tokens: get_code failed") + return {} + url = TOKEN_URL + headers = { "Accept": "*/*", "User-Agent": "sOAF/202108260942 CFNetwork/978.0.7 Darwin/18.7.0", "Accept-Language": ACCEPT_LANGUAGE, "Content-Type": "application/x-www-form-urlencoded", } - data5 = "grant_type=authorization_code&code=" + code + "&code_verifier=" + self.code_verifier +\ - "&redirect_uri=" + REDIRECT_URI + "&client_id=" + CLIENT_ID + data = "grant_type=authorization_code&code=" + code + "&code_verifier=" + self.code_verifier +\ + "&redirect_uri=" + REDIRECT_URI + "&client_id=" + CLIENT_ID try: - response5 = self.session.post(url5, headers=headers5, data=data5) - self.log.debug("get_Tokens: response5.status_code = " + str(response5.status_code)) - Tokens = json.loads(response5.text) + response = self.session.post(url, headers=headers, data=data) + self.log.debug("get_tokens: status_code = " + str(response.status_code)) + Tokens = json.loads(response.text) if not Tokens['access_token']: - self.log.warn("get_Tokens: no access_token found") + self.log.warn("get_tokens: no access_token found") Tokens = {} else: self.log.debug("Tokens=\n" + json.dumps(Tokens, indent=4)) except Exception as e: - self.log.exception("get_Tokens: Exception: " + str(e)) + self.log.exception("get_tokens: Exception: " + str(e)) return Tokens - # reconnect to Server - def reconnect(self) -> dict: - token = self.login() - if token == "": - self.log.error("reconnect: Login failed") - return {} + # refresh tokens + def refresh_tokens(self) -> dict: + self.method += " 2-refresh_tokens" + url = TOKEN_URL + headers = { + "Accept": "*/*", + "User-Agent": "sOAF/202108260942 CFNetwork/978.0.7 Darwin/18.7.0", + "Accept-Language": ACCEPT_LANGUAGE, + "Content-Type": "application/x-www-form-urlencoded", + } + # data = {'grant_type': 'refresh_token', + # 'client_id': CLIENT_ID, + # 'refresh_token': self.store['Tokens']['refresh_token']} + data = "grant_type=refresh_token&client_id=" + CLIENT_ID + "&refresh_token=" +\ + self.store['Tokens']['refresh_token'] - code = self.get_code(token) - Tokens = self.get_Tokens(code) + try: + response = self.session.post(url, + headers=headers, + data=data, + verify=True, + allow_redirects=False, + timeout=(30, 30)) + self.log.debug("refresh_tokens: status_code = " + str(response.status_code)) + self.log.debug("refresh_tokens: text = " + str(response.text)) + newTokens = json.loads(response.text) + if 'error' in newTokens and newTokens['error'] == 'unauthorized': + self.log.warning("refresh_tokens: error: " + newTokens['error'] + ', ' + newTokens['error_description']) + if 'access_token' not in newTokens: + self.log.debug("refresh_tokens: new access_token not found") + newTokens['access_token'] = "" + if 'refresh_token' not in newTokens: + self.log.debug("refresh_tokens: new refresh_token not found") + newTokens['refresh_token'] = "" + self.log.debug("refresh_tokens: newTokens=\n" + json.dumps(newTokens, indent=4)) + except Exception as e: + self.log.error("refresh_tokens: Exception: " + str(e)) + newTokens['access_token'] = "" + newTokens['refresh_token'] = "" + return newTokens - tf = open(self.tokensFile, "wb") - pickle.dump(Tokens, tf) - tf.close() + # reconnect to Server + def reconnect(self) -> dict: + # check if we have a refresh token and last refresh was more then 1h ago (3600s) + if 'refresh_token' in self.store['Tokens']: + now = int(time.time()) + secs_since_refresh = now - self.store['refresh_timestamp'] + if secs_since_refresh > TOKENS_REFRESH_THRESHOLD: + # try to refresh tokens + new_tokens = self.refresh_tokens() + self.store['refresh_timestamp'] = int(time.time()) + _ref = True + else: + # keep existing tokens + return self.store['Tokens'] + else: + self.log.debug("reconnect: refresh_token not found in self.store['Tokens']=" + + json.dumps(self.store['Tokens'], indent=4)) + new_tokens = {'refresh_token': '', 'access_token': ''} + _ref = False + self.log.debug("reconnect: new_tokens=" + json.dumps(new_tokens, indent=4)) + if new_tokens['access_token'] == '': + if _ref: + self.log.warning("reconnect: refresh access_token failed, try full reconnect") + Tokens = self.get_tokens() + else: + self.log.debug("reconnect: refresh access_token successful") + Tokens = self.store['Tokens'] # replace expired access and refresh token by new tokens + for key in new_tokens: + Tokens[key] = new_tokens[key] + self.log.debug("reconnect: replace Tokens[" + key + "], new value: " + str(Tokens[key])) return Tokens # get Soc of Vehicle def get_status(self, vin: str) -> int: - url7 = STATUS_URL + "/seqc/v0/vehicles/" + vin +\ - "/init-data?requestedData=BOTH&countryCode=DE&locale=de-DE" - headers7 = { + self.method += " 1-get_status" + if self.init: + url = STATUS_URL + "/seqc/v0/vehicles/" + vin +\ + "/init-data?requestedData=BOTH&countryCode=DE&locale=de-DE" + else: + url = STATUS_URL + "/seqc/v0/vehicles/" + vin + "/refresh-data" + self.init = False + + headers = { "accept": "*/*", "accept-language": "de-DE;q=1.0", - "authorization": "Bearer " + self.Tokens['access_token'], + "authorization": "Bearer " + self.store['Tokens']['access_token'], "x-applicationname": CLIENT_ID, "user-agent": "Device: iPhone 6; OS-version: iOS_12.5.1; App-Name: smart EQ control; App-Version: 3.0;\ Build: 202108260942; Language: de_DE", @@ -214,55 +347,77 @@ def get_status(self, vin: str) -> int: } try: - response7 = self.session.get(url7, headers=headers7) - res7 = json.loads(response7.text) - res7s = json.dumps(res7, indent=4) - res7s = json.dumps(res7['precond']['data']['soc'], indent=4) - try: - soc = res7['precond']['data']['soc']['value'] - self.log.info("get_status: result json:\n" + res7s) - except: + response = self.session.get(url, headers=headers) + res = json.loads(response.text) + res_json = json.dumps(res, indent=4) + if keys_exist(res, 'precond', 'data', 'soc', 'value'): + res_json = json.dumps(res['precond']['data']['soc'], indent=4) + try: + soc = res['precond']['data']['soc']['value'] + _ts = res['precond']['data']['soc']['ts'] + self.soc_ts = datetime.datetime.fromtimestamp(_ts).strftime('%Y-%m-%d %H:%M:%S') + self.log.debug("get_status: result json:\n" + res_json) + except: + soc = -1 + elif 'error' in res and res['error'] == 'unauthorized': + self.log.warning("get_status: access_token expired - try refresh") + self.log.debug("get_status: error - result json:\n" + res_json) soc = -1 - pass + except Exception as e: self.log.error("get_status: Exception: " + str(e)) - self.log.error("get_status: result json:\n" + res7s) + self.log.error("get_status: result:\n" + res_json) soc = -1 - if "Vehicle not found" in res7s: + if "Vehicle not found" in res_json: soc = -2 return soc + # fetch soc in 3 stages: + # 1. get_status via stored access_token + # 2. if expired: refresh_access_token using id and refresh token, then get_status + # 3. if refresh token expired: login, get tokens, then get_status def fetch_soc(self) -> int: soc = -1 try: - try: - if self.Tokens['access_token']: - soc = self.get_status(self.vin) - self.log.info("fetch_soc: 1st attempt successful - skip reconnect") - except Exception as e: - soc = -1 - pass + if 'refresh_token' in self.store['Tokens']: + self.store['Tokens'] = self.reconnect() + if 'access_token' in self.store['Tokens']: + soc = self.get_status(self.vin) + if soc > 0: + self.log.debug("fetch_soc: 1st attempt successful") + else: + self.log.debug("fetch_soc: 1st attempt failed - soc=" + str(soc)) if soc == -1: - self.log.info("fetch_soc: (re)connecting ...") - self.resume = self.get_resume() - self.Tokens = self.reconnect() - if self.Tokens: + self.log.debug("fetch_soc: (re)connecting ...") + self.store['Tokens'] = self.reconnect() + if 'access_token' in self.store['Tokens']: soc = self.get_status(self.vin) + if soc > 0: + self.log.debug("fetch_soc: 2nd attempt successful") + else: + self.log.warning("fetch_soc: 2nd attempt failed - soc=" + str(soc)) else: self.log.error("fetch_soc: (re-)connect failed") soc = 0 elif soc == -2: self.log.error("fetch_soc: failed, Vehicle not found, check VIN") soc = 0 - pass except Exception as e: self.log.error("fetch_soc: exception, (re-)connecting ..." + str(e)) - self.resume = self.get_resume() - self.Tokens = self.reconnect() - soc = self.get_status(self.vin) - self.log.info("fetch_soc: result: soc=" + str(soc) + '%') + self.store['Tokens'] = self.reconnect() + if 'access_token' in self.store['Tokens']: + soc = self.get_status(self.vin) + self.log.info("Lp" + self.chargepoint + + " SOC: " + str(soc) + '%' + + '@' + self.soc_ts + + ', Method: ' + self.method) + + if self.store['Tokens'] != self.oldTokens: + self.log.debug("reconnect: tokens changed, store token file") + + self.write_store() return soc @@ -283,11 +438,10 @@ def main(): vin = args['vin'] chargepoint = args['chargepoint'] - OPENWBBASEDIR = os.environ.get("OPENWBBASEDIR", "undefined") RAMDISKDIR = os.environ.get("RAMDISKDIR", "undefined") - tokensFile = RAMDISKDIR+'/soc_smarteq_tokens_lp'+chargepoint + storeFile = RAMDISKDIR+'/soc_smarteq_store_lp'+chargepoint - Smart = smarteq(tokensFile) + Smart = smarteq(storeFile) Smart.set_credentials(user_id, password) Smart.set_vin(vin) Smart.set_chargepoint(chargepoint) From 90394931540a7e64bfa6c41535c6ddb68bebf5ee Mon Sep 17 00:00:00 2001 From: rleidner Date: Wed, 21 Dec 2022 10:50:24 +0100 Subject: [PATCH 187/201] keys_exist: parameter type added, funtion renamed --- modules/soc_smarteq/soc_smarteq.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/soc_smarteq/soc_smarteq.py b/modules/soc_smarteq/soc_smarteq.py index 7a0c10aa52..cc33b1f8d4 100755 --- a/modules/soc_smarteq/soc_smarteq.py +++ b/modules/soc_smarteq/soc_smarteq.py @@ -27,12 +27,12 @@ # helper functions -def keys_exist(element, *keys): +def nested_keys_exist(element: dict, *keys) -> bool: # Check if *keys (nested) exists in `element` (dict). if not isinstance(element, dict): - raise AttributeError('keys_exist() expects dict as first argument - got type ' + str(type(element))) + raise AttributeError('nested_keys_exist() expects dict as first argument - got type ' + str(type(element))) if len(keys) == 0: - raise AttributeError('keys_exist() expects at least two arguments, one given.') + raise AttributeError('nested_keys_exist() expects at least two arguments, one given.') _element = element for key in keys: @@ -350,7 +350,7 @@ def get_status(self, vin: str) -> int: response = self.session.get(url, headers=headers) res = json.loads(response.text) res_json = json.dumps(res, indent=4) - if keys_exist(res, 'precond', 'data', 'soc', 'value'): + if nested_keys_exist(res, 'precond', 'data', 'soc', 'value'): res_json = json.dumps(res['precond']['data']['soc'], indent=4) try: soc = res['precond']['data']['soc']['value'] @@ -410,7 +410,7 @@ def fetch_soc(self) -> int: if 'access_token' in self.store['Tokens']: soc = self.get_status(self.vin) self.log.info("Lp" + self.chargepoint + - " SOC: " + str(soc) + '%' + + " SOC: " + str(soc) + '%' + '@' + self.soc_ts + ', Method: ' + self.method) From fe9dea00f10ec5f5ca55ad2aca03f5c48371ec2c Mon Sep 17 00:00:00 2001 From: rleidner Date: Wed, 21 Dec 2022 12:16:26 +0100 Subject: [PATCH 188/201] nested_key_exists: renamed again, missing parameter type added --- modules/soc_smarteq/soc_smarteq.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/soc_smarteq/soc_smarteq.py b/modules/soc_smarteq/soc_smarteq.py index cc33b1f8d4..f6a015d0ee 100755 --- a/modules/soc_smarteq/soc_smarteq.py +++ b/modules/soc_smarteq/soc_smarteq.py @@ -27,12 +27,12 @@ # helper functions -def nested_keys_exist(element: dict, *keys) -> bool: +def nested_key_exists(element: dict, *keys: str) -> bool: # Check if *keys (nested) exists in `element` (dict). if not isinstance(element, dict): - raise AttributeError('nested_keys_exist() expects dict as first argument - got type ' + str(type(element))) + raise AttributeError('nested_key_exists() expects dict as first argument - got type ' + str(type(element))) if len(keys) == 0: - raise AttributeError('nested_keys_exist() expects at least two arguments, one given.') + raise AttributeError('nested_key_exists() expects at least two arguments, one given.') _element = element for key in keys: @@ -350,7 +350,7 @@ def get_status(self, vin: str) -> int: response = self.session.get(url, headers=headers) res = json.loads(response.text) res_json = json.dumps(res, indent=4) - if nested_keys_exist(res, 'precond', 'data', 'soc', 'value'): + if nested_key_exists(res, 'precond', 'data', 'soc', 'value'): res_json = json.dumps(res['precond']['data']['soc'], indent=4) try: soc = res['precond']['data']['soc']['value'] From d90e89e93bd17f492a4648cfb4e12f18823ee4b5 Mon Sep 17 00:00:00 2001 From: Jochen Neidhardt Date: Sat, 3 Dec 2022 13:50:43 +0100 Subject: [PATCH 189/201] allow to configure which CPs will be affected by tariff based charging --- loadvars.sh | 8 ++++ runs/initRamdisk.sh | 8 ++++ runs/mqttsub.py | 6 +++ runs/updateConfig.sh | 5 +++ sofortlademodus.sh | 38 +++++++++---------- web/settings/sofortconfig.php | 31 ++++++++++++++- .../topicsToSubscribe_sofortconfig.js | 13 ++++++- 7 files changed, 85 insertions(+), 24 deletions(-) diff --git a/loadvars.sh b/loadvars.sh index 94f3c574ce..4187863ade 100755 --- a/loadvars.sh +++ b/loadvars.sh @@ -1867,6 +1867,14 @@ loadvars(){ mqttconfvar["config/get/sofort/lp/6/chargeLimitation"]=msmoduslp6 mqttconfvar["config/get/sofort/lp/7/chargeLimitation"]=msmoduslp7 mqttconfvar["config/get/sofort/lp/8/chargeLimitation"]=msmoduslp8 + mqttconfvar["config/get/sofort/lp/1/etBasedCharging"]=lp1etbasedcharging + mqttconfvar["config/get/sofort/lp/2/etBasedCharging"]=lp2etbasedcharging + mqttconfvar["config/get/sofort/lp/3/etBasedCharging"]=lp3etbasedcharging + mqttconfvar["config/get/sofort/lp/4/etBasedCharging"]=lp4etbasedcharging + mqttconfvar["config/get/sofort/lp/5/etBasedCharging"]=lp5etbasedcharging + mqttconfvar["config/get/sofort/lp/6/etBasedCharging"]=lp6etbasedcharging + mqttconfvar["config/get/sofort/lp/7/etBasedCharging"]=lp7etbasedcharging + mqttconfvar["config/get/sofort/lp/8/etBasedCharging"]=lp8etbasedcharging mqttconfvar["config/get/pv/lp/1/socLimitation"]=stopchargepvatpercentlp1 mqttconfvar["config/get/pv/lp/2/socLimitation"]=stopchargepvatpercentlp2 mqttconfvar["config/get/pv/lp/1/maxSoc"]=stopchargepvpercentagelp1 diff --git a/runs/initRamdisk.sh b/runs/initRamdisk.sh index 3b42bc83ef..c3fc53f58b 100755 --- a/runs/initRamdisk.sh +++ b/runs/initRamdisk.sh @@ -517,6 +517,14 @@ initRamdisk(){ "mqtteinschaltverzoegerung:-1" \ "mqttetprovideraktiv:-1" \ "mqttetprovider:notset" \ + "mqttlp1etbasedcharging:-1" \ + "mqttlp2etbasedcharging:-1" \ + "mqttlp3etbasedcharging:-1" \ + "mqttlp4etbasedcharging:-1" \ + "mqttlp5etbasedcharging:-1" \ + "mqttlp6etbasedcharging:-1" \ + "mqttlp7etbasedcharging:-1" \ + "mqttlp8etbasedcharging:-1" \ "mqttevuglaettungakt:-1" \ "mqtthausverbrauch:-1" \ "mqtthausverbrauchstat:-1" \ diff --git a/runs/mqttsub.py b/runs/mqttsub.py index fd223f8305..72501a29f3 100755 --- a/runs/mqttsub.py +++ b/runs/mqttsub.py @@ -640,6 +640,12 @@ def on_message(client, userdata, msg): client.publish("openWB/config/get/sofort/lp/"+str(devicenumb)+"/socToChargeTo", msg.payload.decode("utf-8"), qos=0, retain=True) sendcommand = ["/var/www/html/openWB/runs/replaceinconfig.sh", "sofortsoclp"+str(devicenumb)+"=", msg.payload.decode("utf-8")] subprocess.run(sendcommand) + if (( "openWB/config/set/sofort/lp" in msg.topic) and ("etBasedCharging" in msg.topic)): + devicenumb=re.sub(r'\D', '', msg.topic) + if ( 1 <= int(devicenumb) <= 8 and 0 <= int(msg.payload) <= 1): + client.publish("openWB/config/get/sofort/lp/"+str(devicenumb)+"/etBasedCharging", msg.payload.decode("utf-8"), qos=0, retain=True) + sendcommand = ["/var/www/html/openWB/runs/replaceinconfig.sh", "lp"+str(devicenumb)+"etbasedcharging=", msg.payload.decode("utf-8")] + subprocess.run(sendcommand) if (( "openWB/config/set/sofort/lp" in msg.topic) and ("chargeLimitation" in msg.topic)): devicenumb=re.sub(r'\D', '', msg.topic) if ( 3 <= int(devicenumb) <= 8 and 0 <= int(msg.payload) <= 1): diff --git a/runs/updateConfig.sh b/runs/updateConfig.sh index 1081da26ec..0053d1a93e 100755 --- a/runs/updateConfig.sh +++ b/runs/updateConfig.sh @@ -1297,6 +1297,11 @@ updateConfig(){ if grep -Fq "awattaraktiv=" $ConfigFile; then sed -i '/^awattaraktiv=/d' $ConfigFile fi + for i in $(seq 1 8); do + if ! grep -Fq "lp${i}etbasedcharging=" $ConfigFile; then + echo "lp${i}etbasedcharging=1" >> $ConfigFile + fi + done if ! grep -Fq "plz=" $ConfigFile; then echo "plz=36124" >> $ConfigFile fi diff --git a/sofortlademodus.sh b/sofortlademodus.sh index fe9091394d..891a52b246 100755 --- a/sofortlademodus.sh +++ b/sofortlademodus.sh @@ -10,31 +10,27 @@ sofortlademodus(){ fi if (( etprovideraktiv == 1 )); then actualprice=$(
- Allgemeine Einstellungen + Allgemeine Einstellungen
@@ -154,6 +154,22 @@
+
+ +
+
+ + +
+ + Aktiviert/Deaktiviert Preisbasiertes Laden + +
+
- + @@ -335,6 +351,17 @@ function visibiltycheck(elementId, mqttpayload) { showSection('.lp' + index + 'limitenergy'); } } + if ( elementId.match( /^boolAwattarEnabled*$/i ) ) { + if ( mqttpayload == 1) { + for( $index = 1; $index < 9; $index++ ){ + showSection('.lp' + $index + 'etBased'); + } + } else { + for( $index = 1; $index < 9; $index++ ){ + hideSection('.lp' + $index + 'etBased'); + } + } + } } function saveSettings() { // sends all changed values by mqtt if valid diff --git a/web/settings/topicsToSubscribe_sofortconfig.js b/web/settings/topicsToSubscribe_sofortconfig.js index d2f32fd52c..8120f0a45f 100644 --- a/web/settings/topicsToSubscribe_sofortconfig.js +++ b/web/settings/topicsToSubscribe_sofortconfig.js @@ -51,5 +51,16 @@ var topicsToSubscribe = [ ["openWB/config/get/sofort/lp/1/socToChargeTo", 0], ["openWB/config/get/sofort/lp/2/socToChargeTo", 0], - ["openWB/config/get/global/minEVSECurrentAllowed", 0] + ["openWB/config/get/sofort/lp/1/etBasedCharging", 0], + ["openWB/config/get/sofort/lp/2/etBasedCharging", 0], + ["openWB/config/get/sofort/lp/3/etBasedCharging", 0], + ["openWB/config/get/sofort/lp/4/etBasedCharging", 0], + ["openWB/config/get/sofort/lp/5/etBasedCharging", 0], + ["openWB/config/get/sofort/lp/6/etBasedCharging", 0], + ["openWB/config/get/sofort/lp/7/etBasedCharging", 0], + ["openWB/config/get/sofort/lp/8/etBasedCharging", 0], + + ["openWB/config/get/global/minEVSECurrentAllowed", 0], + + ["openWB/global/awattar/boolAwattarEnabled", 0] ]; From 1c3e80176f4b57572bc9fa9d9d6ba6b16d91523a Mon Sep 17 00:00:00 2001 From: Lutz Bender Date: Thu, 22 Dec 2022 09:07:36 +0100 Subject: [PATCH 190/201] remove old evsecheck --- runs/cron5min.sh | 4 ---- runs/evsecheck | Bin 37632 -> 0 bytes 2 files changed, 4 deletions(-) delete mode 100755 runs/evsecheck diff --git a/runs/cron5min.sh b/runs/cron5min.sh index e8c3fa0817..fd83647bba 100755 --- a/runs/cron5min.sh +++ b/runs/cron5min.sh @@ -306,10 +306,6 @@ commitId=$(git -C "$OPENWBBASEDIR" log --format="%h" -n 1) echo "$commitId" >"$RAMDISKDIR/currentCommitHash" git -C "$OPENWBBASEDIR" branch -a --contains "$commitId" | perl -nle 'm|.*origin/(.+).*|; print $1' | uniq | xargs >"$RAMDISKDIR/currentCommitBranches" -# EVSE Check -openwbDebugLog "MAIN" 1 "starting evsecheck" -"$OPENWBBASEDIR/runs/evsecheck" - # truncate all logs in ramdisk openwbDebugLog "MAIN" 1 "logfile cleanup triggered" "$OPENWBBASEDIR/runs/cleanup.sh" >>"$RAMDISKDIR/cleanup.log" 2>&1 diff --git a/runs/evsecheck b/runs/evsecheck deleted file mode 100755 index 3a8a2c936a1dbe98b75cd682a40f8f8e1cfc05e0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 37632 zcmeHwe|VI|wf}6gfe->Nu+}uDWz|?y4Pnu!QL$YJKQ+KYf}+xHmSiERNp?*({AlTI zz^M2YYLqBw!K{|vQm?gmrLDDCv6ouvrMI-DSFWXPHsP(2qT*F6Dw_NG%saC?d4;mQ zPye{j^Ywi)nK@_9oS8Xu=FE?s_nogzubSaNYFsk0seVFJV@vzW3E|e}hNWd~(XvYrC27cmbTj9o zQg|p2mYENEc;Sd+{M?Rbj=%isUoI++{l2L2gNeKD{M2t(S0awGAfFL%E}zTOvFL_r ziN#`A*5N<*jy~7*wEvMvSIL%~l5Mwb7qeqWdfi!W->9sPk$Gb8BgG=?)~TM6qsD}@ zK0Ee;hd0}D6=FDe@nKt%Z$8{;IOa1J?qtuIK%NCx09OcC1otU8AKW=`=fQmjj?V>f zB{C$$XW?H6cM;qKxQTFnI11@9IQ>*0a0T3za96=ihPxV$&*$L+4B(jpHx-VunFcol zj?YZES#a0FRl)I@2N#5!4_5=nR=5uCM!1zP|8Us&XWxGCrZ&%rQCqVr_P&2%^XA$M zgYP{2#kXJU-qZZmSI3;ud(qb9<#WG3Y;E03&wuNo@G}>W>wSES`>RFI-20mad;Yqo zYvSCi|N7jB*?EV5@y%ub^{IcFzWmlzNB*sL!pxhz_n&d(x37=hnfK#wwQq@gADHxu z8yCI4Y1Kum?|i>#_fH>R{!;sQpSWiFwXeMU@ctidcw_X61LxE|`_lDi|7F^bmIdBe zP&n!@xmWJyz1(oeQw6ZzV{w{>+9El$MvaCe8KZC zXMFu@YirJY^0DH_SJX`IZhPqJ?brUt72h7WVcUX3nmPplmsd6X(wcYi+OG4? zKmWPP>AyQ#_xXF~@BMwj7oNQIjeX-kRlehl3B%reXnEFwwF?Sg`Emcft9xEbzCQ5h zoTB$`s{HqdKY7+X*Z0Z?zV_Z@2S5D9b(j67`}G-fUKsU*H5H>G)@wi6I&9{50vB%H zaoNFJ78Ui}_4Rvh7}vB1q8;*3Z}j6sV3G#l6Ar-X$A9&*4>qkMZC()2yx z>tA3KjfIs+I?8vU1773c_Y%rG&}xb=K?2zYI9rP`l7(VHzJL>y0(CT^+SH&XS^Z*GoAb$>AM{8Cmrx^)SvR@L;0_E$oCDDcfin(yB+m?!@;i) z@G;0=*Y8%q!7rut<$xpozc}*y?vV1FCH~7%zu!9O_sf#o|0th7I^chGz&~@O--_}T z82ZxZ(1#Bk<-N>No_t6AaYy{G9Q-bE$ZN8rJU1fVYv}*i9r4#X^7{(vw;S!Z2fnm_ zp!cCZ8s6(D&(0z8EfAjvzx9o2`rY8;Gx8Uh!^Bp_8=@^2mtD@;%cL^D2+gjU6RMB2 zMwT_U#UrgXb1IvnEs>h=lBS3Vg_bo(TS9H|aBDmi5}|9BhZZQh%BFBzTcpiSe$vFj zRdd^$mqc1avs>aKxN1gIG#n4rtcrncV@o4Z^Ok%mQWp=+jKpWhBh4bT6nLO(+G9-- zn=-g+PNW%mhMStAb%>h2vMw|?+#H$S+8S*I%(T}um}VLWxl7P*pT~b9*dJ zzo4s1CKY#F%y|pvoETEp>4SMN84nFEpby+B_rL+8kyM%VNOaZxt=0;X1{Jgrl_SV)&Ju4roY>3p|ydVNhTjTPG5|b*@?6#WLc3F0`j4e95 zZ78*d)=0R%Iv$QkLX~7^>p?5pPnU~jPz7@46m6+$Y?f-`tV~U7xGpj^Tz7M57SvXi zxUwk{Zk5Glfl%M}I#$xCxE-9*QeWNpWu}r!p{k6+Q?iXq+T$tRvK5vhn-*3pSJ=lF4bxl-Ov%+l+NTr~;QHs}Yq98N{02>9|Z34o&f-)mn zLz2v8_n?qc4G3D5zfoyg(zw)b+EG6(YcoTaG1MM!Y?9`cK)noJ%wU~O5nciV1KUai z3QMyz+}H$&@ygORhZ|c&C{iDehY_))tbKYu{h-1-iyUB=Q!Ta zfidP{UPz5|VlNiG980}7*mE8)7N#7_y$kF)t@m8;A&dnk=iFXwc5rUx#ey~;<@*E{ z+aCH@w0h}dky}6?3*936Sit(|PeFS6Sj?8t$AY_*J}U30k402D{X8Km=wq=xnLZZR z0s2@>PowX{nwUNo+g0?j01wi~g1Cl07H5m-V?$su{j-IrrH{pQJ$)?P8|YUG(L^5$ z_89$73lXP}3E4{eSlq9sf3Xl9^n=(lqW=lVojxXu>*=F?y69t(*G>O=AvV)56=Dnh zfDj4#Be5?0{&JG5S?#U;5L~zVxwK@D%+rA$HN9gZ8FBSBO3I$D!Tmdxh9X zzgmd>^e+|S0R78_I7q)(h(q*;3DHX*nsu1|7_=XK>^U8!KOK5OKUavi=%0^0l)!{n zLT8A-YjPPV5TyBI*jc~CME;7PiBb;x9-A4Gt`{{bUWrU9!;loDwkP$v$ zg!dWYJw|w!5#DKpA2Y(+jPMpC+--!{8{tkPyxIuIjc}6@t~bJqjc|<-t}?>YjPPV5 zTyBI*jc~CME;7PiBb;x9-A4Gtdxrdt@KGat*a#mo!Uv4-J|n!x2=8JTPxQtKhYO7x!ai!4^sfMymB^3f~>j;oB|YS!b1tZmXiU8+sb-pB(JA%6*;C z?M`d5r_;i42)*kv^rHhZrQUT}X`Q=H>D>JW-R(-}?ze_P4r$tj{Y;P1t>3eML*KDA z&kP6wT@3`F*ENvAZPq)3gWx|@SN|JrBI^`Hxq~QoaGmNC_ZoSwRe9cvGN$v)6;p?#~{5@8dFVI`QyT=+kF`9hj+(a^41e00* z#2A-x#yOW8{p=WYCJ@_#a$n!ivK*W8%)oP? z?_wUoL{ikk`8Hav4&)I?B=dJe4!hU)Jq(<4YuSJ&7dS;d0st zU$>PHyF^=(?_X<)K(G(flESY+zZi!7DD)#AzXyE8M(ax8vDI>U>kA{$@wGaoEPJVu5oa=kQ?hEbvU@u>IBdH+Aga@@nyM%=N>EH2mSJ`?Q@}D z<-?YsU%oJ0mG{!WQQqoPly|gI-U?OTBN>#JWzDKhB#%>mLD+3ybsy?ocogM63fxhY z`zU1aWyy14{{eqbPOq;g=YXdt=aA^hfnMaXuELMLjPmC|Hv2!YWqJYn(Jt^|o7sIc zF)qv3>A|$Ma6Rzbz<)jXC&2&Dv_E4uy)48%7Wymt#TqMn%-WZsJAK2@@6kV=rro0K z{{;T|=qrrN_uqywXs9ixp4j7rZO?T-w9~NtZ4dOZYo;*pG+%AYaIs{epRTA;V#Ssjq9n zL+d5iINW1DHV-zqE0HWJXWP#2E8jn-Pjn=bY;O_RXkmF$I4prM?XbA9AJg2tw=U_i zyfN12`hHBq^YV9WwDOSeNaVxv)=53Mi9Z9p)G_G}j3FCge{M{6%-=NpF3^tv%|onD zSFmpu_?Oe(-TlnK7VyoE(XMaAIIscyVRu3AM}37a(O;72wn}$&TP3i=rEq?@63{&b zUZsB9mSHT*%k^wR+AeDq^Y91zV6Y0Ood@1x(<^rphq_?dfU#`jD;oy^`+|L?z75uS zNV}B0FphY~p^hjI%iw~Y5+2wE&lKp~eCY66D+fH?z|l^ztOe+=lOS)F@=&{g1FuCL(?Ck6a7fuc!-{zXZS| z$Dc@cfG6$N>Z~4Xx#Gt*qih$o_E-hJO;(YAlU0m5c~Q1}v0=bNACBWH`(csTU}Yok zZ17>Ze6^@U*9I$#{QM6{8)(m`?u1_GzVd*@w$pt@_%|DL>(m&t8RL&ZgL2=_`apNQ z9ht1$_U0G~T^jlpw&pGIm z;73{cFlMk%ee(olgK>a;I8fVZ9V9Hvrstlgo=;Av3>-EnAjiwJ{ek`+@u1zZ#ZBl( zqA;-IE{r*7*D;CYPUh7S>^lfP-i|vg&ko23?VPnckz6}zU2nd)0d`e9eJ8>kGu(+= z5r2opx;_p$jQ64uN-ZCwk%V+on_ygr)&wwG1xhd#~hbw z1GmEs&cysYkw^xo^jI#)y#({7Vo$fVi*_Iu>>FO2a8Y-KxS=1qG!FB_Lh8{B)+re5 z%jrst$q6J}IiT}_t`zBi!?@aD-!R~@<&gIy!jQciG+63`S8x9_N+!9$Ve$s~CiY<=ElDJEl&VC3!BY(i|D{uA;-J5 z)&Ry7R|5Jg=R4I&Y{$IdML8=m2AzX)a85}ZmJ8f)*s2l!gbQPb3$k*Jl=7|VKkM_+ zr&czw+A|hd|XI_aGxAgf_52mQGcu(2iAd}c9itC z+>tlN#auB?=FPE+{m~`Bqjsxx=zXQ{!G!Cmv>o?btTWqJ_;0u60~_QPpk$O~JfA6c(pd_EFXZGgU$$_sP5y!-(2mGxj9Q8)0X?8?zbEDy%aynGdY zi84WZaUIV2757lNe=GM2P^PL{Ti!l#zqLZi61>&Auk%clqmX4ULHxaxA8iY81%8bC zzT5hw4qzVgU8L3JVB2%=_DSd&=S`J=!dwY9hhr|x6uqv>A#Tux;5_xo$$f1NcMX-HEf)>$|JCS_ff-D4e6X$ycqk!$12fnTZU-vzD&{7Nu?Vp%93&NEhn zM(10Kv~Msi^o(Pbz}n_ImEMOqG!ASk*Vfd74yzaQoEKESC5S)65x)oVKUMK=#E($% zC9o@+$F{LOR;k!*{aDe#?tim;YR|VY4}7$1L65Zzdg=DpK+me}IjzSl#}Ur?Ji=>j zMmn$Gi}>5%IQI?qb8WZ?X%``FmP!kIlSleppr`H52Oq-ZvjI5H>nR6sptBDr4*RiR zlIIPQ@4|le*S3*8ukJ-W`L9D=*e_@kvXp!Rz$JmpGTLz(aI~qIEA$^%X=efVB5)&t zdsE@6fcp(_9^hV6xFB%91g_iFW4)qqHNfo!ZUDH$3bzQje*^CRQHlOPDcoYlDbb0d3ag z*(}@YA(c<={GRU*V9zNlkm!$Oiz6q{M`4?#UUB~VTSeD_@*IL*1;Jwxcu+?BR9q+G zeuubqz*C;jEBt!ke+7IO(yUZzo>g((h})~;HmkU&RNNNCJ%>2jpakms3~dP7OhDH? zVuOXBQwkRad#qp6-pZ%<^ZQ{p#xHb<|AgO-%JNLizasoLI&?2=%ejavgS#58Ae<$h z2hCo%R}ru6&OyMxgyVk5Yw)>-uwPQ~}lcWpgIJ7>)IDaF_A;JXiepHh7Pp!mL!DPMmA^B#NboTk#U-#{O+ zAH?-O_VDD`z;z7g1#8j9TdmzFOP`uYdO`mr=rhs5UA5qeJh>O*h0b!!?xsz}e5M@s zCwK{T6n5zg>9XYHz?Rno@Aci@*D%hG{|@3k!3|ctdc1Y-aIDud(0}Hq=Lx6lE3hB^ zdmz*O+01u?^_Q@=kd4qqXUo~%fY!yY0Y?y^<9`#R%4CZ zm4k6I3w;+=7I`-*zRYh4@?+lnRGxJzE|g)OUEPqI%5#x;;FNiO&d3vXOy;@Y^8jqZ z1J(=`H#5UL14yIuJXIafHS)Ve<##~kccF^&XP93sf;tAUr{cr>%6~uhg6!WfxWA6M zV4pXz!MYqg-JAy@j~L2FJLkr}H)VW9mdHB@{QC-54BTbF9RiN+`nJNee~btIXV8D9 zEdg8t*wjI{Y|oF{VD2?(y{BwAH$AN`#_mta(T}=e4%=6Xx^WGhjrw?eTdiItvp*cS z?aF@4C(ZJlYD{1mdLak)!!gRPuzuTJBJVJGepl%|<@3+LWy(|6aka7$$t5W)Uiy;SYp&GQ@xrRf}Kkw`fIKnFZZvx2T`9l-s(-9ZyiB< z=lC%PhQ07AThWO+=0R@j(MXg9nV%Q=TX{Ej^a_d{p+8v@tl)D_wn*i;$TI*@k? z+eSH4Uz~dom^Nb`I`sEa?l--FytuA@k+R2JBfZbpY3y|m-G}4)>?bJyUEo=B?Rc#1 z)AbP8L-+vo@CLD81y=&6?c`{2&%iGc_kXb+1@x<6GV~06m2Fs(k9zIE90Rh4F7&Yt zOVEZK$HqZcBhiN4&`~+Q0mr)CkGkFZ#YF$O!2d#5VJkA$(F|!z{q|aPdXC8Rsj!>& z=xWS&lz!!o8gB(qNA3sEUSWv@JCo=y#lDBuwNs5-m4Cv1CVs1$HD|mv7V`T9)^|aK z`TJlE{CD9mg3rCp#qfD%LiWoH%df|vzsJs-eK^y8PyJ+_IS=4?&bB-cZMgxzNqXjv zx8}0k@T=he)7(V=HSm3aXTdLqpNT!!{qpljQ-d_z-&_R$D)@`xUje@s{^jsFZz_kr zanH9HWy9Em-`=-cul#lJFS{^L$mLuedkHhpu0H^dzYSc7@KN6b)-jAT&kzS0pP3_` z-V6E@oIl{VhnL*;Z=!F3hI{W%D!Sjf#nU2#J^sbue_W;Arqbg5u%`pSpHTRR6#i}C zX8|u@+nLv9g@0YqyA}Rkg?|P3VbIAU@S#0=9`fgU_+so8(+=>rYPM0MlKGwB$=@#0X_Y*I zBb`nweBUr=?o#}}VPT&wP2(6-PS$p87ca{1L%l|;@;}V-JND5}Himg!4_ebyyR1dI z3&015AEd1A&8F_0zFnwqA99REn?P06cOLF}C^Ox~1@ee$_Iu$3G;xkrm}Gs8UJ zV_lJFg{qRzvW&P+#ni%{ontaB{bcW#E|-~P5OBc>1d9<-=G-y;ro zV$r2EPSn(B{39dn~)%H=^A)T3ssdu^G1ecIe9Us?FRemk;Hy zQ|<1OCZ+4-KTUkc*<==zvwMyoP5k3l;A4A>? zRK1_brmcQZt`XRdkAsH&`YlzyS&D8u=rZZo9aq`E*)PW4(Q(g4t3svUg!J_)E`Ycb zh?}J1x)3)@#mO@}V>VhBs<=B5S8AklBknvEw-#|8#-Y6I`$gb+ozj`FP@exFJMq|+ zw$9`tZ|Y38%Kv`kpGlu@n&&qgWu;;$Jti7Z|x^mDR0Np1{*3AdqPK^nj%4VyvRE-Ilwb$wG zz=@T19lT>Up}jU)n^nS~MLmnmIvry^kYqIT6UoJ0re49L=FYjVqUH~4`$RmL{mgI4I`;mus39E7p z$TS#FQs=h+pWQD02QAX+b2!|u-7&n!I!ERGqYTT-^-K=MA{|m~#-zn4lW6HlBx>c^q)(XBplXxRUCIzTFdb=VuWozO zZimkRu7SRpzcqMjZ^K!X+pMjmL7LA&Z>C|~;#^@Hap=nh=y&Xo+^e9iIjHQ~SXrji z_k&DqZ6-QKd#C4+UsYwpp%>VM)7vSw-xiFsG00~-%a8VZ9d&hsXEEx^d1-^<`Af<3 z^z|x6dp)G|^$>WKfX`KIFUav(+5b+@gLB&r6bW`wz~w*|f%IGhR9l4+9Qoe~z?*AJgsuZa8p11a6ZXbu1rapON`M(e1%m7lH9z+C%Y9q12MHLsKcb#*Vo#KN z+EGkvv*{$~-U4A=%}_oPn8{xuBvVMzM}MFagwK8bJ+ z@GmR>P5AC0)-j0Feee6g;kS@};<>->x^=PN<$0^U`d7>7D% z^E^D?$+-snUpz+Lx{h`zPtU=h2X3+-=WfBXHgK!lbGeXZ!5BrodJplXs%$)eFdAXb zt9bVF7l@-xVwiS?@)W)Ny<+R(Q9j7Xhxe()1k1AcP|hWeJsvhX~v{car3JM)YxVdxn4N+-O+bG;s%gZ(|?j^Z1K ze0W|QI+>hR+hffNVoh3mcW+J*u69PRs{`kdyAsJoknN1{jwH@!=d!(BIFpER=I{u} zHP>UW!^zt%u1n(gj6$B{c8_w26ZtNI`X%{ZJKt&NR~AF~ddEsQ{V9>qjBs0=-+Y-H zy>^9|xIElCam9)i6C2{qO%tQBNXzw8C*ngL^^I*ePi%@^99iBLS$bNsNs5f0hY2-A zo9gkcoRI#8P@9OYYL3<~X>Tj5Yih(dW6IiAwbTiOTO#;yP$Z>YL z1Hrb#2W{$ZE~^vEnxad>O>Mq&uJ)0Gh~r~N@kj~`g<{a9*s7)SQ!e;|6KG@j-ccyJ zbZHwTc7B_$)nBlsc|K0?Mrz&}a?-B<@U!SUgL?XJzS!#62EqWo6n^Sg3*-%EZ+7@z)<-#f;8k@B1K zIPWUlaCk{l3}F3*Prym|?GFc|J6$e;q@p0tC9u{N4Q_7A3h@SzBjMvcc!7`5$Oq>i zguss|T)`bg!SG2ke9zVXrh3O1mkjsf*74Ci zz<=+<@8j#I9^Xs;|HbJ#({I9es9(mO0c9&6wBL5%=2g4ocknf?0k|0s+z#NbcHo`@ z?tb8~^=Lof_Y~Ik2ON1E0^N^5M;(z5=neyy2ORay#^DP^zX40diFLre2^_XN zQ@8`bjlsKRsTKvl#lYPSIMsEhIeT>G@DYT(KpbVa}=9XKy= zhk#>0(0SAVmxuC6ohK6cZUgQ`2i<1ihCAqDzS>3+ks#lW56sBbrLzj5%}1>AO| z#rw0{06?+C{+a0nTiXoxm*u&XmD!;GT8R zbpiKH;LI|Y0JjD*y&zRzd{Yv*8y&a+aHAY;bP%|$4u1Q9dk<-88|8!cIN39^vhqq_ z$%1ejwqn99zRSukDf3U5RB=&jtZ~vs^^ql4v`_l1jrCpZpLDtZ(n*(zDfkYg2uH$8 z8ilJE!JNy)uwl8b5w5(fvF>p$uj@?LS=j}yPr3@Tid^TOJYU{Z!Y5mf9`@ZKHf;B{ zu2j6O-5dk#c)Mjd2H3FO0vsD`*p{lc-PuZ8Xxr_0yLC7Q*s!e;92;!d)>i$k`)t*# zX~*q&j$lFrKA~aTvgmL3XUiKt@EZ$c&nH{pjb1#R`2B=WwrY{}DVU>^JqFUxmLror z2HLP~MfIL!wj9wgKB;jgTlZj$c{V*h28!oI3buQx-ZRa{x9QC%Tiz6t#^6|@Y7raf z7Hky%A4(-Cmp#5Z3L%8&@6ytRKz4R<)<5FIVkF`d2hDd`++0TOj|pfhSx8pXH(I zbpzg}U?1R$v(j({;6s3M?qAX~t5^ZXCiqOh6n;&iOWvoV>(>p~en!dqBn)^pq6qI* z{3y?wvxm|*7;qP&2=6fH-MnB&J~saX1O5)82>apd^7uYAlzx^0GoR085zX|~yo2yDz-h-bTLJ5N4B>kL>vTy4ETA#B?gS|1j)68 zE>97rya6M=1n@xvt^mySgQlMay_V+&WCth^3lL9O$F~CBX~1^?-UXO5W%h^7fcF~l zj{@Fjz`FqNH{d;h4;t`3z=sU@0APOWg=-t~=SP{38S$?He#?O01AN?ohr#fjFyL`C zghqXRfZYZ>5pb>ne-3cI0nY*KGvHdlr3M@Y>^I zfU6An1;B9wei5*KIDhQ}tk(}X!6E09Znb~M`Rwb6*RY=Nlo;`xzmyyB8=%*)rmr>P zsV~B?mrSqs3z?sLWE$4#yNvXOi08Qt&Oq3{nM9UE0rB@deOpm^*`vXa4qsySxyuAH5#nSs44V*CWNL^@Ba1;+Yv8?`#k9 z*Xuv-PObxg4ReQ*@w&aZgLyyVHO%%iAC~74#A|u*wzMY!>-8abcy41A3@LFsU44{AVA-{JV@ovPY^E*q71ng1$nf1NU-eQpH zng5jzxY_|XIN%Q;f4v^&-GXh1=X&8-iQOJ+0Gs98;7GsK0YC15cLO%>Lfr3&KjMHt zaKQO!AN{a?1rGQ#4)|)o{4Q5Y9~|*Z9B`Wh?r^{x9q=O#_;J8me>~8iA3NfI1K7O# z?ua9PxV;4=tH}DD4cNR}?z2X`5AhWSO!{erl|3Dkb(WY9nENSq{m&4!4*FXhaEAll z>VO}0z`Fp`zSSaI_Sb!Y&AT`shd!D5(xgp=q{sKq9Q<}d9(uos{Ej%{kCVUAKhzc( zxG{e?4D{w*i07m>HSPE^!0G-|Ag*M5L;5bh6_}rMJ-bfw8zruBq+jTO8v&blbH)Li zcl&h!Ht%BG;7I?71AfAQeJI1v0GoFczG%d=zJCU6-rc#@A>a2M^tsqV)b*!+cmbPt z4;I^7jNoj`>rw;u0XNTpnSU){^Dfg{9Pw)%@bhRtz5g~A`)_wU;G*xuGEFM(cGS2q#&KdYOdm$kHW6S`sP#LFg@m8rjzMc1{)CzVA-alI%G|09?+ zf*FtVg;qquH;0zC{3Cd_fM@Cy8_xIHhe6YK*;R*^^H3sBh^CPXB0S4yV{wBTz<9JZ zGP^}y{0BVG04{07p}}~FS2Bj|BZs&-(&mF(G4>PUvn)pd=jbn2|5ecNMoEK-Nlr79A4Ldv@b<>^zKlYQl3SzQ$OJjPn1F%u!jpF*dlSRyHiKJstY~GnCFBHV_T!ZPQDlISL!}(Yoi<~LX zXv!P+P_hNnYie!?%~&|MvS#+YxuHpM*qgrJF-I-W$U4-Vl%XhV0|LA$7br zgyX##(xv&G;)JixPM`D**=J)z@}#ehJjsb)9d(kEzdFi!0$Ag55ICd{0&86QK(K*P z2ZJ>xbwF4nQU`@KB6VOmh0q6wQwV*4SR?d7Vh!s9#Tr%zi&LO|z&Hik2aPqDI&f?^ zp?y|0)l$ps!^fIf9YWTieHd9o_Mv1A>BGr3TX{q|#nnEjtSRMzWeuo<%XTUrUrr^G zhnO{)Jj|>Cb*R}+!&A1YH1<`9N;@Ms;+%@%L1&$w2cA>mTT($BfYw+Xgw{b^*s1v8 zzEBlfszMMv&!We}OB4c^--b@9ZH!DE4!2oJ)X?^qD1E3rO*Nz?NOMYkwW}I($;?)ga9Uynbu}3tq8LOBQ5+%+*-KC#Y-ck`ggk$bBlGD>8Er=jqg^Ga8-akK z020(~B?0vYz)9=^qjkH9*H5%=us$}_BM$8d#8A!$q^oJX*E$r!(%qcF=U8TkDi={0!8Wq#bb zEkXSXg3(K4c|)m86?lnCpg>MB$Zn~;QQIHVxv6LesEejzby;jsU{=}|Z(q7pPWG;; zTo9_7U0s70AL>&Vf`{VG=!Ur7m=dawhU|AfLiL#BwS~g%E9H9`cr7DRkGC%_xq`W$ zgi7A+9SXO$hF8%@wXPEOOCj~`&CRQj#DL`O;6q3wO-m>64U4j9HArVHm@;R2X!_h~ z^0gP1S%*oJN{Hs3cEj8$b7of}jS+)aRCxRD%&K`)r&NXJ&6rU=y(UyMWop&*5O4Z5 z?jTlo^47Jr>zm2VOPYsVFm7Dr{E@qY(>G3k^wMQ{6FDZBeBTJuVe?|=zjZJBklWPt zJ;(O#(CO=fA)cYPD4X{`+w)fAmh;q{n>R3Plj2ALc=rU4|O%aUzsj zHXu_b8FJM!;FI2~tR}ugZ&FWPMb1V`vo)_fPGw;W8(At&YGMq;Z1h)oUvuiRZRb_& zs-ZyWywCb1S3^6ljAsqao7xwoZ>UF1YCWUx{zlWD{4(^R*S3G;Vslk1`!?&7+(#}i z&`#HxrBe5xhj@9kzBU?)b&@;Wsc$A)U%38}tEdBk^o`Ody9+yoQyRFe85hsXZYEW* zhBjEUi}NTx8WVHR1+%wQ)-mDh&~n1)t_EkK|bo9^Uw^u zSJqI4*TtAnU+t~#E;l+db;@~RJ6mT}EE2MpeCd+NE5-S89&gx&uuwAd{&LE1$X)Yu z+nbl*H9ja5EKd5?ZeuB`E-;tPHsoe=YU&K$JkD#&sk(~Nyl`ILQ=Ym5KCSTNX5X-` zbzWZK9=c|EXhCF|oW@i(@vd>+2Tv1Z_kAc!v=tax7*vf5N=3l_&s)qRnudy{iWdsi z%&Als*Jj71r6$BwnMMIBNw#R?nmMVrF_DhLNKJSNT0hmCAZ2zyRO(i>>nLwYAF6tD zBF&*WX#Qv&$ZfS!m%B5^>+E*|5oMa`^quY64iC9_eP{;Kj7!lAymi{lWk4C01h(Ix zLyfc;F;Rv$10!Wqrp}%a4=+;?c7w_|tk+M#w785=1Mj6Tt6$XuezuRw${6(y;}8H- z+p^Y36Y1?htSK(aq|%nfBP$Wc8)ZpO$gB+szcfHrK!W&H5`Jhut?D+A9~^5+|#t=Es< zLOc%${M;?+c&0Cg2%jc`&pl;6li)NR&ti6gu2{y{|1{k+fOv;K%6xf7b0_F_0>GB5 zd`L$(7mhy*k&b6K8-UyaA{;G{rI{xP4UyzPtJbCeX2#$2jioYdPfNnMguO3bJ&wxP}TMM6O zJUbWK{Pa&an(hgkPV(b#nd?EPL>>@J58x8NOFD2*>h4#icGA#TGSR5#n{|w0<-{qD;EV4d{0|5^*~C EKVf%#H2?qr From 9e212c0b48a3373875f2ddca102c0abf7c96fd94 Mon Sep 17 00:00:00 2001 From: okaegi Date: Fri, 23 Dec 2022 16:28:26 +0100 Subject: [PATCH 191/201] Acthor Temperatur Anzeige... MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Falls Acthor als Gerät 1 oder 2 definiert ist, werden folgende Temperaturen angezeigt Modbus 1001 -> Warmwasser Modbus 1030 -> Reserve 1 Modbus 1031 -> Reserve 2 Reserve 1 / 2 nur falls angeschlossen (von 0 abweichend). Sonst wurden auf static Types , Python log und neues Filehandling umgestellt. Ebenso wurde on / off triggerr stark vereinfacht. --- modules/smarthome/acthor/off.py | 78 +++++++-------------- modules/smarthome/acthor/on.py | 73 ++++++-------------- modules/smarthome/acthor/watt.py | 112 ++++++++++++++++--------------- runs/usmarthome/smartacthor.py | 31 +++++++-- web/settings/smarthomeconfig.php | 2 + 5 files changed, 130 insertions(+), 166 deletions(-) diff --git a/modules/smarthome/acthor/off.py b/modules/smarthome/acthor/off.py index e103854986..28f48f8a98 100644 --- a/modules/smarthome/acthor/off.py +++ b/modules/smarthome/acthor/off.py @@ -1,61 +1,31 @@ #!/usr/bin/python3 import sys import os -import time -import json -import getopt -import socket -import struct -import codecs -from pymodbus.client.sync import ModbusTcpClient -named_tuple = time.localtime() # getstruct_time -time_string = time.strftime("%m/%d/%Y, %H:%M:%S acthor off.py", named_tuple) -devicenumber=str(sys.argv[1]) -ipadr=str(sys.argv[2]) -uberschuss=int(sys.argv[3]) -# standard -file_string= '/var/www/html/openWB/ramdisk/smarthome_device_' + str(devicenumber) + '_acthor.log' -file_stringpv= '/var/www/html/openWB/ramdisk/smarthome_device_' + str(devicenumber) + '_pv' -file_stringcount= '/var/www/html/openWB/ramdisk/smarthome_device_' + str(devicenumber) + '_count' -file_stringcount5= '/var/www/html/openWB/ramdisk/smarthome_device_' + str(devicenumber) + '_count5' -file_stringold= '/var/www/html/openWB/ramdisk/smarthome_device_' + str(devicenumber) + '_oldpower' -if os.path.isfile(file_string): - f = open( file_string , 'a') -else: - f = open( file_string , 'w') -print ('%s devicenr %s ipadr %s ueberschuss %6d try to connect (modbus)' % (time_string,devicenumber,ipadr,uberschuss),file=f) -client = ModbusTcpClient(ipadr, port=502) -start = 1000 -resp=client.read_holding_registers(start,10,unit=1) -#start = 3524 -#resp=client.read_input_registers(start,10,unit=1) -value1 = resp.registers[0] -all = format(value1, '04x') -aktpower= int(struct.unpack('>h',codecs.decode(all, 'hex') )[0]) -value1 = resp.registers[3] -all = format(value1, '04x') -status= int(struct.unpack('>h',codecs.decode(all, 'hex') )[0]) -print ('%s devicenr %s ipadr %s Akt Leistung %6d Status %2d' % (time_string,devicenumber,ipadr,aktpower,status),file=f) -f.close() +import logging +from smarthome.smartlog import initlog +bp = '/var/www/html/openWB/ramdisk/smarthome_device_' +devicenumber = int(sys.argv[1]) +ipadr = str(sys.argv[2]) +uberschuss = int(sys.argv[3]) +initlog("acthor", devicenumber) +log = logging.getLogger("acthor") +file_stringpv = bp + str(devicenumber) + '_pv' +file_stringcount = bp + str(devicenumber) + '_count' +file_stringcount5 = bp + str(devicenumber) + '_count5' +log.info("off devicenr %d ipadr %s ueberschuss %6d" % + (devicenumber, ipadr, uberschuss)) pvmodus = 0 if os.path.isfile(file_stringpv): - f = open( file_stringpv , 'r') - pvmodus =int(f.read()) - f.close() -#wenn vorher pvmodus an, dann watt.py signaliseren einmalig 0 ueberschuss zu schicken + with open(file_stringpv, 'r') as f: + pvmodus = int(f.read()) +# wenn vorher pvmodus an, dann watt.py signalsieren einmalig 0 ueberschuss zu schicken if pvmodus == 1: - pvmodus = 99 -f = open( file_stringpv , 'w') -f.write(str(pvmodus)) -f.close() + pvmodus = 99 +with open(file_stringpv, 'w') as f: + f.write(str(pvmodus)) count1 = 999 -f = open( file_stringcount , 'w') -f.write(str(count1)) -f.close() -count5= 999 -f = open( file_stringcount5 , 'w') -f.write(str(count5)) -f.close() -f = open( file_stringold , 'w') -f.write(str(1000)) -f.close() \ No newline at end of file +with open(file_stringcount, 'w') as f: + f.write(str(count1)) +count5 = 999 +with open(file_stringcount5, 'w') as f: + f.write(str(count5)) diff --git a/modules/smarthome/acthor/on.py b/modules/smarthome/acthor/on.py index 8b344b9ccd..1d43a2f175 100644 --- a/modules/smarthome/acthor/on.py +++ b/modules/smarthome/acthor/on.py @@ -1,56 +1,23 @@ #!/usr/bin/python3 import sys -import os -import time -import json -import getopt -import socket -import struct -import codecs -from pymodbus.client.sync import ModbusTcpClient -#from pymodbus.client.sync import ModbusTcpClient -named_tuple = time.localtime() # getstruct_time -time_string = time.strftime("%m/%d/%Y, %H:%M:%S acthor on.py", named_tuple) -devicenumber=str(sys.argv[1]) -ipadr=str(sys.argv[2]) -uberschuss=int(sys.argv[3]) -# standard -# lesen -# own log -file_string= '/var/www/html/openWB/ramdisk/smarthome_device_' + str(devicenumber) + '_acthor.log' -file_stringpv= '/var/www/html/openWB/ramdisk/smarthome_device_' + str(devicenumber) + '_pv' -file_stringcount= '/var/www/html/openWB/ramdisk/smarthome_device_' + str(devicenumber) + '_count' -file_stringcount5= '/var/www/html/openWB/ramdisk/smarthome_device_' + str(devicenumber) + '_count5' -file_stringold= '/var/www/html/openWB/ramdisk/smarthome_device_' + str(devicenumber) + '_oldpower' -if os.path.isfile(file_string): - f = open( file_string , 'a') -else: - f = open( file_string , 'w') -print ('%s devicenr %s ipadr %s ueberschuss %6d try to connect (modbus)' % (time_string,devicenumber,ipadr,uberschuss),file=f) -client = ModbusTcpClient(ipadr, port=502) -start = 1000 -resp=client.read_holding_registers(start,10,unit=1) -#start = 3524 -#resp=client.read_input_registers(start,10,unit=1) -value1 = resp.registers[0] -all = format(value1, '04x') -aktpower= int(struct.unpack('>h',codecs.decode(all, 'hex') )[0]) -value1 = resp.registers[3] -all = format(value1, '04x') -status= int(struct.unpack('>h',codecs.decode(all, 'hex') )[0]) -print ('%s devicenr %s ipadr %s Akt Leistung %6d Status %2d' % (time_string,devicenumber,ipadr,aktpower,status),file=f) -f.close() -f = open( file_stringpv , 'w') -f.write(str(1)) -f.close() +import logging +from smarthome.smartlog import initlog +bp = '/var/www/html/openWB/ramdisk/smarthome_device_' +devicenumber = int(sys.argv[1]) +ipadr = str(sys.argv[2]) +uberschuss = int(sys.argv[3]) +initlog("acthor", devicenumber) +log = logging.getLogger("acthor") +file_stringpv = bp + str(devicenumber) + '_pv' +file_stringcount = bp + str(devicenumber) + '_count' +file_stringcount5 = bp + str(devicenumber) + '_count5' +log.info(" on devicenr %d ipadr %s ueberschuss %6d" % + (devicenumber, ipadr, uberschuss)) +with open(file_stringpv, 'w') as f: + f.write(str(1)) count1 = 999 -f = open( file_stringcount , 'w') -f.write(str(count1)) -f.close() -count5= 999 -f = open( file_stringcount5 , 'w') -f.write(str(count5)) -f.close() -f = open( file_stringold , 'w') -f.write(str(1000)) -f.close() +with open(file_stringcount, 'w') as f: + f.write(str(count1)) +count5 = 999 +with open(file_stringcount5, 'w') as f: + f.write(str(count5)) diff --git a/modules/smarthome/acthor/watt.py b/modules/smarthome/acthor/watt.py index e1bf53ec81..b482ec5eec 100644 --- a/modules/smarthome/acthor/watt.py +++ b/modules/smarthome/acthor/watt.py @@ -1,32 +1,31 @@ #!/usr/bin/python3 import sys import os -import time -import json import struct import codecs +import logging from pymodbus.client.sync import ModbusTcpClient -named_tuple = time.localtime() # getstruct_time -time_string = time.strftime("%m/%d/%Y, %H:%M:%S acthor watty.py", named_tuple) -devicenumber = str(sys.argv[1]) +from smarthome.smartlog import initlog +from smarthome.smartret import writeret +bp = '/var/www/html/openWB/ramdisk/smarthome_device_' +devicenumber = int(sys.argv[1]) ipadr = str(sys.argv[2]) uberschuss = int(sys.argv[3]) atype = str(sys.argv[4]) instpower = int(sys.argv[5]) forcesend = int(sys.argv[6]) -# forcesend = 0 default acthor time period applies +# forcesend = 0 default time period applies # forcesend = 1 default overwritten send now # forcesend = 9 default overwritten no send -fp = '/var/www/html/openWB/ramdisk/smarthome_device_' -file_string = fp + str(devicenumber) + '_acthor.log' -file_stringpv = fp + str(devicenumber) + '_pv' -file_stringcount = fp + str(devicenumber) + '_count' -file_stringcount5 = fp + str(devicenumber) + '_count5' +initlog("acthor", devicenumber) +log = logging.getLogger("acthor") +file_stringpv = bp + str(devicenumber) + '_pv' +file_stringcount = bp + str(devicenumber) + '_count' +file_stringcount5 = bp + str(devicenumber) + '_count5' count5 = 999 if os.path.isfile(file_stringcount5): - f = open(file_stringcount5, 'r') - count5 = int(f.read()) - f.close() + with open(file_stringcount5, 'r') as f: + count5 = int(f.read()) if (forcesend == 0): count5 = count5 + 1 elif (forcesend == 1): @@ -35,9 +34,8 @@ count5 = 1 if count5 > 3: count5 = 0 -f = open(file_stringcount5, 'w') -f.write(str(count5)) -f.close() +with open(file_stringcount5, 'w') as f: + f.write(str(count5)) faktor = 1.0 modbuswrite = 0 neupower = 0 @@ -55,27 +53,45 @@ faktor = 3000/instpower pvmodus = 0 if os.path.isfile(file_stringpv): - f = open(file_stringpv, 'r') - pvmodus = int(f.read()) - f.close() + with open(file_stringpv, 'r') as f: + pvmodus = int(f.read()) powerc = 0 # aktuelle Leistung lesen client = ModbusTcpClient(ipadr, port=502) # -# start = 1000 -resp=client.read_holding_registers(start,10,unit=1) +resp = client.read_holding_registers(start, 35, unit=1) +# Test only # start = 3524 -# resp = client.read_input_registers(start, 10, unit=1) +# resp = client.read_input_registers(start, 35, unit=1) value1 = resp.registers[0] all = format(value1, '04x') aktpower = int(struct.unpack('>h', codecs.decode(all, 'hex'))[0]) +# Wassertemperatur lesen +# Temp0 Warmwasser 1001 +# Temp1 1030 <- Optional wenn 0, nicht angeschlossen dann ersetzt durch 300 (keine Anzeige) +# Temp2 1031 <- Optional wenn 0, nicht angeschlossen dann ersetzt durch 300 (keine Anzeige) +value1 = resp.registers[1] +all = format(value1, '04x') +temp0int = int(struct.unpack('>h', codecs.decode(all, 'hex'))[0]) +temp0 = temp0int / 10 +value1 = resp.registers[30] +all = format(value1, '04x') +temp1int = int(struct.unpack('>h', codecs.decode(all, 'hex'))[0]) +temp1 = temp1int / 10 +if temp1 == 0: + temp1 = 300 +value1 = resp.registers[31] +all = format(value1, '04x') +temp2int = int(struct.unpack('>h', codecs.decode(all, 'hex'))[0]) +temp2 = temp2int / 10 +if temp2 == 0: + temp2 = 300 if count5 == 0: count1 = 999 if os.path.isfile(file_stringcount): - f = open(file_stringcount, 'r') - count1 = int(f.read()) - f.close() + with open(file_stringcount, 'r') as f: + count1 = int(f.read()) count1 = count1+1 value1 = resp.registers[3] all = format(value1, '04x') @@ -101,10 +117,9 @@ if pvmodus == 99: modbuswrite = 1 neupower = 0 - f = open(file_stringpv, 'w') pvmodus = 0 - f.write(str(pvmodus)) - f.close() + with open(file_stringpv, 'w') as f: + f.write(str(pvmodus)) # sonst wenn pv modus lauft , ueberschuss schicken else: if pvmodus == 1: @@ -112,38 +127,29 @@ # logschreiben if count1 > 80: count1 = 0 + with open(file_stringcount, 'w') as f: + f.write(str(count1)) + # mehr log schreiben if count1 < 3: - if os.path.isfile(file_string): - f = open(file_string, 'a') - else: - f = open(file_string, 'w') - helpstr = '%s devicenr %s ipadr %s ueberschuss %6d Akt Leistung' - helpstr += ' %6d Status %2d type %s inst. Leistung %6d Skalierung %.2f' - print(helpstr % (time_string, devicenumber, ipadr, uberschuss, - aktpower, status, atype, instpower, faktor), file=f) - helpstr = '%s devicenr %s ipadr %s Neu Leistung %6d ' - helpstr += 'pvmodus %1d modbuswrite %1d' - print(helpstr % (time_string, devicenumber, ipadr, neupower, - pvmodus, modbuswrite), file=f) - f.close() + log.info(" watt devicenr %d ipadr %s ueberschuss %6d Akt Leistung %6d Status %2d" % + (devicenumber, ipadr, uberschuss, aktpower, status)) + log.info(" watt devicenr %d ipadr %s Neu Leistung %6d pvmodus %1d modbuswrite %1d" % + (devicenumber, ipadr, neupower, pvmodus, modbuswrite)) + log.info(" watt devicenr %d ipadr %s type %s inst. Leistung %6d Skalierung %.2f" % + (devicenumber, ipadr, atype, instpower, faktor)) # modbus write if modbuswrite == 1: rq = client.write_register(1000, neupower, unit=1) if count1 < 3: - f = open(file_string, 'a') - print('%s devicenr %s ipadr %s device written by modbus ' % - (time_string, devicenumber, ipadr), file=f) - f.close() - f = open(file_stringcount, 'w') - f.write(str(count1)) - f.close() + log.info("watt devicenr %d ipadr %s device written by modbus " % + (devicenumber, ipadr)) else: if pvmodus == 99: pvmodus = 0 answer = '{"power":' + str(aktpower) + ',"powerc":' + str(powerc) answer += ',"send":' + str(modbuswrite) + ',"sendpower":' + str(neupower) +answer += ',"temp0":' + str(temp0) +answer += ',"temp1":' + str(temp1) +answer += ',"temp2":' + str(temp2) answer += ',"on":' + str(pvmodus) + '}' -f1 = open('/var/www/html/openWB/ramdisk/smarthome_device_ret' + - str(devicenumber), 'w') -json.dump(answer, f1) -f1.close() +writeret(answer, devicenumber) diff --git a/runs/usmarthome/smartacthor.py b/runs/usmarthome/smartacthor.py index 5f7feb4ba5..2abb14134b 100644 --- a/runs/usmarthome/smartacthor.py +++ b/runs/usmarthome/smartacthor.py @@ -1,25 +1,32 @@ #!/usr/bin/python3 from usmarthome.smartbase import Sbase from usmarthome.global0 import log +from typing import Dict import subprocess class Sacthor(Sbase): - def __init__(self): + def __init__(self) -> None: # setting super().__init__() print('__init__ Sacthor executed') - self._smart_paramadd = {} + self._smart_paramadd = {} # type: Dict[str, str] self._device_acthortype = 'none' self._device_acthorpower = 'none' self.device_nummer = 0 self._dynregel = 1 - def updatepar(self, input_param): + def updatepar(self, input_param: Dict[str, str]) -> None: super().updatepar(input_param) self._smart_paramadd = input_param.copy() self.device_nummer = int(self._smart_paramadd.get('device_nummer', '0')) + # fest 3 setzen + # Wassertemperatur lesen + # Temp0 Warmwasser 1001 + # Temp1 1030 <- Optional wenn 0, nicht angeschlossen dann ersetzt durch 300 (keine Anzeige) + # Temp2 1031 <- Optional wenn 0, nicht angeschlossen dann ersetzt durch 300 (keine Anzeige) + self.device_temperatur_configured = 3 for key, value in self._smart_paramadd.items(): if (key == 'device_nummer'): pass @@ -29,10 +36,10 @@ def updatepar(self, input_param): self._device_acthorpower = value else: log.warning("(" + str(self.device_nummer) + ") " + - __class__.__name__ + " überlesen " + key + + "Sacthor überlesen " + key + " " + value) - def getwatt(self, uberschuss, uberschussoffset): + def getwatt(self, uberschuss: int, uberschussoffset: int) -> None: self.prewatt(uberschuss, uberschussoffset) forcesend = self.checkbefsend() argumentList = ['python3', self._prefixpy + 'acthor/watt.py', @@ -46,6 +53,18 @@ def getwatt(self, uberschuss, uberschussoffset): self.newwatt = int(self.answer['power']) self.newwattk = int(self.answer['powerc']) self.relais = int(self.answer['on']) + self.temp0 = str(self.answer['temp0']) + with open(self._basePath+'/ramdisk/device' + + str(self.device_nummer) + '_temp0', 'w') as f: + f.write(str(self.temp0)) + self.temp1 = str(self.answer['temp1']) + with open(self._basePath+'/ramdisk/device' + + str(self.device_nummer) + '_temp1', 'w') as f: + f.write(str(self.temp1)) + self.temp2 = str(self.answer['temp2']) + with open(self._basePath+'/ramdisk/device' + + str(self.device_nummer) + '_temp2', 'w') as f: + f.write(str(self.temp2)) self.checksend(self.answer) except Exception as e1: log.warning("(" + str(self.device_nummer) + @@ -54,7 +73,7 @@ def getwatt(self, uberschuss, uberschussoffset): str(self._device_ip), str(e1))) self.postwatt() - def turndevicerelais(self, zustand, ueberschussberechnung, updatecnt): + def turndevicerelais(self, zustand: int, ueberschussberechnung: int, updatecnt: int) -> None: self.preturn(zustand, ueberschussberechnung, updatecnt) if (zustand == 1): pname = "/on.py" diff --git a/web/settings/smarthomeconfig.php b/web/settings/smarthomeconfig.php index 3a3f94c0ae..16ffad99bb 100644 --- a/web/settings/smarthomeconfig.php +++ b/web/settings/smarthomeconfig.php @@ -106,6 +106,7 @@ Mit dem Parameter Updategerät kann eine abweichende Sekundenzahl angegeben werden.
Wenn die Ausschaltbedingung erreicht ist wird einmalig 0 als Überschuss übertragen. Die Ausschaltschwelle/ Ausschaltverzögerung in OpenWB ist sinnvoll zu wählen (z.B. 500 / 3) um die Regelung von Acthor nicht zu stören. + Wenn Acthor als Gerät 1 oder 2 definiert ist, wird die Warmwassertemperatur als Temp1 angezeigt (Modbusadresse 1001). Ebenso wird Temp2 (Modbusadresse 1030) und Temp3 (Modbusadresse 1031) angezeigt (falls angeschlossen). Wp der Firma lambda
@@ -152,6 +153,7 @@ Wenn die Ausschaltbedingung erreicht ist wird einmalig 0 als Überschuss übertragen. Die Ausschaltschwelle/ Ausschaltverzögerung in OpenWB ist sinnvoll zu wählen (z.B. 500 / 3) um die Regelung von Elwa nicht zu stören. Die Warmwassersicherstellung in Elwa kann genutzt werden. OpenWB erkennt dieses am Status und überträgt dann keinen Überschuss. + Wenn Elwa als Gerät 1 oder 2 definiert ist, wird die Warmwassertemperatur als Temp1 angezeigt (Modbusadresse 1001). Wärmepumpe der Firma IDM mit Navigatorregelung 1.7/2.0
From fd883b99be66639b409073ddd921db7762c99a36 Mon Sep 17 00:00:00 2001 From: Lutz Bender Date: Tue, 3 Jan 2023 11:15:23 +0100 Subject: [PATCH 192/201] allow up to 100% for speichersocminpv --- web/settings/pvconfig.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/settings/pvconfig.html b/web/settings/pvconfig.html index 295368f894..40e9e33e4a 100644 --- a/web/settings/pvconfig.html +++ b/web/settings/pvconfig.html @@ -516,7 +516,7 @@

Einstellungen für Min+PV-Laden

- +
Parameter in Prozent [%] für den Einschalt-SoC der Laderegelung im Modus Min+PV-Laden. Definiert einen Speicher-SoC, der überschritten werden muss, damit die Ladereglung startet. Der Wert 0 schaltet die Funktion aus. Der Einschalt-SoC muss größer als der Ausschalt-SoC sein. Unterhalb des Ausschalt-SoC wird die Ladung nicht freigegeben. From 40dd07bc317c5af6c6854ac41458db25fec5f677 Mon Sep 17 00:00:00 2001 From: LKuemmel <76958050+LKuemmel@users.noreply.github.com> Date: Tue, 3 Jan 2023 11:25:49 +0100 Subject: [PATCH 193/201] fix isss rfid, daemon (#2571) * fix isss: don't reset rfid, because it will be published only if it is changed * flake 8 * fix daemon mode * fix imported factor * fix local_charge_point_num as modbus id --- .../internal_openwb/chargepoint_module.py | 13 ++++----- packages/modules/common/store/_chargepoint.py | 4 +-- runs/isss.py | 28 +++++++++---------- 3 files changed, 21 insertions(+), 24 deletions(-) diff --git a/packages/modules/chargepoints/internal_openwb/chargepoint_module.py b/packages/modules/chargepoints/internal_openwb/chargepoint_module.py index 8c01930c6c..eda0df578a 100644 --- a/packages/modules/chargepoints/internal_openwb/chargepoint_module.py +++ b/packages/modules/chargepoints/internal_openwb/chargepoint_module.py @@ -8,7 +8,7 @@ from modules.common.component_state import ChargepointState from modules.common.fault_state import ComponentInfo, FaultState from modules.common.modbus import ModbusSerialClient_ -from modules.common.store import ramdisk_read, ramdisk_write +from modules.common.store import ramdisk_read from modules.common import sdm from modules.common import evse from modules.common import b32 @@ -61,20 +61,20 @@ def _check_meter(serial_client: ModbusSerialClient_, meters: List[meter_config]) else: raise Exception("Es konnte keines der Meter in "+str(meters)+" zugeordnet werden.") - meter_client = _check_meter(serial_client, meter_configuration_options[self.local_charge_point_num - 1]) - evse_client = evse.Evse(self.local_charge_point_num, serial_client) + meter_client = _check_meter(serial_client, meter_configuration_options[self.local_charge_point_num]) + evse_client = evse.Evse(self.local_charge_point_num + 1, serial_client) return meter_client, evse_client def get_pins_phase_switch(self, new_phases: int) -> Tuple[int, int]: # return gpio_cp, gpio_relay - if self.local_charge_point_num == 1: + if self.local_charge_point_num == 0: return 22, 29 if new_phases == 1 else 37 else: return 15, 11 if new_phases == 1 else 13 def get_pins_cp_interruption(self) -> int: # return gpio_cp, gpio_relay - if self.local_charge_point_num == 1: + if self.local_charge_point_num == 0: return 22 else: return 15 @@ -112,9 +112,6 @@ def get_values(self, phase_switch_cp_active: bool) -> Tuple[ChargepointState, fl self.__client.read_error = 0 rfid = ramdisk_read("readtag") - # reset tag - if rfid != "0" and plug_state is False: - ramdisk_write("readtag", "0") if phase_switch_cp_active: # Während des Threads wird die CP-Leitung unterbrochen, das EV soll aber als angesteckt betrachtet diff --git a/packages/modules/common/store/_chargepoint.py b/packages/modules/common/store/_chargepoint.py index 5df7e9f7d5..00a79dbff7 100644 --- a/packages/modules/common/store/_chargepoint.py +++ b/packages/modules/common/store/_chargepoint.py @@ -15,9 +15,9 @@ def set(self, cp_state: ChargepointState): charge_point.is_charging.write(cp_state.charge_state) charge_point.voltages.write(cp_state.voltages) charge_point.currents.write(cp_state.currents) - charge_point.energy.write(cp_state.imported) + charge_point.energy.write(cp_state.imported/1000) charge_point.is_plugged.write(cp_state.plug_state) - charge_point.power.write(cp_state.power) + charge_point.power.write(int(cp_state.power)) class ChargepointValueStoreBroker(ValueStore[ChargepointState]): diff --git a/runs/isss.py b/runs/isss.py index 850c2e5056..84c7aa7401 100755 --- a/runs/isss.py +++ b/runs/isss.py @@ -118,7 +118,7 @@ def __init__(self, cp_module: chargepoint_module.ChargepointModule) -> None: self.__set_current_error = 0 def update_state(self) -> None: - if self.cp_module.config.id == 1: + if self.cp_module.config.id == 0: suffix = "" else: suffix = "s1" @@ -196,15 +196,15 @@ class Isss: def __init__(self) -> None: log.debug("Init isss") self.serial_client = ModbusSerialClient_(self.detect_modbus_usb_port()) - self.cp1 = IsssChargepoint(self.serial_client, 1) + self.cp0 = IsssChargepoint(self.serial_client, 0) try: if int(ramdisk_read("issslp2act")) == 1: - self.cp2 = IsssChargepoint(self.serial_client, 2) + self.cp1 = IsssChargepoint(self.serial_client, 1) else: - self.cp2 = None + self.cp1 = None except (FileNotFoundError, ValueError) as e: log.error("Error reading issslp2act! Guessing cp2 is not configured.") - self.cp2 = None + self.cp1 = None self.init_gpio() def init_gpio(self) -> None: @@ -228,9 +228,9 @@ def loop(self) -> None: while True: log.setLevel(MAP_LOG_LEVEL[int(os.environ.get('debug'))]) log.debug("***Start***") - self.cp1.update() - if self.cp2: - self.cp2.update() + self.cp0.update() + if self.cp1: + self.cp1.update() time.sleep(1.1) def detect_modbus_usb_port(self) -> str: @@ -244,7 +244,7 @@ def detect_modbus_usb_port(self) -> str: @staticmethod def get_cp_num(local_charge_point_num: int) -> int: try: - if local_charge_point_num == 1: + if local_charge_point_num == 0: return int(re.sub(r'\D', '', ramdisk_read("parentCPlp1"))) else: return int(re.sub(r'\D', '', ramdisk_read("parentCPlp2"))) @@ -265,15 +265,15 @@ def get_parent_wb() -> str: class IsssChargepoint: def __init__(self, serial_client: ModbusSerialClient_, local_charge_point_num: int) -> None: self.local_charge_point_num = local_charge_point_num - if local_charge_point_num == 1: + if local_charge_point_num == 0: try: with open('/home/pi/ppbuchse', 'r') as f: max_current = int(f.read()) - self.module = socket.Socket(max_current, InternalOpenWB(1, serial_client)) + self.module = socket.Socket(max_current, InternalOpenWB(0, serial_client)) except (FileNotFoundError, ValueError): - self.module = chargepoint_module.ChargepointModule(InternalOpenWB(1, serial_client)) + self.module = chargepoint_module.ChargepointModule(InternalOpenWB(0, serial_client)) else: - self.module = chargepoint_module.ChargepointModule(InternalOpenWB(2, serial_client)) + self.module = chargepoint_module.ChargepointModule(InternalOpenWB(1, serial_client)) self.update_values = UpdateValues(local_charge_point_num) self.update_state = UpdateState(self.module) self.old_plug_state = False @@ -285,7 +285,7 @@ def __thread_active(thread: Optional[threading.Thread]) -> bool: else: return False try: - if self.local_charge_point_num == 2: + if self.local_charge_point_num == 1: time.sleep(0.1) phase_switch_cp_active = __thread_active(self.update_state.cp_interruption_thread) or __thread_active( self.update_state.phase_switch_thread) From e6f11c49c5de7f7f486b1e18eb1c07b82c7cfdc7 Mon Sep 17 00:00:00 2001 From: rleidner <89418596+rleidner@users.noreply.github.com> Date: Tue, 3 Jan 2023 11:41:37 +0100 Subject: [PATCH 194/201] soc_smarteq: fix token comparison, handle missing store file (#2569) Co-authored-by: rleidner --- modules/soc_smarteq/soc_smarteq.py | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/modules/soc_smarteq/soc_smarteq.py b/modules/soc_smarteq/soc_smarteq.py index f6a015d0ee..e5a7921957 100755 --- a/modules/soc_smarteq/soc_smarteq.py +++ b/modules/soc_smarteq/soc_smarteq.py @@ -10,6 +10,7 @@ import pkce import logging import pickle +import copy # Constants BASE_URL = "https://id.mercedes-benz.com" @@ -70,16 +71,12 @@ def __init__(self, storeFile: str): # currently is contains: # Tokens: refresh- and access-tokens of OAUTH # refresh_timestamp: epoch of last refresh_tokens. - self.store = {} - self.store['Tokens'] = {} - self.store['refresh_timestamp'] = int(0) self.session = requests.session() self.load_store() - self.oldTokens = self.store['Tokens'] + self.oldTokens = copy.deepcopy(self.store['Tokens']) self.init = True - self.init = False # test!! def load_store(self): try: @@ -89,8 +86,14 @@ def load_store(self): self.store['Tokens'] = {} self.store['refresh_timestamp'] = int(0) tf.close() + except FileNotFoundError: + self.log.warning("init: no store file found, full reconnect required") + self.store = {} + self.store['Tokens'] = {} + self.store['refresh_timestamp'] = int(0) except Exception as e: self.log.debug("init: loading stored data failed, file: " + self.storeFile) + self.store = {} self.store['Tokens'] = {} self.store['refresh_timestamp'] = int(0) @@ -416,8 +419,8 @@ def fetch_soc(self) -> int: if self.store['Tokens'] != self.oldTokens: self.log.debug("reconnect: tokens changed, store token file") + self.write_store() - self.write_store() return soc From 4f41053e89de7f5fb1553256a4c0b639c1cc213f Mon Sep 17 00:00:00 2001 From: okaegi Date: Tue, 3 Jan 2023 12:52:42 +0100 Subject: [PATCH 195/201] E3DC Driver... MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Für Openwb 2.0 muss offensichtlich der die type Variable dem Verzeichnissnamen entsprechen , sonst Absturz im Online beim konfigurieren Bei der Verarbeitung des Befehls 'addDevice' mit den Parametern '[object Object]' ist ein Fehler aufgetreten: Es ist ein interner Fehler aufgetreten: Traceback (most recent call last): File "/var/www/html/openWB/packages/helpermodules/command.py", line 112, in on_message func(connection_id, payload) File "/var/www/html/openWB/packages/helpermodules/command.py", line 123, in addDevice dev = importlib.import_module(".devices."+payload["data"]["type"]+".device", "modules") File "/usr/lib/python3.9/importlib/__init__.py", line 127, in import_module return _bootstrap._gcd_import(name[level:], package, level) File "", line 1030, in _gcd_import File "", line 1007, in _find_and_load File "", line 972, in _find_and_load_unlocked File "", line 228, in _call_with_frames_removed File "", line 1030, in _gcd_import File "", line 1007, in _find_and_load File "", line 984, in _find_and_load_unlocked ModuleNotFoundError: No module named 'modules.devices.E3DC' Für openwb 1.9 keine Auswirkungen --- packages/modules/devices/e3dc/config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/modules/devices/e3dc/config.py b/packages/modules/devices/e3dc/config.py index f249addb2b..d238903697 100644 --- a/packages/modules/devices/e3dc/config.py +++ b/packages/modules/devices/e3dc/config.py @@ -12,7 +12,7 @@ def __init__(self, address: str = None): class E3dc: def __init__(self, name: str = "E3DC", - type: str = "E3DC", + type: str = "e3dc", id: int = 0, configuration: E3dcConfiguration = None) -> None: self.name = name From 55e189327288ec19a90f9bc713b21f874edcadf9 Mon Sep 17 00:00:00 2001 From: LKuemmel <76958050+LKuemmel@users.noreply.github.com> Date: Wed, 4 Jan 2023 10:31:14 +0100 Subject: [PATCH 196/201] new isss for buchse master (#2550) * new isss for daemon * review * renaming --- .../chargepoints/internal_openwb/socket.py | 13 +- runs/buchse.py | 440 ------------------ runs/initRamdisk.sh | 1 + runs/isss.py | 41 +- runs/services.sh | 51 +- 5 files changed, 56 insertions(+), 490 deletions(-) delete mode 100755 runs/buchse.py diff --git a/packages/modules/chargepoints/internal_openwb/socket.py b/packages/modules/chargepoints/internal_openwb/socket.py index d02b23dd9d..0762db6481 100644 --- a/packages/modules/chargepoints/internal_openwb/socket.py +++ b/packages/modules/chargepoints/internal_openwb/socket.py @@ -48,8 +48,9 @@ class ActorState(IntEnum): class Socket(ChargepointModule): - def __init__(self, max_current: int, config: InternalOpenWB) -> None: - self.max_current = max_current + def __init__(self, socket_max_current: int, config: InternalOpenWB) -> None: + log.debug("Konfiguration als Buchse.") + self.socket_max_current = socket_max_current super().__init__(config) def set_current(self, current: float) -> None: @@ -60,12 +61,12 @@ def set_current(self, current: float) -> None: log.error("Error getting actor status! Using default 'opened'.") actor = ActorState.OPENED - if actor == ActorState.CLOSED: - if current == self.set_current_evse or self.chargepoint_state.plug_state is False: + if actor == ActorState.CLOSED or self.chargepoint_state.plug_state is False: + if current == self.set_current_evse: return else: current = 0 - super().set_current(min(current, self.max_current)) + super().set_current(min(current, self.socket_max_current)) def get_values(self, phase_switch_cp_active: bool) -> Tuple[ChargepointState, float]: try: @@ -94,6 +95,6 @@ def __close_actor(self): def __set_actor(self, open: bool): GPIO.output(23, GPIO.LOW if open else GPIO.HIGH) GPIO.output(26, GPIO.HIGH) - time.sleep(2 if open else 3) + time.sleep(1) GPIO.output(26, GPIO.LOW) log.debug("Actor opened" if open else "Actor closed") diff --git a/runs/buchse.py b/runs/buchse.py deleted file mode 100755 index 1552b4989b..0000000000 --- a/runs/buchse.py +++ /dev/null @@ -1,440 +0,0 @@ -#!/usr/bin/python -import os -import time -import struct -import traceback -from typing import Tuple -import RPi.GPIO as GPIO -from pymodbus.client.sync import ModbusSerialClient -import paho.mqtt.client as mqtt - -basePath = "/var/www/html/openWB" -ramdiskPath = basePath + "/ramdisk" -logFilename = ramdiskPath + "/buchse.log" - -DeviceValues = {} -Values = {} - - -# handling of all logging statements -def log_debug(level: int, msg: str, traceback_str: str = None) -> None: - if level >= loglevel: - with open(logFilename, 'a') as log_file: - log_file.write(time.ctime() + ': ' + msg + '\n') - if traceback_str is not None: - log_file.write(traceback_str + '\n') - - -# write value to file in ramdisk -def write_to_ramdisk(filename: str, content: str) -> None: - with open(ramdiskPath + "/" + filename, "w") as file: - file.write(content) - - -# read value from file in ramdisk -def read_from_ramdisk(filename: str) -> str: - try: - with open(ramdiskPath + "/" + filename, 'r') as file: - return file.read() - except FileNotFoundError: - log_debug(2, "Error reading file '" + filename + "' from ramdisk!", traceback.format_exc()) - return "" - - -def init_gpio() -> None: - GPIO.setwarnings(False) - GPIO.setmode(GPIO.BOARD) - GPIO.setup(37, GPIO.OUT) - GPIO.setup(13, GPIO.OUT) - GPIO.setup(22, GPIO.OUT) - GPIO.setup(29, GPIO.OUT) - GPIO.setup(11, GPIO.OUT) - # GPIOs for socket - GPIO.setup(23, GPIO.OUT) - GPIO.setup(26, GPIO.OUT) - GPIO.setup(19, GPIO.IN, pull_up_down=GPIO.PUD_UP) - - -def init_values() -> None: - global DeviceValues - global Values - # values LP1 - DeviceValues.update({'lp1voltage1': str(5)}) - DeviceValues.update({'lp1voltage2': str(5)}) - DeviceValues.update({'lp1voltage3': str(5)}) - DeviceValues.update({'lp1lla1': str(5)}) - DeviceValues.update({'lp1lla2': str(5)}) - DeviceValues.update({'lp1lla3': str(5)}) - DeviceValues.update({'lp1llkwh': str(5)}) - DeviceValues.update({'lp1watt': str(5)}) - DeviceValues.update({'lp1chargestat': str(5)}) - DeviceValues.update({'lp1plugstat': str(5)}) - DeviceValues.update({'lp1readerror': str(0)}) - Values.update({'lp1plugstat': str(5)}) - Values.update({'lp1chargestat': str(5)}) - Values.update({'lp1evsell': str(1)}) - - -# read all meter values and publish to mqtt broker -def read_meter(): - global evsefailure - global client - global llmeterconfiglp1 - global sdmid - - if (llmeterconfiglp1 == 0): - log_debug(2, "Erkenne verbauten Zaehler.") - # check sdm - try: - resp = client.read_input_registers(0x00, 2, unit=105) - voltage = struct.unpack('>f', struct.pack('>HH', *resp.registers))[0] - if int(voltage) > 20: - llmeterconfiglp1 = 105 - sdmid = 105 - log_debug(2, "SDM Zaehler erkannt") - except AttributeError: - log_debug(2, "SDM check failed", traceback.format_exc()) - # check B23 - try: - resp = client.read_holding_registers(0x5B00, 2, unit=201) - voltage = resp.registers[1] - if int(voltage) > 20: - llmeterconfiglp1 = 201 - sdmid = 201 - log_debug(2, "B23 Zaehler erkannt") - except AttributeError: - log_debug(2, "B23 check failed", traceback.format_exc()) - else: - sdmid = llmeterconfiglp1 - try: - if sdmid < 200: - # SDM - resp = client.read_input_registers(0x0C, 2, unit=sdmid) - lp1llw1 = struct.unpack('>f', struct.pack('>HH', *resp.registers))[0] - lp1llw1 = int(lp1llw1) - resp = client.read_input_registers(0x0E, 2, unit=sdmid) - lp1llw2 = struct.unpack('>f', struct.pack('>HH', *resp.registers))[0] - lp1llw2 = int(lp1llw2) - resp = client.read_input_registers(0x10, 2, unit=sdmid) - lp1llw3 = struct.unpack('>f', struct.pack('>HH', *resp.registers))[0] - lp1llw3 = int(lp1llw3) - lp1llg = lp1llw1 + lp1llw2 + lp1llw3 - if lp1llg < 10: - lp1llg = 0 - write_to_ramdisk("llaktuell", str(lp1llg)) - resp = client.read_input_registers(0x00, 2, unit=sdmid) - voltage = struct.unpack('>f', struct.pack('>HH', *resp.registers))[0] - lp1voltage1 = float("%.1f" % voltage) - write_to_ramdisk("llv1", str(lp1voltage1)) - resp = client.read_input_registers(0x02, 2, unit=sdmid) - voltage = struct.unpack('>f', struct.pack('>HH', *resp.registers))[0] - lp1voltage2 = float("%.1f" % voltage) - write_to_ramdisk("llv2", str(lp1voltage2)) - resp = client.read_input_registers(0x04, 2, unit=sdmid) - voltage = struct.unpack('>f', struct.pack('>HH', *resp.registers))[0] - lp1voltage3 = float("%.1f" % voltage) - write_to_ramdisk("llv3", str(lp1voltage3)) - resp = client.read_input_registers(0x06, 2, unit=sdmid) - lp1lla1 = float(struct.unpack('>f', struct.pack('>HH', *resp.registers))[0]) - lp1lla1 = float("%.1f" % lp1lla1) - write_to_ramdisk("lla1", str(lp1lla1)) - resp = client.read_input_registers(0x08, 2, unit=sdmid) - lp1lla2 = float(struct.unpack('>f', struct.pack('>HH', *resp.registers))[0]) - lp1lla2 = float("%.1f" % lp1lla2) - write_to_ramdisk("lla2", str(lp1lla2)) - resp = client.read_input_registers(0x0A, 2, unit=sdmid) - lp1lla3 = struct.unpack('>f', struct.pack('>HH', *resp.registers))[0] - lp1lla3 = float("%.1f" % lp1lla3) - write_to_ramdisk("lla3", str(lp1lla3)) - resp = client.read_input_registers(0x0156, 2, unit=sdmid) - lp1llkwh = struct.unpack('>f', struct.pack('>HH', *resp.registers))[0] - lp1llkwh = float("%.3f" % lp1llkwh) - write_to_ramdisk("llkwh", str(lp1llkwh)) - resp = client.read_input_registers(0x46, 2, unit=sdmid) - hz = struct.unpack('>f', struct.pack('>HH', *resp.registers))[0] - hz = float("%.2f" % hz) - write_to_ramdisk("llhz", str(hz)) - else: - # B23 - # llkwh - resp = client.read_holding_registers(0x5000, 4, unit=sdmid) - lp1llkwh = struct.unpack('>Q', struct.pack('>HHHH', *resp.registers))[0]/100 - write_to_ramdisk("llkwh", str(lp1llkwh)) - # Voltage - resp = client.read_holding_registers(0x5B00, 2, unit=sdmid) - voltage = resp.registers[1] - lp1voltage1 = float(voltage) / 10 - write_to_ramdisk("llv1", str(lp1voltage1)) - resp = client.read_holding_registers(0x5B02, 2, unit=sdmid) - lp1voltage2 = resp.registers[1] - lp1voltage2 = float(lp1voltage2) / 10 - write_to_ramdisk("llv2", str(lp1voltage2)) - resp = client.read_holding_registers(0x5B04, 2, unit=sdmid) - voltage = resp.registers[1] - lp1voltage3 = float(voltage) / 10 - write_to_ramdisk("llv3", str(lp1voltage3)) - # Ampere - resp = client.read_holding_registers(0x5B0C, 2, unit=sdmid) - amp = resp.registers[1] - lp1lla1 = float(amp) / 100 - write_to_ramdisk("lla1", str(lp1lla1)) - resp = client.read_holding_registers(0x5B0E, 2, unit=sdmid) - amp = resp.registers[1] - lp1lla2 = float(amp) / 100 - write_to_ramdisk("lla2", str(lp1lla2)) - resp = client.read_holding_registers(0x5B10, 2, unit=sdmid) - amp = resp.registers[1] - lp1lla3 = float(amp) / 100 - write_to_ramdisk("lla3", str(lp1lla3)) - # Gesamt watt - resp = client.read_holding_registers(0x5B14, 2, unit=sdmid) - lp1llg = int(struct.unpack('>i', struct.pack('>HH', *resp.registers))[0]/100) - write_to_ramdisk("llaktuell", str(lp1llg)) - # LL Hz - resp = client.read_holding_registers(0x5B2C, 2, unit=sdmid) - hz = float(resp.registers[0]) / 100 - write_to_ramdisk("llhz", str(hz)) - - try: - time.sleep(0.1) - rq = client.read_holding_registers(1000, 1, unit=1) - lp1ll = rq.registers[0] - evsefailure = 0 - except: - lp1ll = 0 - evsefailure = 1 - try: - time.sleep(0.1) - rq = client.read_holding_registers(1002, 1, unit=1) - lp1var = rq.registers[0] - evsefailure = 0 - DeviceValues.update({'lp1readerror': str(0)}) - except: - DeviceValues.update({'lp1readerror': str(int(DeviceValues['lp1readerror'])+1)}) - log_debug(2, "Fehler!", traceback.format_exc()) - lp1var = 5 - evsefailure = 1 - if (lp1var == 5 and int(DeviceValues['lp1readerror']) > MaxEvseError): - log_debug(2, "Anhaltender Fehler beim Auslesen der EVSE von lp1! (" + - str(DeviceValues['lp1readerror']) + ")") - log_debug(2, "Plugstat und Chargestat werden zurückgesetzt.") - Values.update({'lp1plugstat': 0}) - Values.update({'lp1chargestat': 0}) - elif (lp1var == 1): - Values.update({'lp1plugstat': 0}) - Values.update({'lp1chargestat': 0}) - elif (lp1var == 2): - Values.update({'lp1plugstat': 1}) - Values.update({'lp1chargestat': 0}) - elif (lp1var == 3 and lp1ll > 0): - Values.update({'lp1plugstat': 1}) - Values.update({'lp1chargestat': 1}) - elif (lp1var == 3 and lp1ll == 0): - Values.update({'lp1plugstat': 1}) - Values.update({'lp1chargestat': 0}) - write_to_ramdisk("plugstat", str(Values["lp1plugstat"])) - write_to_ramdisk("chargestat", str(Values["lp1chargestat"])) - Values.update({'lp1evsell': lp1ll}) - log_debug(0, "EVSE lp1plugstat: " + str(lp1var) + " EVSE lp1LL: " + str(lp1ll)) - - mclient = mqtt.Client("openWB-buchse-bulkpublisher-" + str(os.getpid())) - mclient.connect("localhost") - mclient.loop(timeout=2.0) - for key in DeviceValues: - if ("lp1watt" in key): - if (DeviceValues[str(key)] != str(lp1llg)): - mclient.publish("openWB/lp/1/W", payload=str(lp1llg), qos=0, retain=True) - mclient.loop(timeout=2.0) - DeviceValues.update({'lp1watt': str(lp1llg)}) - if ("lp1voltage1" in key): - if (DeviceValues[str(key)] != str(lp1voltage1)): - mclient.publish("openWB/lp/1/VPhase1", payload=str(lp1voltage1), qos=0, retain=True) - mclient.loop(timeout=2.0) - DeviceValues.update({'lp1voltage1': str(lp1voltage1)}) - if ("lp1voltage2" in key): - if (DeviceValues[str(key)] != str(lp1voltage2)): - mclient.publish("openWB/lp/1/VPhase2", payload=str(lp1voltage2), qos=0, retain=True) - mclient.loop(timeout=2.0) - DeviceValues.update({'lp1voltage2': str(lp1voltage2)}) - if ("lp1voltage3" in key): - if (DeviceValues[str(key)] != str(lp1voltage3)): - mclient.publish("openWB/lp/1/VPhase3", payload=str(lp1voltage3), qos=0, retain=True) - mclient.loop(timeout=2.0) - DeviceValues.update({'lp1voltage3': str(lp1voltage3)}) - if ("lp1lla1" in key): - if (DeviceValues[str(key)] != str(lp1lla1)): - mclient.publish("openWB/lp/1/APhase1", payload=str(lp1lla1), qos=0, retain=True) - mclient.loop(timeout=2.0) - DeviceValues.update({'lp1lla1': str(lp1lla1)}) - if ("lp1lla2" in key): - if (DeviceValues[str(key)] != str(lp1lla2)): - mclient.publish("openWB/lp/1/APhase2", payload=str(lp1lla2), qos=0, retain=True) - mclient.loop(timeout=2.0) - DeviceValues.update({'lp1lla2': str(lp1lla2)}) - if ("lp1lla3" in key): - if (DeviceValues[str(key)] != str(lp1lla3)): - mclient.publish("openWB/lp/1/APhase3", payload=str(lp1lla3), qos=0, retain=True) - mclient.loop(timeout=2.0) - DeviceValues.update({'lp1lla3': str(lp1lla3)}) - if ("lp1llkwh" in key): - if (DeviceValues[str(key)] != str(lp1llkwh)): - mclient.publish("openWB/lp/1/kWhCounter", payload=str(lp1llkwh), qos=0, retain=True) - mclient.loop(timeout=2.0) - DeviceValues.update({'lp1llkwh': str(lp1llkwh)}) - if ("lp1plugstat" in key): - if (DeviceValues[str(key)] != Values["lp1plugstat"]): - mclient.publish("openWB/lp/1/boolPlugStat", payload=Values["lp1plugstat"], qos=0, retain=True) - mclient.loop(timeout=2.0) - DeviceValues.update({'lp1plugstat': Values["lp1plugstat"]}) - if ("lp1chargestat" in key): - if (DeviceValues[str(key)] != Values["lp1chargestat"]): - mclient.publish("openWB/lp/1/boolChargeStat", payload=Values["lp1chargestat"], qos=0, retain=True) - mclient.loop(timeout=2.0) - DeviceValues.update({'lp1chargestat': Values["lp1chargestat"]}) - mclient.disconnect() - except Exception: - log_debug(2, "Get meter Fehler!", traceback.format_exc()) - - -# control of socket lock -# GPIO 23: control direction of lock motor -# GPIO 26: power to lock motor -def set_socket_actuator(action): - if action == "auf": - GPIO.output(23, GPIO.LOW) - GPIO.output(26, GPIO.HIGH) - time.sleep(2) - GPIO.output(26, GPIO.LOW) - log_debug(1, "Aktor auf") - if action == "zu": - GPIO.output(23, GPIO.HIGH) - GPIO.output(26, GPIO.HIGH) - time.sleep(3) - GPIO.output(26, GPIO.LOW) - log_debug(1, "Aktor zu") - - -# get actual socket lock state -def get_socket_state() -> int: - actorstat_tmp = GPIO.input(19) - if actorstat_tmp == GPIO.LOW: - return 1 - else: - return 0 - - -# get all values to control our chargepoint -def load_control_values(): - global actorstat - global lp1solla - global u1p3pstat - global u1p3ptmpstat - global evsefailure - - actorstat = get_socket_state() - try: - lp1solla = int(read_from_ramdisk("llsoll")) - except ValueError: - lp1solla = 0 - log_debug(0, "LL Soll: " + str(lp1solla) + " ActorStatus: " + str(actorstat)) - if socket_configured: - if (evsefailure == 0): - if (Values["lp1plugstat"] == 1): - if (actorstat == 0): - set_socket_actuator("zu") - if (Values["lp1plugstat"] == 0): - if (actorstat == 1): - writelp1evse(0) - set_socket_actuator("auf") - if (actorstat == 1): - if (Values["lp1evsell"] != lp1solla and Values["lp1plugstat"] == 1): - writelp1evse(lp1solla) - else: - if (Values["lp1evsell"] != 0): - writelp1evse(0) - else: - if (Values["lp1evsell"] != lp1solla): - writelp1evse(lp1solla) - try: - u1p3ptmpstat = int(read_from_ramdisk("u1p3pstat")) - except ValueError: - u1p3ptmpstat = 3 - try: - u1p3pstat - except: - u1p3pstat = 3 - u1p3pstat = switch_phases_cp1(u1p3ptmpstat, u1p3pstat) - - -def __switch_phases(gpio_cp: int, gpio_relay: int): - GPIO.output(gpio_cp, GPIO.HIGH) # CP on - GPIO.output(gpio_relay, GPIO.HIGH) # 3 on/off - time.sleep(2) - GPIO.output(gpio_relay, GPIO.LOW) # 3 on/off - time.sleep(5) - GPIO.output(gpio_cp, GPIO.LOW) # CP off - time.sleep(1) - - -def switch_phases_cp1(new_phases: int, old_phases: int) -> int: - if (new_phases != old_phases): - log_debug(1, "switching phases on cp1: old=" + str(old_phases) + " new=" + str(new_phases)) - gpio_cp = 22 - if (new_phases == 1): - gpio_relay = 29 - else: - gpio_relay = 37 - __switch_phases(gpio_cp, gpio_relay) - else: - log_debug(0, "no need to switch phases on cp1: old=" + str(old_phases) + " new=" + str(new_phases)) - return new_phases - - -def writelp1evse(lla): - if (lla > pp): - lla = pp - client.write_registers(1000, lla, unit=1) - log_debug(1, "Write to EVSE lp1 " + str(lla)) - - -# check for "openWB Buchse" -def check_for_socket() -> Tuple[bool, int]: - try: - with open('/home/pi/ppbuchse', 'r') as value: - pp_value = int(value.read()) - except (FileNotFoundError, ValueError): - pp_value = 32 - # here we always have a socket - socket_is_configured = True - log_debug(1, "check for socket: " + str(socket_is_configured) + " " + str(pp_value)) - return [socket_is_configured, pp_value] - - -# guess USB/modbus device name -def detect_modbus_usb_port() -> str: - try: - with open("/dev/ttyUSB0"): - return "/dev/ttyUSB0" - except FileNotFoundError: - return "/dev/serial0" - - -loglevel = 1 - -MaxEvseError = 5 -sdmid = 105 -actorstat = 0 -evsefailure = 0 -llmeterconfiglp1 = 0 - -init_gpio() -init_values() -socket_configured, pp = check_for_socket() -seradd = detect_modbus_usb_port() -# connect with USB/modbus device -with ModbusSerialClient(method="rtu", port=seradd, baudrate=9600, stopbits=1, bytesize=8, timeout=1) as client: - # start our control loop - while True: - read_meter() - load_control_values() - time.sleep(1) diff --git a/runs/initRamdisk.sh b/runs/initRamdisk.sh index c3fc53f58b..ffe5f85d89 100755 --- a/runs/initRamdisk.sh +++ b/runs/initRamdisk.sh @@ -373,6 +373,7 @@ initRamdisk(){ echo 0 > $RamdiskPath/socketApproved echo 0 > $RamdiskPath/socketActivated echo 0 > $RamdiskPath/socketActivationRequested + echo "unknown" > $RamdiskPath/prev_isss_mode # diverse Dateien echo 0 > $RamdiskPath/AllowedTotalCurrentPerPhase diff --git a/runs/isss.py b/runs/isss.py index 84c7aa7401..e0fa579027 100755 --- a/runs/isss.py +++ b/runs/isss.py @@ -1,20 +1,22 @@ #!/usr/bin/python +from enum import Enum import logging import os import re +import sys import threading import time -from typing import Dict, List, Optional +from typing import List, Optional import RPi.GPIO as GPIO from helpermodules.pub import pub_single -from helpermodules import compatibility from modules.common.store import ramdisk_read, ramdisk_write from modules.common.store._util import get_rounding_function_by_digits from modules.common.fault_state import FaultState from modules.common.component_state import ChargepointState from modules.common.modbus import ModbusSerialClient_ -from modules.chargepoints.internal_openwb import chargepoint_module, socket +from modules.chargepoints.internal_openwb import chargepoint_module +from modules.chargepoints.internal_openwb.socket import Socket from modules.chargepoints.internal_openwb.chargepoint_module import InternalOpenWB basePath = "/var/www/html/openWB" @@ -23,6 +25,12 @@ MAP_LOG_LEVEL = [logging.ERROR, logging.WARNING, logging.DEBUG] +class IsssMode(Enum): + SOCKET = "socket" + DUO = "duo" + DAEMON = "daemon" + + logging.basicConfig(filename=ramdiskPath+'/isss.log', format='%(asctime)s - {%(name)s:%(lineno)s} - %(levelname)s - %(message)s', level=MAP_LOG_LEVEL[int(os.environ.get('debug'))]) @@ -193,17 +201,14 @@ def __thread_cp_interruption(self, duration: int) -> None: class Isss: - def __init__(self) -> None: + def __init__(self, mode: IsssMode, socket_max_current: int) -> None: log.debug("Init isss") self.serial_client = ModbusSerialClient_(self.detect_modbus_usb_port()) - self.cp0 = IsssChargepoint(self.serial_client, 0) - try: - if int(ramdisk_read("issslp2act")) == 1: - self.cp1 = IsssChargepoint(self.serial_client, 1) - else: - self.cp1 = None - except (FileNotFoundError, ValueError) as e: - log.error("Error reading issslp2act! Guessing cp2 is not configured.") + self.cp0 = IsssChargepoint(self.serial_client, 0, mode, socket_max_current) + if mode == IsssMode.DUO: + log.debug("Zweiter Ladepunkt für Duo konfiguriert.") + self.cp1 = IsssChargepoint(self.serial_client, 1, mode, socket_max_current) + else: self.cp1 = None self.init_gpio() @@ -263,14 +268,12 @@ def get_parent_wb() -> str: class IsssChargepoint: - def __init__(self, serial_client: ModbusSerialClient_, local_charge_point_num: int) -> None: + def __init__(self, serial_client: ModbusSerialClient_, local_charge_point_num: int, mode: IsssMode, socket_max_current: int) -> None: self.local_charge_point_num = local_charge_point_num if local_charge_point_num == 0: - try: - with open('/home/pi/ppbuchse', 'r') as f: - max_current = int(f.read()) - self.module = socket.Socket(max_current, InternalOpenWB(0, serial_client)) - except (FileNotFoundError, ValueError): + if mode == IsssMode.SOCKET: + self.module = Socket(socket_max_current, InternalOpenWB(0, serial_client)) + else: self.module = chargepoint_module.ChargepointModule(InternalOpenWB(0, serial_client)) else: self.module = chargepoint_module.ChargepointModule(InternalOpenWB(1, serial_client)) @@ -297,4 +300,4 @@ def __thread_active(thread: Optional[threading.Thread]) -> bool: log.exception("Fehler bei Ladepunkt "+str(self.local_charge_point_num)) -Isss().loop() +Isss(IsssMode(sys.argv[1]), int(sys.argv[2])).loop() diff --git a/runs/services.sh b/runs/services.sh index c64db615f3..c8492e6ac0 100755 --- a/runs/services.sh +++ b/runs/services.sh @@ -63,18 +63,37 @@ start() { fi - if (( isss == 1 )) || [[ "$evsecon" == "daemon" ]]; then - openwbDebugLog "MAIN" 1 "external openWB or daemon mode configured" - if pgrep -f '^python.*/isss.py' > /dev/null + if (( isss == 1 )) || [[ "$evsecon" == "daemon" ]] || [[ "$evsecon" == "buchse" ]]; then + if [[ "$evsecon" == "buchse" ]]; then + isss_mode="socket" + elif [[ $lastmanagement == 1 ]]; then + isss_mode="duo" + else + isss_mode="daemon" + fi + prev_isss_mode=$(< $OPENWBBASEDIR/ramdisk/isss_mode) + + openwbDebugLog "MAIN" 1 "external openWB, daemon mode or socket mode configured" + if pgrep -f '^python.*/isss.py' > /dev/null && [[ $prev_isss_mode == $isss_mode ]]; then openwbDebugLog "MAIN" 1 "isss handler already running" else - openwbDebugLog "MAIN" 0 "isss handler not running! restarting process" - echo "$lastmanagement" > "$OPENWBBASEDIR/ramdisk/issslp2act" - nohup python3 "$OPENWBBASEDIR/runs/isss.py" >>"$OPENWBBASEDIR/ramdisk/isss.log" 2>&1 & + openwbDebugLog "MAIN" 0 "Start/restart isss handler in mode $isss_mode." + if [ -f /home/pi/ppbuchse ]; then + ppbuchse=$(< /home/pi/ppbuchse) + re='^[0-9]+$' + if ! [[ $ppbuchse =~ $re ]] ; then + openwbDebugLog "MAIN" 0 "Invalid value in ppbuchse. Set ppbuchse to 32." + ppbuchse=32 + fi + else + ppbuchse=32 + fi + nohup python3 "$OPENWBBASEDIR/runs/isss.py" "$isss_mode" "$ppbuchse">>"$OPENWBBASEDIR/ramdisk/isss.log" 2>&1 & fi + echo "$isss_mode" > $OPENWBBASEDIR/ramdisk/isss_mode else - openwbDebugLog "MAIN" 1 "external openWB or daemon mode not configured; checking network setup" + openwbDebugLog "MAIN" 1 "external openWB, daemon mode or socket mode not configured; checking network setup" local ethstate=$( /home/pi/ppbuchse - - if pgrep -f '^python.*/buchse.py' > /dev/null - then - openwbDebugLog "MAIN" 1 "socket handler already running" - else - openwbDebugLog "MAIN" 0 "socket handler not running! restarting process" - nohup python3 "$OPENWBBASEDIR/runs/buchse.py" >> "$OPENWBBASEDIR/ramdisk/openWB.log" 2>&1 & - fi - else - sudo pkill -f '^python.*/buchse.py' - fi - rseSetup "$rseenabled" 0 pushButtonsSetup "$ladetaster" 0 From 1387781328728d8cb3ff4daca5a79fc162454b1c Mon Sep 17 00:00:00 2001 From: LKuemmel <76958050+LKuemmel@users.noreply.github.com> Date: Wed, 4 Jan 2023 12:09:10 +0100 Subject: [PATCH 197/201] Bump version 1.9.290 --- web/version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/version b/web/version index cbf5776325..47d6740bf5 100644 --- a/web/version +++ b/web/version @@ -1 +1 @@ -1.9.289 +1.9.290 From 1a3bfb22c0f5fbb0dd2511b5de5d525f99990a87 Mon Sep 17 00:00:00 2001 From: LKuemmel <76958050+LKuemmel@users.noreply.github.com> Date: Wed, 4 Jan 2023 12:13:06 +0100 Subject: [PATCH 198/201] Bump version 1.9.291 --- web/version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/version b/web/version index 47d6740bf5..68d05d0d27 100644 --- a/web/version +++ b/web/version @@ -1 +1 @@ -1.9.290 +1.9.291 From a7620bd2b446bbf0e5a9f683503920c217b8948c Mon Sep 17 00:00:00 2001 From: LKuemmel Date: Fri, 6 Jan 2023 14:36:52 +0100 Subject: [PATCH 199/201] batterx: fix ids --- packages/modules/common/fault_state.py | 3 ++- packages/modules/devices/batterx/device.py | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/modules/common/fault_state.py b/packages/modules/common/fault_state.py index e87fd7d93d..8f5c36096a 100644 --- a/packages/modules/common/fault_state.py +++ b/packages/modules/common/fault_state.py @@ -45,13 +45,14 @@ def store_error(self, component_info: ComponentInfo) -> None: if ramdisk: topic = component_type.type_topic_mapping_comp(component_info.type) prefix = "openWB/set/" + topic + "/" - if component_info.id is not None: + if component_info.type != "counter" and component_info.type != "bat": if component_type == "vehicle": prefix += str(component_info.id) + "/socFault" else: prefix += str(component_info.id) + "/fault" else: prefix += "fault" + log.debug(prefix + "Str") pub.pub_single(prefix + "Str", self.fault_str, hostname=component_info.hostname) pub.pub_single(prefix + "State", self.fault_state.value, hostname=component_info.hostname) if "chargepoint" in component_info.type: diff --git a/packages/modules/devices/batterx/device.py b/packages/modules/devices/batterx/device.py index 178daa7d05..99566e2bf0 100644 --- a/packages/modules/devices/batterx/device.py +++ b/packages/modules/devices/batterx/device.py @@ -87,9 +87,9 @@ def read_legacy( dev = Device(device_config) dev = _add_component(dev, component_type, num) if evu_counter == "bezug_batterx": - dev = _add_component(dev, "counter", None) + dev = _add_component(dev, "counter", 0) if bat == "speicher_batterx": - dev = _add_component(dev, "bat", None) + dev = _add_component(dev, "bat", 3) log.debug('BatterX IP-Adresse: ' + ip_address) From 02b71cc18435ab0567339d7df88981761b2bdae7 Mon Sep 17 00:00:00 2001 From: LKuemmel Date: Fri, 6 Jan 2023 15:46:04 +0100 Subject: [PATCH 200/201] remove unneccessary log msg --- packages/modules/common/fault_state.py | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/modules/common/fault_state.py b/packages/modules/common/fault_state.py index 8f5c36096a..c45c25243e 100644 --- a/packages/modules/common/fault_state.py +++ b/packages/modules/common/fault_state.py @@ -52,7 +52,6 @@ def store_error(self, component_info: ComponentInfo) -> None: prefix += str(component_info.id) + "/fault" else: prefix += "fault" - log.debug(prefix + "Str") pub.pub_single(prefix + "Str", self.fault_str, hostname=component_info.hostname) pub.pub_single(prefix + "State", self.fault_state.value, hostname=component_info.hostname) if "chargepoint" in component_info.type: From 0e339fffd87df210dbd573d923e2fad5f9ec594d Mon Sep 17 00:00:00 2001 From: Jochen Neidhardt Date: Thu, 29 Dec 2022 13:56:56 +0100 Subject: [PATCH 201/201] - extended minimal display to support second CP (for DUO) - merge max scale setting for multiple display themes - extend max scale setting for minimal display theme - allow max scale setting even if configured as blind CP --- web/display/minimal/gauge.js | 1030 ++++++++++++++++++++++ web/display/minimal/gauge.min.js | 1 - web/display/minimal/gaugevalues.php | 22 - web/display/minimal/index.php | 103 ++- web/display/minimal/minimalgauge.js | 216 +++-- web/display/minimal/processAllMqttMsg.js | 122 ++- web/display/minimal/setupMqttServices.js | 15 +- web/settings/misc.php | 100 +-- web/settings/settings.php | 5 +- 9 files changed, 1340 insertions(+), 274 deletions(-) create mode 100644 web/display/minimal/gauge.js delete mode 100644 web/display/minimal/gauge.min.js delete mode 100644 web/display/minimal/gaugevalues.php diff --git a/web/display/minimal/gauge.js b/web/display/minimal/gauge.js new file mode 100644 index 0000000000..03780321c5 --- /dev/null +++ b/web/display/minimal/gauge.js @@ -0,0 +1,1030 @@ +// Generated by CoffeeScript 1.11.1 +(function () { + var AnimatedText, AnimatedTextFactory, Bar, BaseDonut, BaseGauge, Donut, Gauge, GaugePointer, TextRenderer, ValueUpdater, addCommas, cutHex, formatNumber, mergeObjects, secondsToString, + slice = [].slice, + hasProp = {}.hasOwnProperty, + extend = function (child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; }, + indexOf = [].indexOf || function (item) { for (var i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; } return -1; }; + + (function () { + var browserRequestAnimationFrame, isCancelled, j, lastId, len, vendor, vendors; + vendors = ['ms', 'moz', 'webkit', 'o']; + for (j = 0, len = vendors.length; j < len; j++) { + vendor = vendors[j]; + if (window.requestAnimationFrame) { + break; + } + window.requestAnimationFrame = window[vendor + 'RequestAnimationFrame']; + window.cancelAnimationFrame = window[vendor + 'CancelAnimationFrame'] || window[vendor + 'CancelRequestAnimationFrame']; + } + browserRequestAnimationFrame = null; + lastId = 0; + isCancelled = {}; + if (!requestAnimationFrame) { + window.requestAnimationFrame = function (callback, element) { + var currTime, id, lastTime, timeToCall; + currTime = new Date().getTime(); + timeToCall = Math.max(0, 16 - (currTime - lastTime)); + id = window.setTimeout(function () { + return callback(currTime + timeToCall); + }, timeToCall); + lastTime = currTime + timeToCall; + return id; + }; + return window.cancelAnimationFrame = function (id) { + return clearTimeout(id); + }; + } else if (!window.cancelAnimationFrame) { + browserRequestAnimationFrame = window.requestAnimationFrame; + window.requestAnimationFrame = function (callback, element) { + var myId; + myId = ++lastId; + browserRequestAnimationFrame(function () { + if (!isCancelled[myId]) { + return callback(); + } + }, element); + return myId; + }; + return window.cancelAnimationFrame = function (id) { + return isCancelled[id] = true; + }; + } + })(); + + secondsToString = function (sec) { + var hr, min; + hr = Math.floor(sec / 3600); + min = Math.floor((sec - (hr * 3600)) / 60); + sec -= (hr * 3600) + (min * 60); + sec += ''; + min += ''; + while (min.length < 2) { + min = '0' + min; + } + while (sec.length < 2) { + sec = '0' + sec; + } + hr = hr ? hr + ':' : ''; + return hr + min + ':' + sec; + }; + + formatNumber = function () { + var digits, num, value; + num = 1 <= arguments.length ? slice.call(arguments, 0) : []; + value = num[0]; + digits = 0 || num[1]; + return addCommas(value.toFixed(digits)); + }; + + mergeObjects = function (obj1, obj2) { + var key, out, val; + out = {}; + for (key in obj1) { + if (!hasProp.call(obj1, key)) continue; + val = obj1[key]; + out[key] = val; + } + for (key in obj2) { + if (!hasProp.call(obj2, key)) continue; + val = obj2[key]; + out[key] = val; + } + return out; + }; + + addCommas = function (nStr) { + var rgx, x, x1, x2; + nStr += ''; + x = nStr.split('.'); + x1 = x[0]; + x2 = ''; + if (x.length > 1) { + x2 = '.' + x[1]; + } + rgx = /(\d+)(\d{3})/; + while (rgx.test(x1)) { + x1 = x1.replace(rgx, '$1' + ',' + '$2'); + } + return x1 + x2; + }; + + cutHex = function (nStr) { + if (nStr.charAt(0) === "#") { + return nStr.substring(1, 7); + } + return nStr; + }; + + ValueUpdater = (function () { + ValueUpdater.prototype.animationSpeed = 32; + + function ValueUpdater(addToAnimationQueue, clear) { + if (addToAnimationQueue == null) { + addToAnimationQueue = true; + } + this.clear = clear != null ? clear : true; + if (addToAnimationQueue) { + AnimationUpdater.add(this); + } + } + + ValueUpdater.prototype.update = function (force) { + var diff; + if (force == null) { + force = false; + } + if (force || this.displayedValue !== this.value) { + if (this.ctx && this.clear) { + this.ctx.clearRect(0, 0, this.canvas.width, this.canvas.height); + } + diff = this.value - this.displayedValue; + if (Math.abs(diff / this.animationSpeed) <= 0.001) { + this.displayedValue = this.value; + } else { + this.displayedValue = this.displayedValue + diff / this.animationSpeed; + } + this.render(); + return true; + } + return false; + }; + + return ValueUpdater; + + })(); + + BaseGauge = (function (superClass) { + extend(BaseGauge, superClass); + + function BaseGauge() { + return BaseGauge.__super__.constructor.apply(this, arguments); + } + + BaseGauge.prototype.displayScale = 1; + + BaseGauge.prototype.forceUpdate = true; + + BaseGauge.prototype.setTextField = function (textField, fractionDigits) { + return this.textField = textField instanceof TextRenderer ? textField : new TextRenderer(textField, fractionDigits); + }; + + BaseGauge.prototype.setMinValue = function (minValue, updateStartValue) { + var gauge, j, len, ref, results; + this.minValue = minValue; + if (updateStartValue == null) { + updateStartValue = true; + } + if (updateStartValue) { + this.displayedValue = this.minValue; + ref = this.gp || []; + results = []; + for (j = 0, len = ref.length; j < len; j++) { + gauge = ref[j]; + results.push(gauge.displayedValue = this.minValue); + } + return results; + } + }; + + BaseGauge.prototype.setOptions = function (options) { + if (options == null) { + options = null; + } + this.options = mergeObjects(this.options, options); + if (this.textField) { + this.textField.el.style.fontSize = options.fontSize + 'px'; + } + if (this.options.angle > .5) { + this.options.angle = .5; + } + this.configDisplayScale(); + return this; + }; + + BaseGauge.prototype.configDisplayScale = function () { + var backingStorePixelRatio, devicePixelRatio, height, prevDisplayScale, width; + prevDisplayScale = this.displayScale; + if (this.options.highDpiSupport === false) { + delete this.displayScale; + } else { + devicePixelRatio = window.devicePixelRatio || 1; + backingStorePixelRatio = this.ctx.webkitBackingStorePixelRatio || this.ctx.mozBackingStorePixelRatio || this.ctx.msBackingStorePixelRatio || this.ctx.oBackingStorePixelRatio || this.ctx.backingStorePixelRatio || 1; + this.displayScale = devicePixelRatio / backingStorePixelRatio; + } + if (this.displayScale !== prevDisplayScale) { + width = this.canvas.G__width || this.canvas.width; + height = this.canvas.G__height || this.canvas.height; + this.canvas.width = width * this.displayScale; + this.canvas.height = height * this.displayScale; + this.canvas.style.width = width + "px"; + this.canvas.style.height = height + "px"; + this.canvas.G__width = width; + this.canvas.G__height = height; + } + return this; + }; + + BaseGauge.prototype.parseValue = function (value) { + value = parseFloat(value) || Number(value); + if (isFinite(value)) { + return value; + } else { + return 0; + } + }; + + return BaseGauge; + + })(ValueUpdater); + + TextRenderer = (function () { + function TextRenderer(el, fractionDigits1) { + this.el = el; + this.fractionDigits = fractionDigits1; + } + + TextRenderer.prototype.render = function (gauge) { + return this.el.innerHTML = formatNumber(gauge.displayedValue, this.fractionDigits); + }; + + return TextRenderer; + + })(); + + AnimatedText = (function (superClass) { + extend(AnimatedText, superClass); + + AnimatedText.prototype.displayedValue = 0; + + AnimatedText.prototype.value = 0; + + AnimatedText.prototype.setVal = function (value) { + return this.value = 1 * value; + }; + + function AnimatedText(elem1, text) { + this.elem = elem1; + this.text = text != null ? text : false; + AnimatedText.__super__.constructor.call(this); + if (this.elem === void 0) { + throw new Error('The element isn\'t defined.'); + } + this.value = 1 * this.elem.innerHTML; + if (this.text) { + this.value = 0; + } + } + + AnimatedText.prototype.render = function () { + var textVal; + if (this.text) { + textVal = secondsToString(this.displayedValue.toFixed(0)); + } else { + textVal = addCommas(formatNumber(this.displayedValue)); + } + return this.elem.innerHTML = textVal; + }; + + return AnimatedText; + + })(ValueUpdater); + + AnimatedTextFactory = { + create: function (objList) { + var elem, j, len, out; + out = []; + for (j = 0, len = objList.length; j < len; j++) { + elem = objList[j]; + out.push(new AnimatedText(elem)); + } + return out; + } + }; + + GaugePointer = (function (superClass) { + extend(GaugePointer, superClass); + + GaugePointer.prototype.displayedValue = 0; + + GaugePointer.prototype.value = 0; + + GaugePointer.prototype.options = { + strokeWidth: 0.035, + length: 0.1, + color: "#000000", + iconPath: null, + iconScale: 1.0, + iconAngle: 0 + }; + + GaugePointer.prototype.img = null; + + function GaugePointer(gauge1) { + this.gauge = gauge1; + if (this.gauge === void 0) { + throw new Error('The element isn\'t defined.'); + } + this.ctx = this.gauge.ctx; + this.canvas = this.gauge.canvas; + GaugePointer.__super__.constructor.call(this, false, false); + this.setOptions(); + } + + GaugePointer.prototype.setOptions = function (options) { + if (options == null) { + options = null; + } + this.options = mergeObjects(this.options, options); + this.length = 2 * this.gauge.radius * this.gauge.options.radiusScale * this.options.length; + this.strokeWidth = this.canvas.height * this.options.strokeWidth; + this.maxValue = this.gauge.maxValue; + this.minValue = this.gauge.minValue; + this.animationSpeed = this.gauge.animationSpeed; + this.options.angle = this.gauge.options.angle; + if (this.options.iconPath) { + this.img = new Image(); + return this.img.src = this.options.iconPath; + } + }; + + GaugePointer.prototype.render = function () { + var angle, endX, endY, imgX, imgY, startX, startY, x, y; + angle = this.gauge.getAngle.call(this, this.displayedValue); + x = Math.round(this.length * Math.cos(angle)); + y = Math.round(this.length * Math.sin(angle)); + startX = Math.round(this.strokeWidth * Math.cos(angle - Math.PI / 2)); + startY = Math.round(this.strokeWidth * Math.sin(angle - Math.PI / 2)); + endX = Math.round(this.strokeWidth * Math.cos(angle + Math.PI / 2)); + endY = Math.round(this.strokeWidth * Math.sin(angle + Math.PI / 2)); + this.ctx.beginPath(); + this.ctx.fillStyle = this.options.color; + this.ctx.arc(0, 0, this.strokeWidth, 0, Math.PI * 2, false); + this.ctx.fill(); + this.ctx.beginPath(); + this.ctx.moveTo(startX, startY); + this.ctx.lineTo(x, y); + this.ctx.lineTo(endX, endY); + this.ctx.fill(); + if (this.img) { + imgX = Math.round(this.img.width * this.options.iconScale); + imgY = Math.round(this.img.height * this.options.iconScale); + this.ctx.save(); + this.ctx.translate(x, y); + this.ctx.rotate(angle + Math.PI / 180.0 * (90 + this.options.iconAngle)); + this.ctx.drawImage(this.img, -imgX / 2, -imgY / 2, imgX, imgY); + return this.ctx.restore(); + } + }; + + return GaugePointer; + + })(ValueUpdater); + + Bar = (function () { + function Bar(elem1) { + this.elem = elem1; + } + + Bar.prototype.updateValues = function (arrValues) { + this.value = arrValues[0]; + this.maxValue = arrValues[1]; + this.avgValue = arrValues[2]; + return this.render(); + }; + + Bar.prototype.render = function () { + var avgPercent, valPercent; + if (this.textField) { + this.textField.text(formatNumber(this.value)); + } + if (this.maxValue === 0) { + this.maxValue = this.avgValue * 2; + } + valPercent = (this.value / this.maxValue) * 100; + avgPercent = (this.avgValue / this.maxValue) * 100; + $(".bar-value", this.elem).css({ + "width": valPercent + "%" + }); + return $(".typical-value", this.elem).css({ + "width": avgPercent + "%" + }); + }; + + return Bar; + + })(); + + Gauge = (function (superClass) { + extend(Gauge, superClass); + + Gauge.prototype.elem = null; + + Gauge.prototype.value = [20]; + + Gauge.prototype.maxValue = 80; + + Gauge.prototype.minValue = 0; + + Gauge.prototype.displayedAngle = 0; + + Gauge.prototype.displayedValue = 0; + + Gauge.prototype.lineWidth = 40; + + Gauge.prototype.paddingTop = 0.1; + + Gauge.prototype.paddingBottom = 0.1; + + Gauge.prototype.percentColors = null; + + Gauge.prototype.options = { + colorStart: "#6fadcf", + colorStop: void 0, + gradientType: 0, + strokeColor: "#e0e0e0", + pointer: { + length: 0.8, + strokeWidth: 0.035, + iconScale: 1.0 + }, + angle: 0.15, + lineWidth: 0.44, + radiusScale: 1.0, + fontSize: 40, + limitMax: false, + limitMin: false, + range: 1, + mirror: false + }; + + function Gauge(canvas) { + var h, w; + this.canvas = canvas; + Gauge.__super__.constructor.call(this); + this.percentColors = null; + if (typeof G_vmlCanvasManager !== 'undefined') { + this.canvas = window.G_vmlCanvasManager.initElement(this.canvas); + } + this.ctx = this.canvas.getContext('2d'); + h = this.canvas.clientHeight; + w = this.canvas.clientWidth; + this.canvas.height = h; + this.canvas.width = w; + this.gp = [new GaugePointer(this)]; + this.setOptions(); + } + + Gauge.prototype.setOptions = function (options) { + var gauge, j, len, phi, ref; + if (options == null) { + options = null; + } + Gauge.__super__.setOptions.call(this, options); + this.configPercentColors(); + this.extraPadding = 0; + if (this.options.angle < 0) { + phi = Math.PI * (1 + this.options.angle); + this.extraPadding = Math.sin(phi); + } + this.availableHeight = this.canvas.height * (1 - this.paddingTop - this.paddingBottom); + this.lineWidth = this.availableHeight * this.options.lineWidth; + this.radius = (this.availableHeight - this.lineWidth / 2) / (1.0 + this.extraPadding); + this.ctx.clearRect(0, 0, this.canvas.width, this.canvas.height); + ref = this.gp; + for (j = 0, len = ref.length; j < len; j++) { + gauge = ref[j]; + gauge.setOptions(this.options.pointer); + gauge.render(); + } + this.render(); + return this; + }; + + Gauge.prototype.configPercentColors = function () { + var bval, gval, i, j, ref, results, rval; + this.percentColors = null; + if (this.options.percentColors !== void 0) { + this.percentColors = new Array(); + results = []; + for (i = j = 0, ref = this.options.percentColors.length - 1; 0 <= ref ? j <= ref : j >= ref; i = 0 <= ref ? ++j : --j) { + rval = parseInt((cutHex(this.options.percentColors[i][1])).substring(0, 2), 16); + gval = parseInt((cutHex(this.options.percentColors[i][1])).substring(2, 4), 16); + bval = parseInt((cutHex(this.options.percentColors[i][1])).substring(4, 6), 16); + results.push(this.percentColors[i] = { + pct: this.options.percentColors[i][0], + color: { + r: rval, + g: gval, + b: bval + } + }); + } + return results; + } + }; + + Gauge.prototype.set = function (value) { + var gp, i, j, l, len, m, ref, ref1, val; + if (!(value instanceof Array)) { + value = [value]; + } + for (i = j = 0, ref = value.length - 1; 0 <= ref ? j <= ref : j >= ref; i = 0 <= ref ? ++j : --j) { + value[i] = this.parseValue(value[i]); + } + if (value.length > this.gp.length) { + for (i = l = 0, ref1 = value.length - this.gp.length; 0 <= ref1 ? l < ref1 : l > ref1; i = 0 <= ref1 ? ++l : --l) { + gp = new GaugePointer(this); + gp.setOptions(this.options.pointer); + this.gp.push(gp); + } + } else if (value.length < this.gp.length) { + this.gp = this.gp.slice(this.gp.length - value.length); + } + i = 0; + for (m = 0, len = value.length; m < len; m++) { + val = value[m]; + if (val > this.maxValue) { + if (this.options.limitMax) { + val = this.maxValue; + } else { + this.maxValue = val + 1; + } + } else if (val < this.minValue) { + if (this.options.limitMin) { + val = this.minValue; + } else { + this.minValue = val - 1; + } + } + this.gp[i].value = val; + this.gp[i++].setOptions({ + minValue: this.minValue, + maxValue: this.maxValue, + angle: this.options.angle + }); + } + this.value = Math.max(Math.min(value[value.length - 1], this.maxValue), this.minValue); + AnimationUpdater.add(this); + AnimationUpdater.run(this.forceUpdate); + return this.forceUpdate = false; + }; + + Gauge.prototype.getAngle = function (value) { + if (this.options.mirror) { + return 2 * Math.PI - ((value - this.minValue) / (this.maxValue - this.minValue)) * (this.options.range) * Math.PI; + } else { + return (1 + this.options.angle) * Math.PI + ((value - this.minValue) / (this.maxValue - this.minValue)) * (this.options.range) * Math.PI; + } + }; + + Gauge.prototype.getStartAngle = function () { + if (this.options.mirror) { + return (2 - this.options.angle) * Math.PI; + } else { + return (1 + this.options.angle) * Math.PI; + } + }; + + Gauge.prototype.getEndAngle = function () { + if (this.options.mirror) { + return (2 - this.options.angle - this.options.range) * Math.PI; + } else { + return (1 + this.options.angle + this.options.range) * Math.PI; + } + }; + + Gauge.prototype.getColorForPercentage = function (pct, grad) { + var color, endColor, i, j, rangePct, ref, startColor; + if (pct === 0) { + color = this.percentColors[0].color; + } else { + color = this.percentColors[this.percentColors.length - 1].color; + for (i = j = 0, ref = this.percentColors.length - 1; 0 <= ref ? j <= ref : j >= ref; i = 0 <= ref ? ++j : --j) { + if (pct <= this.percentColors[i].pct) { + if (grad === true) { + startColor = this.percentColors[i - 1] || this.percentColors[0]; + endColor = this.percentColors[i]; + rangePct = (pct - startColor.pct) / (endColor.pct - startColor.pct); + color = { + r: Math.floor(startColor.color.r * (1 - rangePct) + endColor.color.r * rangePct), + g: Math.floor(startColor.color.g * (1 - rangePct) + endColor.color.g * rangePct), + b: Math.floor(startColor.color.b * (1 - rangePct) + endColor.color.b * rangePct) + }; + } else { + color = this.percentColors[i].color; + } + break; + } + } + } + return 'rgb(' + [color.r, color.g, color.b].join(',') + ')'; + }; + + Gauge.prototype.getColorForValue = function (val, grad) { + var pct; + pct = (val - this.minValue) / (this.maxValue - this.minValue); + return this.getColorForPercentage(pct, grad); + }; + + Gauge.prototype.renderStaticLabels = function (staticLabels, w, h, radius) { + var font, fontsize, j, len, match, re, ref, rest, rotationAngle, value, textvalue, textstring, labelPosition; + this.ctx.save(); + this.ctx.translate(w, h); + font = staticLabels.font || "10px Times"; + re = /\d+\.?\d?/; + match = font.match(re)[0]; + rest = font.slice(match.length); + fontsize = parseFloat(match) * this.displayScale; + this.ctx.font = fontsize + rest; + this.ctx.fillStyle = staticLabels.color || "#000000"; + this.ctx.textBaseline = "bottom"; + this.ctx.textAlign = "center"; + ref = staticLabels.labels; + for (j = 0, len = ref.length; j < len; j++) { + value = ref[j]; + if (value.label !== void 0) { + font = value.font || staticLabels.font; + match = font.match(re)[0]; + rest = font.slice(match.length); + fontsize = parseFloat(match) * this.displayScale; + this.ctx.font = fontsize + rest; + textvalue = value.label; + } else { + textvalue = value; + } + if ((!this.options.limitMin || textvalue >= this.minValue) && (!this.options.limitMax || textvalue <= this.maxValue)) { + if ((textvalue == this.minValue && !this.options.mirror) || (textvalue == this.maxValue && this.options.mirror)) { + this.ctx.textAlign = "left"; + } else if ((textvalue == this.minValue && this.options.mirror) || (textvalue == this.maxValue && !this.options.mirror)) { + this.ctx.textAlign = "right"; + } + if (textvalue != 0) { + textvalue = formatNumber(value, staticLabels.fractionDigits); + } + if ( staticLabels.unit !== void 0) { + textstring = textvalue + " " + staticLabels.unit; + } else { + textstring = textvalue; + } + if (staticLabels.insideLabel) { + labelPosition = -radius + this.lineWidth / 2 + 6; + this.ctx.textBaseline = "top"; + } else { + labelPosition = -radius - this.lineWidth / 2; + this.ctx.textBaseline = "bottom"; + } + rotationAngle = this.getAngle(value) - 3 * Math.PI / 2; + this.ctx.rotate(rotationAngle); + this.ctx.fillText(textstring, 0, labelPosition); + this.ctx.rotate(-rotationAngle); + this.ctx.textAlign = "center"; + } + } + return this.ctx.restore(); + }; + + Gauge.prototype.renderTicks = function (ticksOptions, w, h, radius) { + var currentDivision, currentSubDivision, divColor, divLength, divWidth, divisionCount, j, lineWidth, range, rangeDivisions, ref, results, scaleMutate, st, subColor, subDivisions, subLength, subWidth, subdivisionCount, t, tmpRadius; + if (ticksOptions !== {}) { + divisionCount = ticksOptions.divisions || 0; + subdivisionCount = ticksOptions.subDivisions || 0; + divColor = ticksOptions.divColor || '#fff'; + subColor = ticksOptions.subColor || '#fff'; + divLength = ticksOptions.divLength || 0.7; + subLength = ticksOptions.subLength || 0.2; + range = parseFloat(this.maxValue) - parseFloat(this.minValue); + rangeDivisions = parseFloat(range) / parseFloat(ticksOptions.divisions); + subDivisions = parseFloat(rangeDivisions) / parseFloat(ticksOptions.subDivisions); + currentDivision = parseFloat(this.minValue); + currentSubDivision = 0.0 + subDivisions; + lineWidth = range / 400; + divWidth = lineWidth * (ticksOptions.divWidth || 1); + subWidth = lineWidth * (ticksOptions.subWidth || 1); + results = []; + for (t = j = 0, ref = divisionCount + 1; j < ref; t = j += 1) { + this.ctx.lineWidth = this.lineWidth * divLength; + scaleMutate = (this.lineWidth / 2) * (1 - divLength); + tmpRadius = (this.radius * this.options.radiusScale) + scaleMutate; + this.ctx.strokeStyle = divColor; + this.ctx.beginPath(); + this.ctx.arc(0, 0, tmpRadius, this.getAngle(currentDivision - divWidth), this.getAngle(currentDivision + divWidth), false); + this.ctx.stroke(); + currentSubDivision = currentDivision + subDivisions; + currentDivision += rangeDivisions; + if (t !== ticksOptions.divisions && subdivisionCount > 0) { + results.push((function () { + var l, ref1, results1; + results1 = []; + for (st = l = 0, ref1 = subdivisionCount - 1; l < ref1; st = l += 1) { + this.ctx.lineWidth = this.lineWidth * subLength; + scaleMutate = (this.lineWidth / 2) * (1 - subLength); + tmpRadius = (this.radius * this.options.radiusScale) + scaleMutate; + this.ctx.strokeStyle = subColor; + this.ctx.beginPath(); + this.ctx.arc(0, 0, tmpRadius, this.getAngle(currentSubDivision - subWidth), this.getAngle(currentSubDivision + subWidth), false); + this.ctx.stroke(); + results1.push(currentSubDivision += subDivisions); + } + return results1; + }).call(this)); + } else { + results.push(void 0); + } + } + return results; + } + }; + + Gauge.prototype.render = function () { + var displayedAngle, fillStyle, gauge, h, j, l, len, len1, max, min, radius, ref, ref1, scaleMutate, tmpRadius, w, zone; + w = this.canvas.width / 2; + h = (this.canvas.height * this.paddingTop + this.availableHeight) - ((this.radius + this.lineWidth / 2) * this.extraPadding); + displayedAngle = this.getAngle(this.displayedValue); + if (this.textField) { + this.textField.render(this); + } + this.ctx.lineCap = "butt"; + radius = this.radius * this.options.radiusScale; + if (this.options.staticLabels) { + this.renderStaticLabels(this.options.staticLabels, w, h, radius); + } + if (this.options.staticZones) { + this.ctx.save(); + this.ctx.translate(w, h); + this.ctx.lineWidth = this.lineWidth; + ref = this.options.staticZones; + for (j = 0, len = ref.length; j < len; j++) { + zone = ref[j]; + min = zone.min; + if (this.options.limitMin && min < this.minValue) { + min = this.minValue; + } + max = zone.max; + if (this.options.limitMax && max > this.maxValue) { + max = this.maxValue; + } + tmpRadius = this.radius * this.options.radiusScale; + if (zone.height) { + this.ctx.lineWidth = this.lineWidth * zone.height; + scaleMutate = (this.lineWidth / 2) * (zone.offset || 1 - zone.height); + tmpRadius = (this.radius * this.options.radiusScale) + scaleMutate; + } + this.ctx.strokeStyle = zone.strokeStyle; + this.ctx.beginPath(); + this.ctx.arc(0, 0, tmpRadius, this.getAngle(min), this.getAngle(max), false); + this.ctx.stroke(); + } + } else { + if (this.options.customFillStyle !== void 0) { + fillStyle = this.options.customFillStyle(this); + } else if (this.percentColors !== null) { + fillStyle = this.getColorForValue(this.displayedValue, this.options.generateGradient); + } else if (this.options.colorStop !== void 0) { + if (this.options.gradientType === 0) { + fillStyle = this.ctx.createRadialGradient(w, h, 9, w, h, 70); + } else { + fillStyle = this.ctx.createLinearGradient(0, 0, w, 0); + } + fillStyle.addColorStop(0, this.options.colorStart); + fillStyle.addColorStop(1, this.options.colorStop); + } else { + fillStyle = this.options.colorStart; + } + this.ctx.strokeStyle = fillStyle; + this.ctx.beginPath(); + this.ctx.arc(w, h, radius, this.getStartAngle(), displayedAngle, this.options.mirror); + this.ctx.lineWidth = this.lineWidth; + this.ctx.stroke(); + this.ctx.strokeStyle = this.options.strokeColor; + this.ctx.beginPath(); + this.ctx.arc(w, h, radius, displayedAngle, this.getEndAngle(), this.options.mirror); + this.ctx.stroke(); + this.ctx.save(); + this.ctx.translate(w, h); + } + if (this.options.renderTicks) { + this.renderTicks(this.options.renderTicks, w, h, radius); + } + this.ctx.restore(); + this.ctx.translate(w, h); + ref1 = this.gp; + for (l = 0, len1 = ref1.length; l < len1; l++) { + gauge = ref1[l]; + gauge.update(true); + } + return this.ctx.translate(-w, -h); + }; + + return Gauge; + + })(BaseGauge); + + BaseDonut = (function (superClass) { + extend(BaseDonut, superClass); + + BaseDonut.prototype.lineWidth = 15; + + BaseDonut.prototype.displayedValue = 0; + + BaseDonut.prototype.value = 33; + + BaseDonut.prototype.maxValue = 80; + + BaseDonut.prototype.minValue = 0; + + BaseDonut.prototype.options = { + lineWidth: 0.10, + colorStart: "#6f6ea0", + colorStop: "#c0c0db", + strokeColor: "#eeeeee", + shadowColor: "#d5d5d5", + angle: 0.35, + radiusScale: 1.0 + }; + + function BaseDonut(canvas) { + this.canvas = canvas; + BaseDonut.__super__.constructor.call(this); + if (typeof G_vmlCanvasManager !== 'undefined') { + this.canvas = window.G_vmlCanvasManager.initElement(this.canvas); + } + this.ctx = this.canvas.getContext('2d'); + this.setOptions(); + this.render(); + } + + BaseDonut.prototype.getAngle = function (value) { + return (1 - this.options.angle) * Math.PI + ((value - this.minValue) / (this.maxValue - this.minValue)) * ((2 + this.options.angle) - (1 - this.options.angle)) * Math.PI; + }; + + BaseDonut.prototype.setOptions = function (options) { + if (options == null) { + options = null; + } + BaseDonut.__super__.setOptions.call(this, options); + this.lineWidth = this.canvas.height * this.options.lineWidth; + this.radius = this.options.radiusScale * (this.canvas.height / 2 - this.lineWidth / 2); + return this; + }; + + BaseDonut.prototype.set = function (value) { + this.value = this.parseValue(value); + if (this.value > this.maxValue) { + if (this.options.limitMax) { + this.value = this.maxValue; + } else { + this.maxValue = this.value; + } + } else if (this.value < this.minValue) { + if (this.options.limitMin) { + this.value = this.minValue; + } else { + this.minValue = this.value; + } + } + AnimationUpdater.add(this); + AnimationUpdater.run(this.forceUpdate); + return this.forceUpdate = false; + }; + + BaseDonut.prototype.render = function () { + var displayedAngle, grdFill, h, start, stop, w; + displayedAngle = this.getAngle(this.displayedValue); + w = this.canvas.width / 2; + h = this.canvas.height / 2; + if (this.textField) { + this.textField.render(this); + } + grdFill = this.ctx.createRadialGradient(w, h, 39, w, h, 70); + grdFill.addColorStop(0, this.options.colorStart); + grdFill.addColorStop(1, this.options.colorStop); + start = this.radius - this.lineWidth / 2; + stop = this.radius + this.lineWidth / 2; + this.ctx.strokeStyle = this.options.strokeColor; + this.ctx.beginPath(); + this.ctx.arc(w, h, this.radius, (1 - this.options.angle) * Math.PI, (2 + this.options.angle) * Math.PI, false); + this.ctx.lineWidth = this.lineWidth; + this.ctx.lineCap = "round"; + this.ctx.stroke(); + this.ctx.strokeStyle = grdFill; + this.ctx.beginPath(); + this.ctx.arc(w, h, this.radius, (1 - this.options.angle) * Math.PI, displayedAngle, false); + return this.ctx.stroke(); + }; + + return BaseDonut; + + })(BaseGauge); + + Donut = (function (superClass) { + extend(Donut, superClass); + + function Donut() { + return Donut.__super__.constructor.apply(this, arguments); + } + + Donut.prototype.strokeGradient = function (w, h, start, stop) { + var grd; + grd = this.ctx.createRadialGradient(w, h, start, w, h, stop); + grd.addColorStop(0, this.options.shadowColor); + grd.addColorStop(0.12, this.options._orgStrokeColor); + grd.addColorStop(0.88, this.options._orgStrokeColor); + grd.addColorStop(1, this.options.shadowColor); + return grd; + }; + + Donut.prototype.setOptions = function (options) { + var h, start, stop, w; + if (options == null) { + options = null; + } + Donut.__super__.setOptions.call(this, options); + w = this.canvas.width / 2; + h = this.canvas.height / 2; + start = this.radius - this.lineWidth / 2; + stop = this.radius + this.lineWidth / 2; + this.options._orgStrokeColor = this.options.strokeColor; + this.options.strokeColor = this.strokeGradient(w, h, start, stop); + return this; + }; + + return Donut; + + })(BaseDonut); + + window.AnimationUpdater = { + elements: [], + animId: null, + addAll: function (list) { + var elem, j, len, results; + results = []; + for (j = 0, len = list.length; j < len; j++) { + elem = list[j]; + results.push(AnimationUpdater.elements.push(elem)); + } + return results; + }, + add: function (object) { + if (indexOf.call(AnimationUpdater.elements, object) < 0) { + return AnimationUpdater.elements.push(object); + } + }, + run: function (force) { + var elem, finished, isCallback, j, k, l, len, ref, toRemove; + if (force == null) { + force = false; + } + isCallback = isFinite(parseFloat(force)); + if (isCallback || force === true) { + finished = true; + toRemove = []; + ref = AnimationUpdater.elements; + for (k = j = 0, len = ref.length; j < len; k = ++j) { + elem = ref[k]; + if (elem.update(force === true)) { + finished = false; + } else { + toRemove.push(k); + } + } + for (l = toRemove.length - 1; l >= 0; l += -1) { + k = toRemove[l]; + AnimationUpdater.elements.splice(k, 1); + } + return AnimationUpdater.animId = finished ? null : requestAnimationFrame(AnimationUpdater.run); + } else if (force === false) { + if (AnimationUpdater.animId === !null) { + cancelAnimationFrame(AnimationUpdater.animId); + } + return AnimationUpdater.animId = requestAnimationFrame(AnimationUpdater.run); + } + } + }; + + if (typeof window.define === 'function' && (window.define.amd != null)) { + define(function () { + return { + Gauge: Gauge, + Donut: Donut, + BaseDonut: BaseDonut, + TextRenderer: TextRenderer + }; + }); + } else if (typeof module !== 'undefined' && (module.exports != null)) { + module.exports = { + Gauge: Gauge, + Donut: Donut, + BaseDonut: BaseDonut, + TextRenderer: TextRenderer + }; + } else { + window.Gauge = Gauge; + window.Donut = Donut; + window.BaseDonut = BaseDonut; + window.TextRenderer = TextRenderer; + } + +}).call(this); + +//# sourceMappingURL=gauge.js.map diff --git a/web/display/minimal/gauge.min.js b/web/display/minimal/gauge.min.js deleted file mode 100644 index 1b77c1c27b..0000000000 --- a/web/display/minimal/gauge.min.js +++ /dev/null @@ -1 +0,0 @@ -(function(){function t(t,i){for(var e in i)m.call(i,e)&&(t[e]=i[e]);function s(){this.constructor=t}return s.prototype=i.prototype,t.prototype=new s,t.__super__=i.prototype,t}var i,e,s,n,o,p,a,h,r,l,g,c,u,d=[].slice,m={}.hasOwnProperty,x=[].indexOf||function(t){for(var i=0,e=this.length;ithis.gp.length)for(e=n=0,r=t.length-this.gp.length;0<=r?nthis.maxValue?this.options.limitMax?l=this.maxValue:this.maxValue=l+1:l=this.minValue)&&(!this.options.limitMax||d<=this.maxValue)&&(r=(n=d.font||t.font).match(l)[0],c=n.slice(r.length),o=parseFloat(r)*this.displayScale,this.ctx.font=o+c,u=this.getAngle(d.label)-3*Math.PI/2,this.ctx.rotate(u),this.ctx.fillText(g(d.label,t.fractionDigits),0,-s-this.lineWidth/2),this.ctx.rotate(-u)):(!this.options.limitMin||d>=this.minValue)&&(!this.options.limitMax||d<=this.maxValue)&&(u=this.getAngle(d)-3*Math.PI/2,this.ctx.rotate(u),this.ctx.fillText(g(d,t.fractionDigits),0,-s-this.lineWidth/2),this.ctx.rotate(-u));return this.ctx.restore()},M.prototype.renderTicks=function(t,i,e,s){var n,o,a,h,r,l,p,c,u,d,g,m,x,f,v,y,V,w,S,M;if(t!=={}){for(l=t.divisions||0,w=t.subDivisions||0,a=t.divColor||"#fff",f=t.subColor||"#fff",h=t.divLength||.7,y=t.subLength||.2,u=parseFloat(this.maxValue)-parseFloat(this.minValue),d=parseFloat(u)/parseFloat(t.divisions),v=parseFloat(d)/parseFloat(t.subDivisions),n=parseFloat(this.minValue),o=0+v,r=(c=u/400)*(t.divWidth||1),V=c*(t.subWidth||1),m=[],S=p=0,g=l+1;pthis.maxValue&&(h=this.maxValue),d=this.radius*this.options.radiusScale,m.height&&(this.ctx.lineWidth=this.lineWidth*m.height,u=this.lineWidth/2*(m.offset||1-m.height),d=this.radius*this.options.radiusScale+u),this.ctx.strokeStyle=m.strokeStyle,this.ctx.beginPath(),this.ctx.arc(0,0,d,this.getAngle(r),this.getAngle(h),!1),this.ctx.stroke();else void 0!==this.options.customFillStyle?i=this.options.customFillStyle(this):null!==this.percentColors?i=this.getColorForValue(this.displayedValue,this.options.generateGradient):void 0!==this.options.colorStop?((i=0===this.options.gradientType?this.ctx.createRadialGradient(g,e,9,g,e,70):this.ctx.createLinearGradient(0,0,g,0)).addColorStop(0,this.options.colorStart),i.addColorStop(1,this.options.colorStop)):i=this.options.colorStart,this.ctx.strokeStyle=i,this.ctx.beginPath(),this.ctx.arc(g,e,l,(1+this.options.angle)*Math.PI,t,!1),this.ctx.lineWidth=this.lineWidth,this.ctx.stroke(),this.ctx.strokeStyle=this.options.strokeColor,this.ctx.beginPath(),this.ctx.arc(g,e,l,t,(2-this.options.angle)*Math.PI,!1),this.ctx.stroke(),this.ctx.save(),this.ctx.translate(g,e);for(this.options.renderTicks&&this.renderTicks(this.options.renderTicks,g,e,l),this.ctx.restore(),this.ctx.translate(g,e),n=0,a=(c=this.gp).length;nthis.maxValue?this.options.limitMax?this.value=this.maxValue:this.maxValue=this.value:this.value diff --git a/web/display/minimal/index.php b/web/display/minimal/index.php index 303638bc45..0fdd3b47c0 100644 --- a/web/display/minimal/index.php +++ b/web/display/minimal/index.php @@ -1,5 +1,6 @@ + @@ -19,13 +20,13 @@ + - - + + +
-
- -
0
- -
0
-
- - - + + +
+ + +
LP1
+
0
+
0
+
+ + + +
-
+
+ + +
LP2
+
0
+
0
+
+ + + +
+
+ +
+ + +
0
+
0
+
+ + + +
+
+
0) { ?>
@@ -100,18 +137,18 @@
@@ -123,40 +160,37 @@ function startTime() { var h = today.getHours(); var m = today.getMinutes(); m = checkTime(m); - document.getElementById('theclock').innerHTML = - h + ":" + m; + document.getElementById('theclock').innerHTML = h + ":" + m; var t = setTimeout(startTime, 5000); } function checkTime(i) { if (i < 10) { i = "0" + i - }; // add zero in front of numbers < 10 + }; // add zero in front of numbers < 10 return i; } startTime(); var displaylp1max = ; - // var displaylp2max = ; - var displaypincode = ; - var displaypinaktiv = ; + var displaylp2max = ; var rfidakt = ; - var isssakt = ; + var lastmanagementold = ; - + + diff --git a/web/display/minimal/minimalgauge.js b/web/display/minimal/minimalgauge.js index 28847f5434..bb7cef8b03 100644 --- a/web/display/minimal/minimalgauge.js +++ b/web/display/minimal/minimalgauge.js @@ -2,33 +2,55 @@ * LP1 gauge */ var opts = { - angle: 0, // The span of the gauge arc - lineWidth: 0.24, // The line thickness - radiusScale: 0.67, // Relative radius + lineWidth: 0.30, // The line thickness + angle: 0, // The angle where gauge starts + radiusScale: 1, // Relative radius pointer: { length: 0.6, // // Relative to gauge radius strokeWidth: 0, // The thickness color: '#000000' // Fill color }, - limitMax: false, // If false, max value increases automatically if value > maxValue + limitMax: true, // If false, max value increases automatically if value > maxValue limitMin: true, // If true, the min value of the gauge will be fixed colorStart: '#6FADCF', // Colors colorStop: '#8FC0DA', // just experiment with them strokeColor: 'grey', // to see which ones work best for you generateGradient: true, - percentColors: [[0.0, "#73c0FF" ], [1.0, "#0000FF"]], - staticLabels: { + percentColors: [[0.0, "#73c0FF"], [1.0, "#0000FF"]], +}; + +// Duo will only use a quarter circle +if (lastmanagementold != '1') { + opts['range'] = 1; // The span of the gauge arc +} else { + opts['range'] = 0.5; // The span of the gauge arc +} + +// switch range depending on magnitute of max value +if (displaylp1max > 999) { + var gaugeLp1MaxValue = displaylp1max / 1000; + opts['staticLabels'] = { font: "13px sans-serif", // Specifies font - labels: [0, displaylp1max], // Print labels at these values + labels: [0, gaugeLp1MaxValue], // Print labels at these values + unit: "kW", // Optional: Label unit + color: "white", // Optional: Label text color + fractionDigits: 2 // Optional: Numerical precision. 0=round off. + } +} else { + var gaugeLp1MaxValue = displaylp1max; + opts['staticLabels'] = { + font: "13px sans-serif", // Specifies font + labels: [0, gaugeLp1MaxValue], // Print labels at these values + unit: "W", // Optional: Label unit color: "white", // Optional: Label text color fractionDigits: 0 // Optional: Numerical precision. 0=round off. - }, -}; + } +} var targetlp1 = document.getElementById('lp1'); // your canvas element var gaugelp1 = new Gauge(targetlp1).setOptions(opts); // create sexy gauge! -gaugelp1.maxValue = displaylp1max; // set max gauge value +gaugelp1.maxValue = gaugeLp1MaxValue; // set max gauge value gaugelp1.setMinValue(0); // Prefer setter over gauge.minValue = 0 gaugelp1.animationSpeed = 5; // set animation speed (32 is default value) gaugelp1.set(0); // set actual value @@ -37,29 +59,38 @@ gaugelp1.set(0); // set actual value * LP1-SoC gauge */ var opts = { - angle: 0, // The span of the gauge arc - lineWidth: 0.08, // The line thickness - radiusScale: 0.5, // Relative radius + lineWidth: 0.10, // The line thickness + radiusScale: 0.66, // Relative radius + angle: 0, // The angle where gauge starts pointer: { length: 0.6, // // Relative to gauge radius strokeWidth: 0, // The thickness color: '#000000' // Fill color }, - limitMax: false, // If false, max value increases automatically if value > maxValue - limitMin: false, // If true, the min value of the gauge will be fixed + limitMax: true, // If false, max value increases automatically if value > maxValue + limitMin: true, // If true, the min value of the gauge will be fixed colorStart: '#6FADCF', // Colors colorStop: '#8FC0DA', // just experiment with them strokeColor: 'grey', // to see which ones work best for you generateGradient: true, - percentColors: [[0.0, "#73c0FF" ], [1.0, "#0000FF"]], staticLabels: { font: "13px sans-serif", // Specifies font labels: [0, 100], // Print labels at these values + unit: "%", // Optional: Label unit + insideLabel: true, // Optional: Labels are printed insde of the gauge color: "white", // Optional: Label text color fractionDigits: 0 // Optional: Numerical precision. 0=round off. - }, + } }; +// Duo will only use a quarter circle +if (lastmanagementold != '1') { + opts['range'] = 1; // The span of the gauge arc + opts['percentColors'] = [[0.0, "#73c0FF"], [1.0, "#0000FF"]]; +} else { + opts['range'] = 0.5; // The span of the gauge arc + opts['percentColors'] = [[0.0, "#B22222"], [0.5, "#DAA520"], [1.0, "#33A02C"]]; +} var targetlp1s = document.getElementById('lp1s'); // your canvas element var gaugelp1s = new Gauge(targetlp1s).setOptions(opts); // create sexy gauge! @@ -68,72 +99,95 @@ gaugelp1s.setMinValue(0); // Prefer setter over gauge.minValue = 0 gaugelp1s.animationSpeed = 5; // set animation speed (32 is default value) gaugelp1s.set(70); // set actual value -/*********** - * LP2 gauge - */ -// var opts = { -// angle: 0, // The span of the gauge arc -// lineWidth: 0.24, // The line thickness -// radiusScale: 0.67, // Relative radius -// pointer: { -// length: 0.6, // // Relative to gauge radius -// strokeWidth: 0, // The thickness -// color: '#000000' // Fill color -// }, -// limitMax: false, // If false, max value increases automatically if value > maxValue -// limitMin: true, // If true, the min value of the gauge will be fixed -// colorStart: '#6FADCF', // Colors -// colorStop: '#8FC0DA', // just experiment with them -// strokeColor: 'grey', // to see which ones work best for you -// generateGradient: true, -// percentColors: [[0.0, "#73c0FF" ], [1.0, "#0000FF"]], -// staticLabels: { -// font: "13px sans-serif", // Specifies font -// labels: [0, displaylp2max], // Print labels at these values -// color: "white", // Optional: Label text color -// fractionDigits: 0 // Optional: Numerical precision. 0=round off. -// }, -// }; -// var targetlp2 = document.getElementById('lp2'); // your canvas element -// var gaugelp2 = new Gauge(targetlp2).setOptions(opts); // create sexy gauge! +if (lastmanagementold == '1') { + /*********** + * LP2 gauge + */ + var opts = { + angle: 0, // The angle where gauge starts + range: 0.5, // The span of the gauge arc + mirror: true, // start gauge from the right + lineWidth: 0.30, // The line thickness + radiusScale: 1, // Relative radius + pointer: { + length: 0.6, // // Relative to gauge radius + strokeWidth: 0, // The thickness + color: '#000000' // Fill color + }, + limitMax: true, // If false, max value increases automatically if value > maxValue + limitMin: true, // If true, the min value of the gauge will be fixed + colorStart: '#6FADCF', // Colors + colorStop: '#8FC0DA', // just experiment with them + strokeColor: 'grey', // to see which ones work best for you + generateGradient: true, + percentColors: [[0.0, "#73c0FF"], [1.0, "#0000FF"]], + }; -// gaugelp2.maxValue = displaylp2max; // set max gauge value -// gaugelp2.setMinValue(0); // Prefer setter over gauge.minValue = 0 -// gaugelp2.animationSpeed = 5; // set animation speed (32 is default value) -// gaugelp2.set(0); // set actual value + // switch range depending on magnitute of max value + if (displaylp2max > 999) { + var gaugeLp2MaxValue = displaylp2max / 1000; + opts['staticLabels'] = { + font: "13px sans-serif", // Specifies font + labels: [0, gaugeLp2MaxValue], // Print labels at these values + unit: "kW", // Optional: Label unit + color: "white", // Optional: Label text color + fractionDigits: 2 // Optional: Numerical precision. 0=round off. + } + } else { + var gaugeLp2MaxValue = displaylp2max; + opts['staticLabels'] = { + font: "13px sans-serif", // Specifies font + labels: [0, gaugeLp2MaxValue], // Print labels at these values + unit: "W", // Optional: Label unit + color: "white", // Optional: Label text color + fractionDigits: 0 // Optional: Numerical precision. 0=round off. + } + } -/*********** - * LP2-SoC gauge - */ -// var opts = { -// angle: 0, // The span of the gauge arc -// lineWidth: 0.08, // The line thickness -// radiusScale: 0.5, // Relative radius -// pointer: { -// length: 0.6, // // Relative to gauge radius -// strokeWidth: 0, // The thickness -// color: '#000000' // Fill color -// }, -// limitMax: false, // If false, max value increases automatically if value > maxValue -// limitMin: false, // If true, the min value of the gauge will be fixed -// colorStart: '#6FADCF', // Colors -// colorStop: '#8FC0DA', // just experiment with them -// strokeColor: 'grey', // to see which ones work best for you -// generateGradient: true, -// percentColors: [[0.0, "#73c0FF" ], [1.0, "#0000FF"]], -// staticLabels: { -// font: "13px sans-serif", // Specifies font -// labels: [0, 100], // Print labels at these values -// color: "white", // Optional: Label text color -// fractionDigits: 0 // Optional: Numerical precision. 0=round off. -// }, -// }; -// var targetlp2s = document.getElementById('lp2s'); // your canvas element -// var gaugelp2s = new Gauge(targetlp2s).setOptions(opts); // create sexy gauge! + var targetlp2 = document.getElementById('lp2'); // your canvas element + var gaugelp2 = new Gauge(targetlp2).setOptions(opts); // create sexy gauge! + + gaugelp2.maxValue = gaugeLp2MaxValue; // set max gauge value + gaugelp2.setMinValue(0); // Prefer setter over gauge.minValue = 0 + gaugelp2.animationSpeed = 5; // set animation speed (32 is default value) + gaugelp2.set(0); // set actual value -// gaugelp2s.maxValue = 100; // set max gauge value -// gaugelp2s.setMinValue(0); // Prefer setter over gauge.minValue = 0 -// gaugelp2s.animationSpeed = 5; // set animation speed (32 is default value) -// gaugelp2s.set(70); // set actual value + /*********** + * LP2-SoC gauge + */ + var opts = { + angle: 0, // The angle where gauge starts + range: 0.5, // The span of the gauge arc + mirror: true, // start gauge from the right + lineWidth: 0.1, // The line thickness + radiusScale: 0.66, // Relative radius + pointer: { + length: 0.6, // // Relative to gauge radius + strokeWidth: 0, // The thickness + color: '#000000' // Fill color + }, + limitMax: true, // If false, max value increases automatically if value > maxValue + limitMin: true, // If true, the min value of the gauge will be fixed + colorStart: '#6FADCF', // Colors + colorStop: '#8FC0DA', // just experiment with them + strokeColor: 'grey', // to see which ones work best for you + generateGradient: true, + percentColors: [[0.0, "#B22222"], [0.5, "#DAA520"], [1.0, "#33A02C"]], + staticLabels: { + font: "13px sans-serif", // Specifies font + labels: [0, 100], // Print labels at these values + unit: "%", // Optional: Label unit + insideLabel: true, // Optional: Labels are printed insde of the gauge + color: "white", // Optional: Label text color + fractionDigits: 0 // Optional: Numerical precision. 0=round off. + } + }; + var targetlp2s = document.getElementById('lp2s'); // your canvas element + var gaugelp2s = new Gauge(targetlp2s).setOptions(opts); // create sexy gauge! + gaugelp2s.maxValue = 100; // set max gauge value + gaugelp2s.setMinValue(0); // Prefer setter over gauge.minValue = 0 + gaugelp2s.animationSpeed = 5; // set animation speed (32 is default value) + gaugelp2s.set(70); // set actual value +} diff --git a/web/display/minimal/processAllMqttMsg.js b/web/display/minimal/processAllMqttMsg.js index aa972703c4..f51265032f 100644 --- a/web/display/minimal/processAllMqttMsg.js +++ b/web/display/minimal/processAllMqttMsg.js @@ -12,10 +12,10 @@ function reloadDisplay() { */ // wait some seconds to allow other instances receive this message console.log("reloading display..."); - setTimeout(function(){ - publish( "0", "openWB/set/system/reloadDisplay" ); + setTimeout(function () { + publish("0", "openWB/set/system/reloadDisplay"); // wait again to give the broker some time and avoid a reload loop - setTimeout(function(){ + setTimeout(function () { location.reload(); }, 2000); }, 2000); @@ -24,82 +24,72 @@ function reloadDisplay() { function handlevar(mqttmsg, mqttpayload) { // console.log("Topic: "+mqttmsg+" Message: "+mqttpayload); // receives all messages and calls respective function to process them - if ( mqttmsg.match( /^openwb\/system\//i) ) { processSystemMessages(mqttmsg, mqttpayload); } - else if ( mqttmsg.match( /^openwb\/lp\//i) ) { processChargepointMessages(mqttmsg, mqttpayload); } + if (mqttmsg.match(/^openwb\/system\//i)) { processSystemMessages(mqttmsg, mqttpayload); } + else if (mqttmsg.match(/^openwb\/lp\//i)) { processChargepointMessages(mqttmsg, mqttpayload); } } // end handlevar function processSystemMessages(mqttmsg, mqttpayload) { // processes mqttmsg for topic openWB/system // called by handlevar - if ( mqttmsg == 'openWB/system/reloadDisplay' ) { - if( mqttpayload == '1' ){ + if (mqttmsg == 'openWB/system/reloadDisplay') { + if (mqttpayload == '1') { reloadDisplay(); } } - // else if ( mqttmsg == 'openWB/system/parentWB' ) { - // console.log("received parent openwb url: " + mqttpayload); - // } - // else if ( mqttmsg == 'openWB/system/parentCPlp1' ) { - // console.log("received index for lp1 on parent openwb: " + mqttpayload); - // } - // else if ( mqttmsg == 'openWB/system/parentCPlp2' ) { - // console.log("received index for lp2 on parent openwb: " + mqttpayload); - // } } function processChargepointMessages(mqttmsg, mqttpayload) { // processes mqttmsg for topic openWB/system // called by handlevar - if ( mqttmsg == 'openWB/lp/2/boolChargePointConfigured' ) { - console.log("received configured for local lp2: " + mqttpayload) - } - else if ( mqttmsg == 'openWB/lp/1/%Soc' ) { - var lp1s = mqttpayload; - gaugelp1s.set(lp1s); - $("#lp1st").html(mqttpayload + "%"); - } - else if ( mqttmsg == 'openWB/lp/1/W' ) { - var lp1w = mqttpayload; - gaugelp1.set(lp1w); - if ( lp1w > 999 ) { - lp1w= lp1w / 1000; - $("#lp1t").html(lp1w.toFixed(2) + " kW"); - } else { - $("#lp1t").html(mqttpayload + " W"); - } - } - else if (mqttmsg == 'openWB/lp/1/boolSocConfigured' ) { - if ( mqttpayload == 1 ) { - $("#lp1s").removeClass("hide"); - $("#lp1st").removeClass("hide"); - } else { - $("#lp1s").addClass("hide"); - $("#lp1st").addClass("hide"); - } - } - else if ( mqttmsg == 'openWB/lp/1/boolPlugStat' ) { - if ( mqttpayload == 1 ) { - $("#lp1plugstat").removeClass('hide'); - } else { - $("#lp1plugstat").addClass('hide'); - } - } - else if ( mqttmsg == 'openWB/lp/1/boolChargeStat' ) { - if ( mqttpayload == 1 ) { - $("#lp1plugstat").removeClass('text-warning').addClass('text-success'); - } else { - $("#lp1plugstat").removeClass('text-success').addClass('text-warning'); - } - } - else if ( mqttmsg == 'openWB/lp/1/ChargePointEnabled' ) { - var lp1enabled = mqttpayload; - if(lp1enabled == 1){ - $("#lp1enabled").removeClass("hide"); - $("#lp1disabled").addClass("hide"); - } else { - $("#lp1enabled").addClass("hide"); - $("#lp1disabled").removeClass("hide"); + + // check if topic contains subgroup like /lp/1/ + // last part of topic after / + var topic = mqttmsg.substring(mqttmsg.lastIndexOf('/') + 1); + var index = mqttmsg.match(/(\w+)\/(\d\d?)\//)[2]; + if (index != null) { + if (topic == '%Soc') { + eval("gaugelp" + index + "s.set(mqttpayload)"); + $('#lp' + index + 'st').html(mqttpayload + "%"); + } else if (topic == 'W') { + var lpw = mqttpayload / 1000; + if (eval("displaylp" + index + "max") > 999) { + eval("gaugelp" + index + ".set(lpw)"); + } else { + eval("gaugelp" + index + ".set(mqttpayload)"); + } + if (mqttpayload > 999) { + $('#lp' + index + 't').html(lpw.toFixed(2) + " kW"); + } else { + $('#lp' + index + 't').html(mqttpayload + " W"); + } + } else if (topic == 'boolSocConfigured') { + if (mqttpayload == 1) { + $('#lp' + index + 's').removeClass("hide"); + $('#lp' + index + 'st').removeClass("hide"); + } else { + $('#lp' + index + 's').addClass("hide"); + $('#lp' + index + 'st').addClass("hide"); + } + } else if (topic == 'boolPlugStat') { + if (mqttpayload == 1) { + $('#lp' + index + 'plugstat').removeClass('hide'); + } else { + $('#lp' + index + 'plugstat').addClass('hide'); + } + } else if (topic == 'boolChargeStat') { + if (mqttpayload == 1) { + $('#lp' + index + 'plugstat').removeClass('text-warning').addClass('text-success'); + } else { + $('#lp' + index + 'plugstat').removeClass('text-success').addClass('text-warning'); + } + } else if (topic == 'ChargePointEnabled') { + if (mqttpayload == 1) { + $('#lp' + index + 'enabled').removeClass("hide"); + $('#lp' + index + 'disabled').addClass("hide"); + } else { + $('#lp' + index + 'enabled').addClass("hide"); + $('#lp' + index + 'disabled').removeClass("hide"); + } } } - } diff --git a/web/display/minimal/setupMqttServices.js b/web/display/minimal/setupMqttServices.js index 171ce6f6fa..e4d674f87a 100644 --- a/web/display/minimal/setupMqttServices.js +++ b/web/display/minimal/setupMqttServices.js @@ -17,15 +17,12 @@ var topicsToSubscribe = [ ["openWB/lp/1/boolPlugStat", 1], ["openWB/lp/1/boolChargeStat", 1], ["openWB/lp/1/ChargePointEnabled", 1], - // ["openWB/lp/2/W", 1], - // ["openWB/lp/2/%Soc", 1], - // ["openWB/lp/2/boolSocConfigured"], - // ["openWB/lp/2/boolPlugStat", 1], - // ["openWB/lp/2/ChargePointEnabled", 1], - // ["openWB/system/parentWB", 1], - // ["openWB/system/parentCPlp1", 1], - // ["openWB/system/parentCPlp2", 1], - // ["openWB/lp/2/boolChargePointConfigured", 1] + ["openWB/lp/2/W", 1], + ["openWB/lp/2/%Soc", 1], + ["openWB/lp/2/boolSocConfigured"], + ["openWB/lp/2/boolPlugStat", 1], + ["openWB/lp/2/ChargePointEnabled", 1], + ["openWB/lp/2/boolChargeStat", 1], ]; // holds number of topics flagged 1 initially diff --git a/web/settings/misc.php b/web/settings/misc.php index b8ec71dcae..d46e192337 100644 --- a/web/settings/misc.php +++ b/web/settings/misc.php @@ -1274,16 +1274,18 @@ function visibility_ledsakt() {
-
+
">
- + + + + + + +
@@ -1327,59 +1329,19 @@ function visibility_ledsakt() {
-
- -
- -
-
-
- -
- -
-
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- + +
class="hide"> +
+ +
+ +
-
+ +
-
@@ -1432,15 +1394,33 @@ function visibility_displaytheme() { switch ($('#displaytheme').val()) { case '0': // Cards showSection('#displaygauge'); - showSection('#displaycards'); + for (let cp = 1; cp < 9; cp++) { + showSection('#displaylp' + cp); + } + break; + case '2': // Minimal + hideSection('#displaygauge'); + for (let cp = 1; cp < 3; cp++) { + showSection('#displaylp' + cp); + } + for (let cp = 3; cp < 9; cp++) { + hideSection('#displaylp' + cp); + } break; case '3': // Gauges showSection('#displaygauge'); - hideSection('#displaycards'); + for (let cp = 1; cp < 3; cp++) { + showSection('#displaylp' + cp); + } + for (let cp = 3; cp < 9; cp++) { + hideSection('#displaylp' + cp); + } break; default: - hideSection('#displaygauge'); - hideSection('#displaycards'); + hideSection('#displaygauge'); + for (let cp = 1; cp < 9; cp++) { + hideSection('#displaylp' + cp); + } } } diff --git a/web/settings/settings.php b/web/settings/settings.php index 28814003f8..069987c59c 100644 --- a/web/settings/settings.php +++ b/web/settings/settings.php @@ -81,7 +81,7 @@ Wird hier Ja gewählt ist diese openWB nur ein Ladepunkt und übernimmt keine eigene Regelung. Hier ist Ja zu wählen wenn, bereits eine openWB vorhanden ist und diese nur ein weiterer Ladepunkt der vorhandenen openWB sein soll.
Es ist sicherzustellen, dass auf dieser openWB die Modulkonfiguration des ersten Ladepunktes - korrekt ist und alle weiteren Ladepunkte deaktiviert sind. Handels es sich hier um eine + korrekt ist und alle weiteren Ladepunkte deaktiviert sind. Handelt es sich hier um eine DUO, so ist auch der zweite Ladepunkt zu aktivieren.
Alle weiteren in dieser openWB getätigten Einstellungen werden NICHT beachtet. An der Haupt openWB wird als Ladepunkt "externe openWB" gewählt und die IP Adresse eingetragen. @@ -95,6 +95,9 @@ + + Für das Theme "Normal" kann der Maximalwert der Skala im Bereich "Display" unter Einstellungen->Verschiedenes angepasst werden. +