Sungrow Fixes

loadvars.sh

@@ -1092,7 +1092,7 @@ loadvars(){
 	fi
 	echo $hausverbrauch > /var/www/html/openWB/ramdisk/hausverbrauch
 	usesimbezug=0
-	if [[ $wattbezugmodul == "bezug_solarwatt" ]]|| [[ $wattbezugmodul == "bezug_rct" ]]|| [[ $wattbezugmodul == "bezug_varta" ]] || [[ $wattbezugmodul == "bezug_kostalplenticoreem300haus" ]] || [[ $wattbezugmodul == "bezug_solarlog" ]] ; then
+	if [[ $wattbezugmodul == "bezug_solarwatt" ]]|| [[ $wattbezugmodul == "bezug_rct" ]]|| [[ $wattbezugmodul == "bezug_kostalplenticoreem300haus" ]] || [[ $wattbezugmodul == "bezug_solarlog" ]] ; then
 		usesimbezug=1
 	fi
 	if ((usesimbezug == 1)); then
@@ -1182,7 +1182,7 @@ loadvars(){
 		echo "$pvallwh" > /var/www/html/openWB/ramdisk/pvallwh
 	fi
 
-	if [[ $speichermodul == "speicher_tesvoltsma" ]] || [[ $speichermodul == "speicher_solarwatt" ]] || [[ $speichermodul == "speicher_rct" ]]|| [[ $speichermodul == "speicher_kostalplenticore" ]] || [[ $speichermodul == "speicher_varta" ]] ; then
+	if [[ $speichermodul == "speicher_tesvoltsma" ]] || [[ $speichermodul == "speicher_solarwatt" ]] || [[ $speichermodul == "speicher_rct" ]]|| [[ $speichermodul == "speicher_kostalplenticore" ]] ; then
 		ra='^-?[0-9]+$'
 		watt2=$(</var/www/html/openWB/ramdisk/speicherleistung)
 		if [[ -e /var/www/html/openWB/ramdisk/speicherwatt0pos ]]; then

modules/bezug_ksem/main.sh

@@ -10,7 +10,7 @@ else
 	MYLOGFILE="${RAMDISKDIR}/evu.log"
 fi
 
-bash "$OPENWBBASEDIR/packages/legacy_run.sh" "bezug_ksem.readksem" "${ksemip}" >>"${MYLOGFILE}" 2>&1
+bash "$OPENWBBASEDIR/packages/legacy_run.sh" "modules.devices.kostal_sem.device" "${ksemip}" >>"${MYLOGFILE}" 2>&1
 ret=$?
 
 openwbDebugLog ${DMOD} 2 "EVU RET: ${ret}"

modules/bezug_ksem/readksem.py

@@ -1,103 +0,0 @@
-#!/usr/bin/python
-from typing import List
-
-from pymodbus.client.sync import ModbusTcpClient
-from pymodbus.constants import Endian
-from pymodbus.payload import BinaryPayloadDecoder
-
-from helpermodules.cli import run_using_positional_cli_args
-
-
-class KSEM:
-    def __init__(self, ip):
-        self.client = ModbusTcpClient(ip, port="502")
-
-    def ReadUInt32(self, addr):
-        data = self.client.read_holding_registers(addr, 2, unit=71)
-        UInt32register = BinaryPayloadDecoder.fromRegisters(data.registers, byteorder=Endian.Big, wordorder=Endian.Big)
-        result = UInt32register.decode_32bit_uint()
-        return(result)
-
-    def ReadInt32(self, addr):
-        data = self.client.read_holding_registers(addr, 2, unit=71)
-        Int32register = BinaryPayloadDecoder.fromRegisters(data.registers, byteorder=Endian.Big, wordorder=Endian.Big)
-        result = Int32register.decode_32bit_int()
-        return(result)
-
-    def ReadUInt64(self, addr):
-        data = self.client.read_holding_registers(addr, 4, unit=71)
-        UInt64register = BinaryPayloadDecoder.fromRegisters(data.registers, byteorder=Endian.Big, wordorder=Endian.Big)
-        result = UInt64register.decode_64bit_uint()
-        return(result)
-
-    def write(self, filename, value):
-        with open(filename, 'w') as file:
-            file.write(str(value))
-
-    def run(self):
-        with self.client:
-            voltage1 = self.ReadUInt32(62) * 0.001
-            self.write('/var/www/html/openWB/ramdisk/evuv1', voltage1)
-
-            voltage2 = self.ReadUInt32(102) * 0.001
-            self.write('/var/www/html/openWB/ramdisk/evuv2', voltage2)
-
-            voltage3 = self.ReadUInt32(142) * 0.001
-            self.write('/var/www/html/openWB/ramdisk/evuv3', voltage3)
-
-            bezugkwh = self.ReadUInt64(512) * 0.1
-            self.write('/var/www/html/openWB/ramdisk/bezugkwh', bezugkwh)
-
-            bezugw1p = self.ReadUInt32(40) * 0.1
-            bezugw1m = self.ReadUInt32(42) * 0.1
-            bezugw1 = bezugw1p if bezugw1p >= bezugw1m else -bezugw1m
-            self.write('/var/www/html/openWB/ramdisk/bezugw1', bezugw1)
-
-            bezugw2p = self.ReadUInt32(80) * 0.1
-            bezugw2m = self.ReadUInt32(82) * 0.1
-            bezugw2 = bezugw2p if bezugw2p >= bezugw2m else -bezugw2m
-            self.write('/var/www/html/openWB/ramdisk/bezugw2', bezugw2)
-
-            bezugw3p = self.ReadUInt32(120) * 0.1
-            bezugw3m = self.ReadUInt32(122) * 0.1
-            bezugw3 = bezugw3p if bezugw3p >= bezugw3m else -bezugw3m
-            self.write('/var/www/html/openWB/ramdisk/bezugw3', bezugw3)
-
-            bezuga1 = self.ReadUInt32(60) * 0.001
-            self.write('/var/www/html/openWB/ramdisk/bezuga1', bezuga1)
-
-            bezuga2 = self.ReadUInt32(100) * 0.001
-            self.write('/var/www/html/openWB/ramdisk/bezuga2', bezuga2)
-
-            bezuga3 = self.ReadUInt32(140) * 0.001
-            self.write('/var/www/html/openWB/ramdisk/bezuga3', bezuga3)
-
-            wattbezugp = self.ReadUInt32(0) * 0.1
-            wattbezugm = self.ReadUInt32(2) * 0.1
-            wattbezug = wattbezugp if wattbezugp >= wattbezugm else -wattbezugm
-            finalwattbezug = int(wattbezug)
-            self.write('/var/www/html/openWB/ramdisk/wattbezug', finalwattbezug)
-
-            einspeisungkwh = self.ReadUInt64(516) * 0.1
-            self.write('/var/www/html/openWB/ramdisk/einspeisungkwh', einspeisungkwh)
-
-            evuhz = self.ReadUInt32(26) * 0.001
-            self.write('/var/www/html/openWB/ramdisk/evuhz', evuhz)
-
-            evupf1 = self.ReadInt32(64) * 0.001
-            self.write('/var/www/html/openWB/ramdisk/evupf1', evupf1)
-
-            evupf2 = self.ReadInt32(104) * 0.001
-            self.write('/var/www/html/openWB/ramdisk/evupf2', evupf2)
-
-            evupf3 = self.ReadInt32(144) * 0.001
-            self.write('/var/www/html/openWB/ramdisk/evupf3', evupf3)
-
-
-def update(ksemip: str):
-    runner = KSEM(ksemip)
-    runner.run()
-
-
-def main(argv: List[str]):
-    run_using_positional_cli_args(update, argv)

modules/bezug_smartme/main.sh

@@ -14,7 +14,7 @@ openwbDebugLog ${DMOD} 2 "Bezug Smartme URL: ${bezug_smartme_url}"
 openwbDebugLog ${DMOD} 2 "Bezug Smartme User : ${bezug_smartme_user}"
 openwbDebugLog ${DMOD} 2 "Bezug Smartme Passwort: ${bezug_smartme_pass}"
 
-bash "$OPENWBBASEDIR/packages/legacy_run.sh" "bezug_smartme.smartme" "${bezug_smartme_url}" "${bezug_smartme_user}" "${bezug_smartme_pass}" >>"$MYLOGFILE" 2>&1
+bash "$OPENWBBASEDIR/packages/legacy_run.sh" "modules.devices.smart_me.device" "counter" "${bezug_smartme_user}" "${bezug_smartme_pass}" "${bezug_smartme_url}" >>"$MYLOGFILE" 2>&1
 ret=$?
 
 openwbDebugLog ${DMOD} 2 "RET: ${ret}"

modules/bezug_smartme/smartme.py

@@ -1,110 +0,0 @@
-#!/usr/bin/env python3
-import logging
-import re
-import requests
-import traceback
-from typing import Dict, List
-
-from helpermodules.cli import run_using_positional_cli_args
-
-log = logging.getLogger("SmartMe EVU")
-
-
-def get_power_value(key, response: Dict, file=None):
-    try:
-        value = int(response[key] * 1000)
-        if file is None:
-            return value
-        else:
-            log.debug(file+': ' + str(value))
-            f = open('/var/www/html/openWB/ramdisk/'+file, 'w')
-            f.write(str(value))
-            f.close()
-    except:
-        traceback.print_exc()
-        exit(1)
-
-
-def get_im_ex_value(key, response: Dict, file):
-    try:
-        value = round(response[key] * 1000, 3)
-        log.debug(file+': ' + str(value))
-        f = open('/var/www/html/openWB/ramdisk/'+file, 'w')
-        f.write(str(value))
-        f.close()
-    except:
-        traceback.print_exc()
-        exit(1)
-
-
-def get_value(key, response: Dict, file=None):
-    try:
-        value = response[key]
-        if file is None:
-            return value
-        else:
-            log.debug(file+': ' + str(value))
-            f = open('/var/www/html/openWB/ramdisk/'+file, 'w')
-            f.write(str(value))
-            f.close()
-    except:
-        traceback.print_exc()
-        exit(1)
-
-
-def update(bezug_smartme_url: str, bezug_smartme_user: str, bezug_smartme_pass: str):
-    log.debug('Smartme URL: ' + bezug_smartme_url)
-    log.debug('Smartme User: ' + bezug_smartme_user)
-    log.debug('Smartme Passwort: ' + bezug_smartme_pass)
-
-    # Daten einlesen
-    response = requests.get(bezug_smartme_url, auth=(bezug_smartme_user, bezug_smartme_pass), timeout=3).json()
-
-    # Aktuelle Leistung (kW --> W)
-    wattbezug = get_power_value("ActivePower", response)
-    wattbezug1 = get_power_value("ActivePowerL1", response)
-    if wattbezug1 == 0:
-        wattbezug1 = wattbezug
-    get_power_value("ActivePowerL2", response, "bezugw2")
-    get_power_value("ActivePowerL3", response, "bezugw3")
-    # Zählerstand Import(kWh)
-    get_im_ex_value("CounterReadingImport", response, "bezugkwh")
-    # Zählerstand Export(kWh)
-    get_im_ex_value("CounterReadingExport", response, "einspeisungkwh")
-
-    # Weitere Zählerdaten für die Statusseite (PowerFaktor, Spannung und Strom)
-    get_value("PowerFactorL1", response, "evupf1")
-    get_value("PowerFactorL2", response, "evupf2")
-    get_value("PowerFactorL3", response, "evupf3")
-    get_value("VoltageL1", response, "evuv1")
-    get_value("VoltageL2", response, "evuv2")
-    get_value("VoltageL3", response, "evuv3")
-    bezuga1 = get_value("CurrentL1", response)
-    if bezuga1 is None:
-        try:
-            bezuga1 = response["Current"]
-        except:
-            traceback.print_exc()
-            exit(1)
-    log.debug('Strom L1: ' + str(bezuga1))
-    with open("/var/www/html/openWB/ramdisk/bezuga1", "w") as f:
-        f.write(str(bezuga1))
-    get_value("CurrentL2", response, "bezuga2")
-    get_value("CurrentL3", response, "bezuga3")
-
-    # Prüfen ob Werte gültig
-    regex = '^[-+]?[0-9]+.?[0-9]*$'
-    if re.search(regex, str(wattbezug)) is None:
-        with open("/var/www/html/openWB/ramdisk/wattbezug", "r") as f:
-            wattbezug = f.read()
-    # Ausgabe
-    log.debug('Leistung: ' + str(wattbezug))
-    with open("/var/www/html/openWB/ramdisk/wattbezug", "w") as f:
-        f.write(str(wattbezug))
-    log.debug('Leistung L1: ' + str(wattbezug1))
-    with open("/var/www/html/openWB/ramdisk/wattbezugw1", "w") as f:
-        f.write(str(wattbezug1))
-
-
-def main(argv: List[str]):
-    run_using_positional_cli_args(update, argv)

modules/bezug_solarview/main.sh

@@ -10,7 +10,7 @@ else
 	MYLOGFILE="${RAMDISKDIR}/evu.log"
 fi
 
-bash "$OPENWBBASEDIR/packages/legacy_run.sh" "bezug_solarview.solarview" "${solarview_hostname}" "${solarview_port}" "${solarview_timeout}" >>"${MYLOGFILE}" 2>&1
+bash "$OPENWBBASEDIR/packages/legacy_run.sh" "modules.devices.solar_view.device" "counter" "${solarview_hostname}" "${solarview_port}" "${solarview_timeout}" >>"${MYLOGFILE}" 2>&1
 ret=$?
 
 openwbDebugLog ${DMOD} 2 "RET: ${ret}"