lastmanagement regellogik angepasst

snaptec · May 31, 2018 · 1fd3e3a · 1fd3e3a
1 parent 3b1fef2
commit 1fd3e3a
Show file tree

Hide file tree

Showing 18 changed files with 30 additions and 24 deletions.
diff --git 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
@@ -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
@@ -1 +1 @@
-8087386.5
+8115674.300000001
diff --git a/ramdisk/einspeisungkwh b/ramdisk/einspeisungkwh
@@ -1 +1 @@
-2720845.4000000004
+2807752.9000000004
diff --git a/ramdisk/llaltnv b/ramdisk/llaltnv
@@ -1 +1 @@
-224
+226
diff --git a/ramdisk/llas11 b/ramdisk/llas11
@@ -1 +1 @@
-0
+
diff --git a/ramdisk/llkwh b/ramdisk/llkwh
@@ -1 +1 @@
-475.85101318359375
+499.73199462890625
diff --git a/ramdisk/llkwhs1 b/ramdisk/llkwhs1
@@ -1 +1 @@
-114.1729965209961
+0
diff --git a/ramdisk/llv1 b/ramdisk/llv1
@@ -1 +1 @@
-224
+227
diff --git a/ramdisk/llv2 b/ramdisk/llv2
@@ -1 +1 @@
-224
+227
diff --git a/ramdisk/llv3 b/ramdisk/llv3
@@ -1 +1 @@
-225
+226
diff --git a/ramdisk/pvcounter b/ramdisk/pvcounter
@@ -1 +1 @@
-150
+0
diff --git a/ramdisk/pvkwh b/ramdisk/pvkwh
@@ -1 +1 @@
-6310540
+193.46200561523438
diff --git a/ramdisk/pvwatt b/ramdisk/pvwatt
@@ -1 +1 @@
-4413
+2767
diff --git a/ramdisk/soc b/ramdisk/soc
@@ -1 +1 @@
-66
+99
diff --git a/ramdisk/wattbezug b/ramdisk/wattbezug
@@ -1 +1 @@
--3703
+-1864
diff --git 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
@@ -342,7 +342,7 @@ function getfile() {
 			</div> -->
 			<div class="row">
 				<div class="col-xs-4">
-					Ver0.38
+					Ver0.39
 				</div>
 				<div class="col-xs-4 text-center">
 					<a href="http://openwb.de">www.openwb.de</a>