update funktion, dac als S1, http modul url escaped

openwb.conf

@@ -124,7 +124,7 @@ nachtladenabuhr=22
 nachtladenbisuhr=7
 # Sofern Soc ausgelesen wird, bis wieviel % SOC laden?
 nachtsoc=50
-nachtsoc1=45
+nachtsoc1=35
 
 #Uberschussregelung
 # Mindestuberschuss in Watt im Haus damit die Ladung gestartet wird
@@ -140,14 +140,15 @@ mindestuberschuss=1250
 # Der Wert ist für 1phasiges laden. Bei 3phasigem laden verdreifacht sich der Wert(automatisch). z.B. bei 900 Watt ergibt das bei 3960Watt Ladeleistung ein (erlaubter) Netzbezug bis 1260W
 # Bei einem abschaltuberschuss von 0 wird erst abgeschaltet wenn Bezug über 1320w bzw 3960w (3phasig) geht
 # Bei einem abschaltuberschuss von 1320 wird abgeschaltet sobald mehr als 1w aus dem Netz bezogen wird
-abschaltuberschuss=550
+abschaltuberschuss=250
 
 
 # Der Modi Sofort Laden lädt immer mit der vorgegebenen Ladeleistung
 # Mögliche Werte: 6-32 (A)
-sofortll=27
+sofortll=25
 
 smaemdbezugid=1900123456
 smaemdpvid=1900123456
 smaemdllid=1900123456
+dacregisters1=14
 

ramdisk/bezugkwh

@@ -1 +1 @@
-7508842.600000001
+7627293.600000001

ramdisk/einspeisungkwh

@@ -1 +1 @@
-2174368.2
+2279520.1

ramdisk/llkwh

@@ -1 +1 @@
-258.2900085449219
+305.48699951171875

ramdisk/llkwhs1

@@ -1 +1 @@
-55.645999908447266
+64.125

ramdisk/pvkwh

@@ -1 +1 @@
-5110550
+5331010

ramdisk/pvwatt

@@ -1 +1 @@
-69
+78

ramdisk/soc

@@ -1 +1 @@
-95
+68

ramdisk/wattbezug

@@ -1 +1 @@
-1251
+1277

runs/0.sh

@@ -11,6 +11,10 @@ if [[ $debug == "2" ]]; then
 	echo "setz ladung auf 0A" >> /var/www/html/openWB/web/lade.log
 fi
 if [[ $lastmanagement == "1" ]]; then
+	if [[ $evsecons1 == "dac" ]]; then
+		sudo python /var/www/html/openWB/runs/dac.py 0 $dacregisters1
+	fi
+
 	if [[ $evsecons1 == "modbusevse" ]]; then
 		if [[ $evsesources1 = *virtual* ]]
 		then

runs/10.sh

@@ -10,6 +10,10 @@ if [[ $debug == "2" ]]; then
 	echo "setz ladung auf 10A" >> /var/www/html/openWB/web/lade.log
 fi
 if [[ $lastmanagement == "1" ]]; then
+	if [[ $evsecons1 == "dac" ]]; then
+		sudo python /var/www/html/openWB/runs/dac.py 1298 $dacregisters1
+	fi
+
 	if [[ $evsecons1 == "modbusevse" ]]; then
 		sudo python /var/www/html/openWB/runs/evsewritemodbus.py $evsesources1 $evseids1 10
 	fi

runs/11.sh

@@ -10,6 +10,10 @@ if [[ $debug == "2" ]]; then
 	echo "setz ladung auf 11A" >> /var/www/html/openWB/web/lade.log
 fi
 if [[ $lastmanagement == "1" ]]; then
+	if [[ $evsecons1 == "dac" ]]; then
+		sudo python /var/www/html/openWB/runs/dac.py 1427 $dacregisters1
+	fi
+
 	if [[ $evsecons1 == "modbusevse" ]]; then
 		sudo python /var/www/html/openWB/runs/evsewritemodbus.py $evsesources1 $evseids1 11
 	fi

runs/12.sh

@@ -10,6 +10,10 @@ if [[ $debug == "2" ]]; then
 	echo "setz ladung auf 12A" >> /var/www/html/openWB/web/lade.log
 fi
 if [[ $lastmanagement == "1" ]]; then
+	if [[ $evsecons1 == "dac" ]]; then
+		sudo python /var/www/html/openWB/runs/dac.py 1557 $dacregisters1
+	fi
+
 	if [[ $evsecons1 == "modbusevse" ]]; then
 		sudo python /var/www/html/openWB/runs/evsewritemodbus.py $evsesources1 $evseids1 12
 	fi

runs/13.sh

@@ -10,6 +10,10 @@ if [[ $debug == "2" ]]; then
 	echo "setz ladung auf 13A" >> /var/www/html/openWB/web/lade.log
 fi
 if [[ $lastmanagement == "1" ]]; then
+	if [[ $evsecons1 == "dac" ]]; then
+		sudo python /var/www/html/openWB/runs/dac.py 1687 $dacregisters1
+	fi
+
 	if [[ $evsecons1 == "modbusevse" ]]; then
 		sudo python /var/www/html/openWB/runs/evsewritemodbus.py $evsesources1 $evseids1 13
 	fi

runs/14.sh

@@ -10,6 +10,10 @@ if [[ $debug == "2" ]]; then
 	echo "setz ladung auf 14A" >> /var/www/html/openWB/web/lade.log
 fi
 if [[ $lastmanagement == "1" ]]; then
+	if [[ $evsecons1 == "dac" ]]; then
+		sudo python /var/www/html/openWB/runs/dac.py 1814 $dacregisters1
+	fi
+
 	if [[ $evsecons1 == "modbusevse" ]]; then
 		sudo python /var/www/html/openWB/runs/evsewritemodbus.py $evsesources1 $evseids1 14
 	fi

runs/15.sh

@@ -10,6 +10,10 @@ if [[ $debug == "2" ]]; then
 	echo "setz ladung auf 15A" >> /var/www/html/openWB/web/lade.log
 fi
 if [[ $lastmanagement == "1" ]]; then
+	if [[ $evsecons1 == "dac" ]]; then
+		sudo python /var/www/html/openWB/runs/dac.py 1947 $dacregisters1
+	fi
+
 	if [[ $evsecons1 == "modbusevse" ]]; then
 		sudo python /var/www/html/openWB/runs/evsewritemodbus.py $evsesources1 $evseids1 15
 	fi

runs/16.sh

@@ -10,6 +10,10 @@ if [[ $debug == "2" ]]; then
 	echo "setz ladung auf 16A" >> /var/www/html/openWB/web/lade.log
 fi
 if [[ $lastmanagement == "1" ]]; then
+	if [[ $evsecons1 == "dac" ]]; then
+		sudo python /var/www/html/openWB/runs/dac.py 2077 $dacregisters1
+	fi
+
 	if [[ $evsecons1 == "modbusevse" ]]; then
 		sudo python /var/www/html/openWB/runs/evsewritemodbus.py $evsesources1 $evseids1 16
 	fi

runs/17.sh

@@ -10,6 +10,10 @@ if [[ $debug == "2" ]]; then
 	echo "setz ladung auf 17A" >> /var/www/html/openWB/web/lade.log
 fi
 if [[ $lastmanagement == "1" ]]; then
+	if [[ $evsecons1 == "dac" ]]; then
+		sudo python /var/www/html/openWB/runs/dac.py 2206 $dacregisters1
+	fi
+
 	if [[ $evsecons1 == "modbusevse" ]]; then
 		sudo python /var/www/html/openWB/runs/evsewritemodbus.py $evsesources1 $evseids1 17
 	fi

runs/18.sh

@@ -10,6 +10,10 @@ if [[ $debug == "2" ]]; then
 	echo "setz ladung auf 18A" >> /var/www/html/openWB/web/lade.log
 fi
 if [[ $lastmanagement == "1" ]]; then
+	if [[ $evsecons1 == "dac" ]]; then
+		sudo python /var/www/html/openWB/runs/dac.py 2336 $dacregisters1
+	fi
+
 	if [[ $evsecons1 == "modbusevse" ]]; then
 		sudo python /var/www/html/openWB/runs/evsewritemodbus.py $evsesources1 $evseids1 18
 	fi

runs/19.sh

@@ -10,6 +10,10 @@ if [[ $debug == "2" ]]; then
 	echo "setz ladung auf 19A" >> /var/www/html/openWB/web/lade.log
 fi
 if [[ $lastmanagement == "1" ]]; then
+	if [[ $evsecons1 == "dac" ]]; then
+		sudo python /var/www/html/openWB/runs/dac.py 2466 $dacregisters1
+	fi
+
 	if [[ $evsecons1 == "modbusevse" ]]; then
 		sudo python /var/www/html/openWB/runs/evsewritemodbus.py $evsesources1 $evseids1 19
 	fi

runs/20.sh

@@ -10,6 +10,10 @@ if [[ $debug == "2" ]]; then
 	echo "setz ladung auf 20A" >> /var/www/html/openWB/web/lade.log
 fi
 if [[ $lastmanagement == "1" ]]; then
+	if [[ $evsecons1 == "dac" ]]; then
+		sudo python /var/www/html/openWB/runs/dac.py 2596 $dacregisters1
+	fi
+
 	if [[ $evsecons1 == "modbusevse" ]]; then
 		sudo python /var/www/html/openWB/runs/evsewritemodbus.py $evsesources1 $evseids1 20
 	fi

runs/21.sh

@@ -10,6 +10,10 @@ if [[ $debug == "2" ]]; then
 	echo "setz ladung auf 21A" >> /var/www/html/openWB/web/lade.log
 fi
 if [[ $lastmanagement == "1" ]]; then
+	if [[ $evsecons1 == "dac" ]]; then
+		sudo python /var/www/html/openWB/runs/dac.py 2726 $dacregisters1
+	fi
+
 	if [[ $evsecons1 == "modbusevse" ]]; then
 		sudo python /var/www/html/openWB/runs/evsewritemodbus.py $evsesources1 $evseids1 21
 	fi

runs/22.sh

@@ -10,6 +10,10 @@ if [[ $debug == "2" ]]; then
 	echo "setz ladung auf 22A" >> /var/www/html/openWB/web/lade.log
 fi
 if [[ $lastmanagement == "1" ]]; then
+	if [[ $evsecons1 == "dac" ]]; then
+		sudo python /var/www/html/openWB/runs/dac.py 2855 $dacregisters1
+	fi
+
 	if [[ $evsecons1 == "modbusevse" ]]; then
 		sudo python /var/www/html/openWB/runs/evsewritemodbus.py $evsesources1 $evseids1 22
 	fi

runs/23.sh

@@ -10,6 +10,10 @@ if [[ $debug == "2" ]]; then
 	echo "setz ladung auf 23A" >> /var/www/html/openWB/web/lade.log
 fi
 if [[ $lastmanagement == "1" ]]; then
+	if [[ $evsecons1 == "dac" ]]; then
+		sudo python /var/www/html/openWB/runs/dac.py 2985 $dacregisters1
+	fi
+
 	if [[ $evsecons1 == "modbusevse" ]]; then
 		sudo python /var/www/html/openWB/runs/evsewritemodbus.py $evsesources1 $evseids1 23
 	fi

runs/24.sh

@@ -10,6 +10,10 @@ if [[ $debug == "2" ]]; then
 	echo "setz ladung auf 24A" >> /var/www/html/openWB/web/lade.log
 fi
 if [[ $lastmanagement == "1" ]]; then
+	if [[ $evsecons1 == "dac" ]]; then
+		sudo python /var/www/html/openWB/runs/dac.py 3115 $dacregisters1
+	fi
+
 	if [[ $evsecons1 == "modbusevse" ]]; then
 		sudo python /var/www/html/openWB/runs/evsewritemodbus.py $evsesources1 $evseids1 24
 	fi

runs/25.sh

@@ -10,6 +10,10 @@ if [[ $debug == "2" ]]; then
 	echo "setz ladung auf 25A" >> /var/www/html/openWB/web/lade.log
 fi
 if [[ $lastmanagement == "1" ]]; then
+	if [[ $evsecons1 == "dac" ]]; then
+		sudo python /var/www/html/openWB/runs/dac.py 3245 $dacregisters1
+	fi
+
 	if [[ $evsecons1 == "modbusevse" ]]; then
 		sudo python /var/www/html/openWB/runs/evsewritemodbus.py $evsesources1 $evseids1 25
 	fi

runs/26.sh

@@ -10,6 +10,10 @@ if [[ $debug == "2" ]]; then
 	echo "setz ladung auf 26A" >> /var/www/html/openWB/web/lade.log
 fi
 if [[ $lastmanagement == "1" ]]; then
+	if [[ $evsecons1 == "dac" ]]; then
+		sudo python /var/www/html/openWB/runs/dac.py 3375 $dacregisters1
+	fi
+
 	if [[ $evsecons1 == "modbusevse" ]]; then
 		sudo python /var/www/html/openWB/runs/evsewritemodbus.py $evsesources1 $evseids1 26
 	fi

runs/27.sh

@@ -10,6 +10,10 @@ if [[ $debug == "2" ]]; then
 	echo "setz ladung auf 27A" >> /var/www/html/openWB/web/lade.log
 fi
 if [[ $lastmanagement == "1" ]]; then
+	if [[ $evsecons1 == "dac" ]]; then
+		sudo python /var/www/html/openWB/runs/dac.py 3505 $dacregisters1
+	fi
+
 	if [[ $evsecons1 == "modbusevse" ]]; then
 		sudo python /var/www/html/openWB/runs/evsewritemodbus.py $evsesources1 $evseids1 27
 	fi

runs/28.sh

@@ -10,6 +10,10 @@ if [[ $debug == "2" ]]; then
 	echo "setz ladung auf 28A" >> /var/www/html/openWB/web/lade.log
 fi
 if [[ $lastmanagement == "1" ]]; then
+	if [[ $evsecons1 == "dac" ]]; then
+		sudo python /var/www/html/openWB/runs/dac.py 3634 $dacregisters1
+	fi
+
 	if [[ $evsecons1 == "modbusevse" ]]; then
 		sudo python /var/www/html/openWB/runs/evsewritemodbus.py $evsesources1 $evseids1 28
 	fi

runs/29.sh

@@ -10,6 +10,10 @@ if [[ $debug == "2" ]]; then
 	echo "setz ladung auf 29A" >> /var/www/html/openWB/web/lade.log
 fi
 if [[ $lastmanagement == "1" ]]; then
+	if [[ $evsecons1 == "dac" ]]; then
+		sudo python /var/www/html/openWB/runs/dac.py 3764 $dacregisters1
+	fi
+
 	if [[ $evsecons1 == "modbusevse" ]]; then
 		sudo python /var/www/html/openWB/runs/evsewritemodbus.py $evsesources1 $evseids1 29
 	fi

runs/30.sh

@@ -10,6 +10,10 @@ if [[ $debug == "2" ]]; then
 	echo "setz ladung auf 30A" >> /var/www/html/openWB/web/lade.log
 fi
 if [[ $lastmanagement == "1" ]]; then
+	if [[ $evsecons1 == "dac" ]]; then
+		sudo python /var/www/html/openWB/runs/dac.py 3894 $dacregisters1
+	fi
+
 	if [[ $evsecons1 == "modbusevse" ]]; then
 		sudo python /var/www/html/openWB/runs/evsewritemodbus.py $evsesources1 $evseids1 30
 	fi

runs/31.sh

@@ -10,6 +10,10 @@ if [[ $debug == "2" ]]; then
 	echo "setz ladung auf 31A" >> /var/www/html/openWB/web/lade.log
 fi
 if [[ $lastmanagement == "1" ]]; then
+	if [[ $evsecons1 == "dac" ]]; then
+		sudo python /var/www/html/openWB/runs/dac.py 4024 $dacregisters1
+	fi
+
 	if [[ $evsecons1 == "modbusevse" ]]; then
 		sudo python /var/www/html/openWB/runs/evsewritemodbus.py $evsesources1 $evseids1 31
 	fi

runs/32.sh

@@ -10,6 +10,10 @@ if [[ $debug == "2" ]]; then
 	echo "setz ladung auf 32A" >> /var/www/html/openWB/web/lade.log
 fi
 if [[ $lastmanagement == "1" ]]; then
+	if [[ $evsecons1 == "dac" ]]; then
+		sudo python /var/www/html/openWB/runs/dac.py 4096 $dacregisters1
+	fi
+
 	if [[ $evsecons1 == "modbusevse" ]]; then
 		sudo python /var/www/html/openWB/runs/evsewritemodbus.py $evsesources1 $evseids1 32
 	fi

runs/6.sh

@@ -21,6 +21,10 @@ if [[ $debug == "2" ]]; then
 	echo "setz ladung auf 6A" >> /var/www/html/openWB/web/lade.log
 fi
 if [[ $lastmanagement == "1" ]]; then
+	if [[ $evsecons1 == "dac" ]]; then
+		sudo python /var/www/html/openWB/runs/dac.py 790 $dacregisters1
+	fi
+
 	if [[ $evsecons1 == "modbusevse" ]]; then
 		sudo python /var/www/html/openWB/runs/evsewritemodbus.py $evsesources1 $evseids1 6
 	fi

runs/7.sh

@@ -10,6 +10,10 @@ if [[ $debug == "2" ]]; then
 		echo "setz ladung auf 7A" >> /var/www/html/openWB/web/lade.log
 fi
 if [[ $lastmanagement == "1" ]]; then
+	if [[ $evsecons1 == "dac" ]]; then
+		sudo python /var/www/html/openWB/runs/dac.py 908 $dacregisters1
+	fi
+
 	if [[ $evsecons1 == "modbusevse" ]]; then
 		if [[ $evsesources1 = *virtual* ]]
 		then

runs/8.sh

@@ -10,6 +10,10 @@ if [[ $debug == "2" ]]; then
 	echo "setz ladung auf 8A" >> /var/www/html/openWB/web/lade.log
 fi
 if [[ $lastmanagement == "1" ]]; then
+	if [[ $evsecons1 == "dac" ]]; then
+		sudo python /var/www/html/openWB/runs/dac.py 1038 $dacregisters1
+	fi
+
 	if [[ $evsecons1 == "modbusevse" ]]; then
 		if [[ $evsesources1 = *virtual* ]]
 		then

runs/9.sh

@@ -11,6 +11,10 @@ if [[ $debug == "2" ]]; then
 	echo "setz ladung auf 9A" >> /var/www/html/openWB/web/lade.log
 fi
 if [[ $lastmanagement == "1" ]]; then
+	if [[ $evsecons1 == "dac" ]]; then
+		sudo python /var/www/html/openWB/runs/dac.py 1168 $dacregisters1
+	fi
+
 	if [[ $evsecons1 == "modbusevse" ]]; then
 		sudo python /var/www/html/openWB/runs/evsewritemodbus.py $evsesources1 $evseids1 9
 	fi

runs/update.sh

@@ -27,6 +27,10 @@ if ! grep -Fq "socmodul1=" /var/www/html/openwb.conf
 then
 	  echo "socmodul1=soc_http1" >> /var/www/html/openWB/openwb.conf
 fi
+if ! grep -Fq "dacregisters1=" /var/www/html/openwb.conf
+then
+	  echo "dacregisters1=12" >> /var/www/html/openWB/openwb.conf
+fi
 
 if ! grep -Fq "wr_http_kwh_url=" /var/www/html/openwb.conf
 then