isss support

CONSULitAS · Aug 27, 2020 · ccf4004 · ccf4004
1 parent cf45b83
commit ccf4004
Show file tree

Hide file tree

Showing 5 changed files with 104 additions and 6 deletions.
diff --git a/loadvars.sh b/loadvars.sh
@@ -109,7 +109,12 @@ if [[ $evsecon == "ipevse" ]]; then
 		echo 0 > /var/www/html/openWB/ramdisk/chargestat
 	fi
 fi
-
+if [[ $evsecon == "extopenwb" ]]; then
+	evseplugstatelp1=$(mosquitto_sub -C 1 -h $lp1ip -t openWB/lp/1/boolPlugStat)
+	ladestatuslp1=$(mosquitto_sub -C 1 -h $lp1ip -t openWB/lp/1/boolChargeStat)
+	echo $evseplugstatelp1  > /var/www/html/openWB/ramdisk/plugstat
+	echo $ladestatuslp1 > /var/www/html/openWB/ramdisk/chargestat
+fi
 if [[ $lastmanagement == "1" ]]; then
 	if [[ $evsecons1 == "modbusevse" ]]; then
 		evseplugstatelp2=$(sudo python runs/readmodbus.py $evsesources1 $evseids1 1002 1)
@@ -139,6 +144,12 @@ if [[ $lastmanagement == "1" ]]; then
 
 		fi
 	fi
+	if [[ $evsecons1 == "extopenwb" ]]; then
+		evseplugstatelp2=$(mosquitto_sub -C 1 -h $lp2ip -t openWB/lp/1/boolPlugStat)
+		ladestatuslp2=$(mosquitto_sub -C 1 -h $lp2ip -t openWB/lp/1/boolChargeStat)
+		echo $evseplugstatelp2  > /var/www/html/openWB/ramdisk/plugstats1
+		echo $ladestatuslp2 > /var/www/html/openWB/ramdisk/chargestats1
+	fi
 	if [[ $evsecons1 == "slaveeth" ]]; then
 		evseplugstatelp2=$(sudo python runs/readslave.py 1002 1)
 		ladestatuss1=$(</var/www/html/openWB/ramdisk/ladestatuss1)
@@ -192,6 +203,13 @@ if [[ $lastmanagements2 == "1" ]]; then
 			echo 0 > /var/www/html/openWB/ramdisk/chargestatlp3
 		fi
 	fi
+	if [[ $evsecons2 == "extopenwb" ]]; then
+		evseplugstatelp3=$(mosquitto_sub -C 1 -h $lp3ip -t openWB/lp/1/boolPlugStat)
+		ladestatuslp3=$(mosquitto_sub -C 1 -h $lp3ip -t openWB/lp/1/boolChargeStat)
+		echo $evseplugstatelp3  > /var/www/html/openWB/ramdisk/plugstats2
+		echo $ladestatuslp3 > /var/www/html/openWB/ramdisk/chargestats2
+	fi
+
 	if [[ $evsecons2 == "modbusevse" ]]; then
 	        evseplugstatelp3=$(sudo python runs/readmodbus.py $evsesources2 $evseids2 1002 1)
 	        ladestatuss2=$(</var/www/html/openWB/ramdisk/ladestatuss2)
@@ -360,6 +378,7 @@ else
 	echo 0 > /var/www/html/openWB/ramdisk/speichervorhanden
 fi
 llphaset=3
+
 #Ladeleistung ermitteln
 if [[ $ladeleistungmodul != "none" ]]; then
 	timeout 10 modules/$ladeleistungmodul/main.sh || true
@@ -409,6 +428,7 @@ else
 	llkwh=0
 	llkwhges=$llkwh
 fi
+
 #zweiter ladepunkt
 if [[ $lastmanagement == "1" ]]; then
 	if [[ $socmodul1 != "none" ]]; then

diff --git a/regel.sh b/regel.sh
@@ -46,7 +46,9 @@ source leds.sh
 source slavemode.sh
 date=$(date)
 re='^-?[0-9]+$'
-
+if [[ $isss == "1" ]]; then
+       exit 0
+fi
 #doppelte Ausfuehrungsgeschwindigkeit
 if [[ $dspeed == "1" ]]; then
 	if [ -e ramdisk/5sec ]; then

diff --git a/runs/atreboot.sh b/runs/atreboot.sh
@@ -2616,6 +2616,49 @@ if ! grep -Fq "soc_vin=" /var/www/html/openWB/openwb.conf
 then
 	echo "soc_vin=VIN" >> /var/www/html/openWB/openwb.conf
 fi
+if ! grep -Fq "isss=" /var/www/html/openWB/openwb.conf
+then
+	echo "isss=0" >> /var/www/html/openWB/openwb.conf
+fi
+if ! grep -Fq "lp1ip=" /var/www/html/openWB/openwb.conf
+then
+	echo "lp1ip=192.168.1.100" >> /var/www/html/openWB/openwb.conf
+fi
+if ! grep -Fq "lp2ip=" /var/www/html/openWB/openwb.conf
+then
+	echo "lp2ip=192.168.1.100" >> /var/www/html/openWB/openwb.conf
+fi
+
+if ! grep -Fq "lp3ip=" /var/www/html/openWB/openwb.conf
+then
+	echo "lp3ip=192.168.1.100" >> /var/www/html/openWB/openwb.conf
+fi
+
+if ! grep -Fq "lp4ip=" /var/www/html/openWB/openwb.conf
+then
+	echo "lp4ip=192.168.1.100" >> /var/www/html/openWB/openwb.conf
+fi
+
+if ! grep -Fq "lp5ip=" /var/www/html/openWB/openwb.conf
+then
+	echo "lp5ip=192.168.1.100" >> /var/www/html/openWB/openwb.conf
+fi
+
+if ! grep -Fq "lp6ip=" /var/www/html/openWB/openwb.conf
+then
+	echo "lp6ip=192.168.1.100" >> /var/www/html/openWB/openwb.conf
+fi
+
+if ! grep -Fq "lp7ip=" /var/www/html/openWB/openwb.conf
+then
+	echo "lp7ip=192.168.1.100" >> /var/www/html/openWB/openwb.conf
+fi
+
+if ! grep -Fq "lp8ip=" /var/www/html/openWB/openwb.conf
+then
+	echo "lp8ip=192.168.1.100" >> /var/www/html/openWB/openwb.conf
+fi
+
 if ! grep -Fq "soclp1_vin=" /var/www/html/openWB/openwb.conf
 then
 	echo "soclp1_vin=none" >> /var/www/html/openWB/openwb.conf
@@ -2751,6 +2794,14 @@ chmod 777 /var/www/html/openWB/ramdisk/mqttlastregelungaktiv
 #	  sudo apt-get update
 #	  sudo apt-get -qq install -y php-curl
 #  fi
+if (( isss == 1 )); then
+       if ps ax |grep -v grep |grep "python3 /var/www/html/openWB/runs/isss.py" > /dev/null
+       then
+               echo "test" > /dev/null
+       else
+               python3 /var/www/html/openWB/runs/isss.py &
+       fi
+fi
 (sleep 10; echo 1 > /var/www/html/openWB/ramdisk/reloaddisplay) &
 ip route get 1 | awk '{print $NF;exit}' > /var/www/html/openWB/ramdisk/ipaddress
 curl -s https://raw.githubusercontent.com/snaptec/openWB/master/web/version > /var/www/html/openWB/ramdisk/vnightly

diff --git a/runs/cron5min.sh b/runs/cron5min.sh
@@ -190,4 +190,11 @@ else
 	sudo ifconfig eth0:0 192.168.193.5 netmask 255.255.255.0 down
 
 fi
-
+if (( isss == 1 )); then
+       if ps ax |grep -v grep |grep "python3 /var/www/html/openWB/runs/isss.py" > /dev/null
+       then
+               echo "test" > /dev/null
+       else
+               python3 /var/www/html/openWB/runs/isss.py &
+       fi
+fi
diff --git a/runs/set-current.sh b/runs/set-current.sh
@@ -55,7 +55,16 @@ function setChargingCurrentDAC () {
 	# INFO: needs new dac.py to accept current and use translation table 
 	sudo python /var/www/html/openWB/runs/dac.py $current $dacregister
 }
-
+# function for setting the current - extopenwb
+# Parameters:
+# 1: current
+# 2: lp1ip
+function setChargingCurrentExtopenwb () {
+	current=$1
+	lp1ip=$2
+	# set desired charging current
+	mosquitto_pub -r -t openWB/set/isss/Current -h $lp1ip -m "$current"
+}
 # function for setting the current - modbusevse
 # Parameters:
 # 1: current
@@ -230,6 +239,9 @@ function setChargingCurrent () {
 	if [[ $evsecon == "http" ]]; then
 		setChargingCurrenthttp $current
 	fi
+	if [[ $evsecon == "extopenwb" ]]; then
+		setChargingCurrentExtopenwb $current $lp1ip
+	fi
 
 	if [[ $evsecon == "modbusevse" ]]; then
 		setChargingCurrentModbus $current $modbusevsesource $modbusevseid 
@@ -408,7 +420,7 @@ if [[ $lastmanagement == "1" ]]; then
 		nrgkickpwlp1=$nrgkickpwlp2
 		evseip=$evseiplp2
 		ipevseid=$evseidlp2
-
+		lp1ip=$lp2ip
 		# dirty call (no parameters, all is set above...)
 		if (( lp2enabled == 0 )); then
 			oldcurrent=$current
@@ -438,7 +450,7 @@ if [[ $lastmanagements2 == "1" ]]; then
 		goetimeoutlp1=$goetimeoutlp3
 		evseip=$evseiplp3
 		ipevseid=$evseidlp3
-
+		lp1ip=$lp3ip
 		if (( lp3enabled == 0 )); then
 			oldcurrent=$current
 			current=0
@@ -458,6 +470,7 @@ if [[ $lastmanagementlp4 == "1" ]]; then
 		evsecon=$evseconlp4
 		evseip=$evseiplp4
 		ipevseid=$evseidlp4
+		lp1ip=$lp4ip
 		if (( lp4enabled == 0 )); then
 			oldcurrent=$current
 			current=0
@@ -477,6 +490,8 @@ if [[ $lastmanagementlp5 == "1" ]]; then
 		evsecon=$evseconlp5
 		evseip=$evseiplp5
 		ipevseid=$evseidlp5
+		lp1ip=$lp5ip
+
 		if (( lp5enabled == 0 )); then
 			oldcurrent=$current
 			current=0
@@ -496,6 +511,7 @@ if [[ $lastmanagementlp6 == "1" ]]; then
 		evsecon=$evseconlp6
 		evseip=$evseiplp6
 		ipevseid=$evseidlp6
+		lp1ip=$lp6ip
 		if (( lp6enabled == 0 )); then
 			oldcurrent=$current
 			current=0
@@ -515,6 +531,7 @@ if [[ $lastmanagementlp7 == "1" ]]; then
 		evsecon=$evseconlp7
 		evseip=$evseiplp7
 		ipevseid=$evseidlp7
+		lp1ip=$lp7ip
 		if (( lp7enabled == 0 )); then
 			oldcurrent=$current
 			current=0
@@ -534,6 +551,7 @@ if [[ $lastmanagementlp8 == "1" ]]; then
 		evsecon=$evseconlp8
 		evseip=$evseiplp8
 		ipevseid=$evseidlp8
+		lp1ip=$lp8ip
 		if (( lp8enabled == 0 )); then
 			oldcurrent=$current
 			current=0