diff --git a/modules/sdm630modbuswr/main.sh b/modules/sdm630modbuswr/main.sh index 174a7689d..ff1163284 100755 --- a/modules/sdm630modbuswr/main.sh +++ b/modules/sdm630modbuswr/main.sh @@ -36,13 +36,13 @@ while read -r line; do fi if (( $n == 6 )); then wrkwh=$(echo "$line" | cut -c2- ) - echo ${wrkwh%??} > /var/www/html/openWB/ramdisk/wrkwh + echo ${wrkwh%??} > /var/www/html/openWB/ramdisk/pvkwh fi n=$((n + 1)) done <<< "$output" -wattwr=`echo "($wl1+wl2+$wl3)" |bc` +wattwr=`echo "(($wl1+$wl2+$wl3)* -1)" |bc` echo $wattwr echo $wattwr > /var/www/html/openWB/ramdisk/pvwatt diff --git a/openwb.conf b/openwb.conf index 2827d6a56..c8330988a 100755 --- a/openwb.conf +++ b/openwb.conf @@ -36,11 +36,11 @@ sdmids1=5 ladeleistungs1modul=sdm630modbuslls1 #lastmanagement -lastmanagement=1 +lastmanagement=0 lastmmaxw=15000 -lastmaxap1=32 -lastmaxap2=32 -lastmaxap3=32 +lastmaxap1=30 +lastmaxap2=30 +lastmaxap3=30 ################################################################# @@ -68,7 +68,7 @@ sdm630modbusbezuglanip=10.20.0.180 # Modulauswahl für den PV Wechselrichter # Mögliche Werte: wr_fronius, none # Das Modul selbst muss noch konfiguriert werden -pvwattmodul=wr_fronius +pvwattmodul=wr_http #wr fronius ip wrfroniusip=10.20.0.126 @@ -152,11 +152,11 @@ smaemdpvid=1900123456 smaemdllid=1900123456 dacregisters1=12 -wr_http_w_url='http://192.168.0.17/pvwatt.txt' +wr_http_w_url='http://10.20.0.63/openWB/ramdisk/pvwatt' hsocip1=http://10.0.0.110/soc.txt socmodul1=soc_http1 dacregisters1=12 -wr_http_kwh_url='http://192.168.0.17/pvwh.txt' +wr_http_kwh_url='http://10.20.0.63/openWB/ramdisk/pvkwh' smaemdbezugid=1900123456 smaemdpvid=1900123456 smaemdllid=1900123456 diff --git a/ramdisk/bezugkwh b/ramdisk/bezugkwh index 1eb6da1d3..20e718bcd 100755 --- a/ramdisk/bezugkwh +++ b/ramdisk/bezugkwh @@ -1 +1 @@ -8087386.5 +8115674.300000001 diff --git a/ramdisk/einspeisungkwh b/ramdisk/einspeisungkwh index a4c99bc06..7aaee03ff 100755 --- a/ramdisk/einspeisungkwh +++ b/ramdisk/einspeisungkwh @@ -1 +1 @@ -2720845.4000000004 +2807752.9000000004 diff --git a/ramdisk/llaltnv b/ramdisk/llaltnv index 20c90807c..f4146713e 100755 --- a/ramdisk/llaltnv +++ b/ramdisk/llaltnv @@ -1 +1 @@ -224 +226 diff --git a/ramdisk/llas11 b/ramdisk/llas11 index 573541ac9..8b1378917 100755 --- a/ramdisk/llas11 +++ b/ramdisk/llas11 @@ -1 +1 @@ -0 + diff --git a/ramdisk/llkwh b/ramdisk/llkwh index 2b7c485f0..f8cf4324c 100755 --- a/ramdisk/llkwh +++ b/ramdisk/llkwh @@ -1 +1 @@ -475.85101318359375 +499.73199462890625 diff --git a/ramdisk/llkwhs1 b/ramdisk/llkwhs1 index 800cda884..573541ac9 100755 --- a/ramdisk/llkwhs1 +++ b/ramdisk/llkwhs1 @@ -1 +1 @@ -114.1729965209961 +0 diff --git a/ramdisk/llv1 b/ramdisk/llv1 index 20c90807c..2c36bbdaa 100755 --- a/ramdisk/llv1 +++ b/ramdisk/llv1 @@ -1 +1 @@ -224 +227 diff --git a/ramdisk/llv2 b/ramdisk/llv2 index 20c90807c..2c36bbdaa 100755 --- a/ramdisk/llv2 +++ b/ramdisk/llv2 @@ -1 +1 @@ -224 +227 diff --git a/ramdisk/llv3 b/ramdisk/llv3 index 188ccfe56..f4146713e 100755 --- a/ramdisk/llv3 +++ b/ramdisk/llv3 @@ -1 +1 @@ -225 +226 diff --git a/ramdisk/pvcounter b/ramdisk/pvcounter index fa8f08cb6..573541ac9 100755 --- a/ramdisk/pvcounter +++ b/ramdisk/pvcounter @@ -1 +1 @@ -150 +0 diff --git a/ramdisk/pvkwh b/ramdisk/pvkwh index 941cf4f2e..c4f3f2ef1 100755 --- a/ramdisk/pvkwh +++ b/ramdisk/pvkwh @@ -1 +1 @@ -6310540 +193.46200561523438 diff --git a/ramdisk/pvwatt b/ramdisk/pvwatt index d7d0eb115..970fd9c90 100755 --- a/ramdisk/pvwatt +++ b/ramdisk/pvwatt @@ -1 +1 @@ -4413 +2767 diff --git a/ramdisk/soc b/ramdisk/soc index 69a893aa3..3ad5abd03 100755 --- a/ramdisk/soc +++ b/ramdisk/soc @@ -1 +1 @@ -66 +99 diff --git a/ramdisk/wattbezug b/ramdisk/wattbezug index e752f00a3..31be660e1 100755 --- a/ramdisk/wattbezug +++ b/ramdisk/wattbezug @@ -1 +1 @@ --3703 +-1864 diff --git a/regel.sh b/regel.sh index 04eea3f3b..d3a31b278 100755 --- a/regel.sh +++ b/regel.sh @@ -251,6 +251,12 @@ else done maxdiff=$((maxdiff + 1 )) llneu=$((llalt - maxdiff)) + if (( $llneu < $minimalstromstaerke )); then + llneu=$minimalstromstaerke + if [[ $debug == "1" ]]; then + echo Differenz groesser als minimalstromstaerke, setze auf minimal A $minimalstromstaerke + fi + fi runs/"$llneu"m.sh if [[ $debug == "1" ]]; then echo "Sofort ladung um $maxdiff auf $llneu reduziert" diff --git a/web/index.php b/web/index.php index 1ad19186c..3184f3593 100644 --- a/web/index.php +++ b/web/index.php @@ -342,7 +342,7 @@ function getfile() { -->
- Ver0.38 + Ver0.39
www.openwb.de