Bugfix (snaptec#1067)

* formatting and cleanup

* bump version 1.9.102

goecheck.sh

@@ -1,76 +1,76 @@
 #!/bin/bash
 goecheck(){
-#######################################
-#goe mobility check
-if [[ $evsecon == "goe" ]]; then
-	output=$(curl --connect-timeout 1 -s http://$goeiplp1/status)
-	if [[ $? == "0" ]] ; then
-		state=$(echo $output | jq -r '.alw')
-		if grep -q 1 "/var/www/html/openWB/ramdisk/ladestatus"; then
-			lp1enabled=$(</var/www/html/openWB/ramdisk/lp1enabled)
-			if ((state == "0")) && (( lp1enabled == "1" )) ; then
-				curl --silent --connect-timeout $goetimeoutlp1 -s http://$goeiplp1/mqtt?payload=alw=1 > /dev/null
-			fi
-		fi
-		if grep -q 0 "/var/www/html/openWB/ramdisk/ladestatus"; then
-			if ((state == "1")) ; then
-				curl --silent --connect-timeout $goetimeoutlp1 -s http://$goeiplp1/mqtt?payload=alw=0 > /dev/null
-			fi
-		fi
-		oldcurrent=$(echo $output | jq -r '.amp')
-		current=$(</var/www/html/openWB/ramdisk/llsoll)
-		if (( oldcurrent != $current )) ; then
-			curl --silent --connect-timeout $goetimeoutlp1 -s http://$goeiplp1/mqtt?payload=amp=$current > /dev/null
-		fi
-	fi
-fi
-if [[ $lastmanagement == "1" ]]; then
-	if [[ $evsecons1 == "goe" ]]; then
-		output=$(curl --connect-timeout 1 -s http://$goeiplp2/status)
+	#######################################
+	#goe mobility check
+	if [[ $evsecon == "goe" ]]; then
+		output=$(curl --connect-timeout 1 -s http://$goeiplp1/status)
 		if [[ $? == "0" ]] ; then
 			state=$(echo $output | jq -r '.alw')
-			if grep -q 1 "/var/www/html/openWB/ramdisk/ladestatuss1"; then
-				lp2enabled=$(</var/www/html/openWB/ramdisk/lp2enabled)
-
-				if ((state == "0"))  && (( lp2enabled == "1" )) ; then
-					curl --silent --connect-timeout $goetimeoutlp2 -s http://$goeiplp2/mqtt?payload=alw=1 > /dev/null
+			if grep -q 1 "/var/www/html/openWB/ramdisk/ladestatus"; then
+				lp1enabled=$(</var/www/html/openWB/ramdisk/lp1enabled)
+				if ((state == "0")) && (( lp1enabled == "1" )) ; then
+					curl --silent --connect-timeout $goetimeoutlp1 -s http://$goeiplp1/mqtt?payload=alw=1 > /dev/null
 				fi
 			fi
-			if grep -q 0 "/var/www/html/openWB/ramdisk/ladestatuss1"; then
+			if grep -q 0 "/var/www/html/openWB/ramdisk/ladestatus"; then
 				if ((state == "1")) ; then
-					curl --silent --connect-timeout $goetimeoutlp2 -s http://$goeiplp2/mqtt?payload=alw=0 > /dev/null
+					curl --silent --connect-timeout $goetimeoutlp1 -s http://$goeiplp1/mqtt?payload=alw=0 > /dev/null
 				fi
 			fi
 			oldcurrent=$(echo $output | jq -r '.amp')
-			current=$(</var/www/html/openWB/ramdisk/llsolls1)
+			current=$(</var/www/html/openWB/ramdisk/llsoll)
 			if (( oldcurrent != $current )) ; then
-				curl --silent --connect-timeout $goetimeoutlp2 -s http://$goeiplp2/mqtt?payload=amp=$current > /dev/null
+				curl --silent --connect-timeout $goetimeoutlp1 -s http://$goeiplp1/mqtt?payload=amp=$current > /dev/null
 			fi
 		fi
 	fi
-	if [[ $lastmanagements2 == "1" ]]; then
-		if [[ $evsecons2 == "goe" ]]; then
-			output=$(curl --connect-timeout 1 -s http://$goeiplp3/status)
+	if [[ $lastmanagement == "1" ]]; then
+		if [[ $evsecons1 == "goe" ]]; then
+			output=$(curl --connect-timeout 1 -s http://$goeiplp2/status)
 			if [[ $? == "0" ]] ; then
 				state=$(echo $output | jq -r '.alw')
-				if grep -q 1 "/var/www/html/openWB/ramdisk/ladestatuss2"; then
-					lp3enabled=$(</var/www/html/openWB/ramdisk/lp3enabled)
-					if ((state == "0"))  && (( lp3enabled == "1" ))  ; then
-						curl --silent --connect-timeout $goetimeoutlp3 -s http://$goeiplp3/mqtt?payload=alw=1 > /dev/null
+				if grep -q 1 "/var/www/html/openWB/ramdisk/ladestatuss1"; then
+					lp2enabled=$(</var/www/html/openWB/ramdisk/lp2enabled)
+
+					if ((state == "0"))  && (( lp2enabled == "1" )) ; then
+						curl --silent --connect-timeout $goetimeoutlp2 -s http://$goeiplp2/mqtt?payload=alw=1 > /dev/null
 					fi
 				fi
-				if grep -q 0 "/var/www/html/openWB/ramdisk/ladestatuss2"; then
+				if grep -q 0 "/var/www/html/openWB/ramdisk/ladestatuss1"; then
 					if ((state == "1")) ; then
-						curl --silent --connect-timeout $goetimeoutlp3 -s http://$goeiplp3/mqtt?payload=alw=0 > /dev/null
+						curl --silent --connect-timeout $goetimeoutlp2 -s http://$goeiplp2/mqtt?payload=alw=0 > /dev/null
 					fi
 				fi
 				oldcurrent=$(echo $output | jq -r '.amp')
-				current=$(</var/www/html/openWB/ramdisk/llsolls2)
+				current=$(</var/www/html/openWB/ramdisk/llsolls1)
 				if (( oldcurrent != $current )) ; then
-					curl --silent --connect-timeout $goetimeoutlp3 -s http://$goeiplp3/mqtt?payload=amp=$current > /dev/null
+					curl --silent --connect-timeout $goetimeoutlp2 -s http://$goeiplp2/mqtt?payload=amp=$current > /dev/null
+				fi
+			fi
+		fi
+		if [[ $lastmanagements2 == "1" ]]; then
+			if [[ $evsecons2 == "goe" ]]; then
+				output=$(curl --connect-timeout 1 -s http://$goeiplp3/status)
+				if [[ $? == "0" ]] ; then
+					state=$(echo $output | jq -r '.alw')
+					if grep -q 1 "/var/www/html/openWB/ramdisk/ladestatuss2"; then
+						lp3enabled=$(</var/www/html/openWB/ramdisk/lp3enabled)
+						if ((state == "0"))  && (( lp3enabled == "1" ))  ; then
+							curl --silent --connect-timeout $goetimeoutlp3 -s http://$goeiplp3/mqtt?payload=alw=1 > /dev/null
+						fi
+					fi
+					if grep -q 0 "/var/www/html/openWB/ramdisk/ladestatuss2"; then
+						if ((state == "1")) ; then
+							curl --silent --connect-timeout $goetimeoutlp3 -s http://$goeiplp3/mqtt?payload=alw=0 > /dev/null
+						fi
+					fi
+					oldcurrent=$(echo $output | jq -r '.amp')
+					current=$(</var/www/html/openWB/ramdisk/llsolls2)
+					if (( oldcurrent != $current )) ; then
+						curl --silent --connect-timeout $goetimeoutlp3 -s http://$goeiplp3/mqtt?payload=amp=$current > /dev/null
+					fi
 				fi
 			fi
 		fi
 	fi
-fi
 }

modules/llbuchse/main.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
 echo 0 > /dev/null
-#all handled in buchsecontrol.py
+#all handled in buchse.py

runs/buchseact.py

@@ -14,13 +14,13 @@
 if action == "auf":
     GPIO.output(11, GPIO.LOW)
     GPIO.output(7, GPIO.HIGH)
-    print "7 low 11 high"
+    print( "7 low 11 high" )
     time.sleep(3)
     GPIO.output(7, GPIO.LOW)
 if action == "zu":
     GPIO.output(11, GPIO.HIGH)
     GPIO.output(7, GPIO.HIGH)
-    print "11 high, 7 high"
+    print( "11 high, 7 high" )
     time.sleep(3)
     GPIO.output(7, GPIO.LOW)
 

runs/cpuremote.py

@@ -1,14 +1,13 @@
 #!/usr/bin/python
-from pymodbus.client.sync import ModbusTcpClient
 import sys
 import os
 import time
+from pymodbus.client.sync import ModbusTcpClient
+
 seradd = str(sys.argv[1])
 serid = int(4)
 
-from pymodbus.client.sync import ModbusTcpClient
 client = ModbusTcpClient(seradd, port=8899)
 rq = client.write_register(0x0001, 256, unit=serid)
 time.sleep(2)
 rq = client.write_register(0x0001, 512, unit=serid)
-

runs/evseipwriteall.py

@@ -1,9 +1,11 @@
 #!/usr/bin/python3
 import sys
-ipadd = str(sys.argv[2])
 from pymodbus.client.sync import ModbusTcpClient
-client = ModbusTcpClient(ipadd, port=8899)
+
 lla = int(sys.argv[1])
+ipadd = str(sys.argv[2])
 evseid = int(sys.argv[3])
 wreg = int(sys.argv[4])
+
+client = ModbusTcpClient(ipadd, port=8899)
 rq = client.write_registers(wreg, lla, unit=evseid)

runs/evseipwritemodbus.py

@@ -1,8 +1,10 @@
 #!/usr/bin/python3
 import sys
-ipadd = str(sys.argv[2])
 from pymodbus.client.sync import ModbusTcpClient
-client = ModbusTcpClient(ipadd, port=8899)
+
 lla = int(sys.argv[1])
+ipadd = str(sys.argv[2])
 evseid = int(sys.argv[3])
+
+client = ModbusTcpClient(ipadd, port=8899)
 rq = client.write_registers(1000, lla, unit=evseid)

runs/evsemasterethframerwritemodbus.py

@@ -2,6 +2,8 @@
 import sys
 from pymodbus.transaction import ModbusRtuFramer
 from pymodbus.client.sync import ModbusTcpClient
-client = ModbusTcpClient('192.168.193.18', port=8899, framer=ModbusRtuFramer)
+
 lla = int(sys.argv[1])
+
+client = ModbusTcpClient('192.168.193.18', port=8899, framer=ModbusRtuFramer)
 rq = client.write_registers(1000, lla, unit=1)

runs/evseslavewritemodbus.py

@@ -1,7 +1,8 @@
 #!/usr/bin/python3
 import sys
-
 from pymodbus.client.sync import ModbusTcpClient
-client = ModbusTcpClient('192.168.193.16', port=8899)
+
 lla = int(sys.argv[1])
+
+client = ModbusTcpClient('192.168.193.16', port=8899)
 rq = client.write_registers(1000, lla, unit=1)