Fixed a lot of bugs originating from going live

killSite.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+sudo pkill python
+echo Killing website

website.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+cd website
+sudo python3 coolerControl.py & 
+sudo python3 saveTempData.py &
+sudo python3 tempLogger.py &
+sudo python3 homepage.py &

website/PIN/pinRead.py

@@ -0,0 +1,10 @@
+import RPi.GPIO as GPIO
+import time
+import numpy as np
+
+GPIO.setmode(GPIO.BCM)
+GPIO.setwarnings(False)
+while True:
+    pin = int(input("Choose a pin: "))
+    GPIO.setup(int(pin),GPIO.OUT)
+    print(str(GPIO.input(pin)))

website/PIN/writePin.py

@@ -0,0 +1,16 @@
+import RPi.GPIO as GPIO
+import time
+import numpy as np
+
+GPIO.setmode(GPIO.BCM)
+GPIO.setwarnings(False)
+while True:
+    pin = int(input("Choose a pin: "))
+    GPIO.setup(int(pin),GPIO.OUT)
+    print("Pin " + str(pin) + " status:"+str(GPIO.input(pin)))
+    if (GPIO.input(pin) == 0):
+        print("Turning it on")
+        GPIO.output(pin,GPIO.HIGH)
+    else:
+        print("Turning it off")
+        GPIO.output(pin,GPIO.LOW)

website/__pycache__/PIN/writePin.py

@@ -0,0 +1,18 @@
+import RPi.GPIO as GPIO
+import time
+import tempRead
+import target
+import numpy as np
+
+GPIO.setmode(GPIO.BCM)
+GPIO.setwarnings(False)
+while True:
+    pin = int(input("Choose a pin: "))
+    GPIO.setup(int(pin),GPIO.OUT)
+    print("Pin " + str(pin) + " status:"+str(GPIO.input(pin)))
+    if (pin == 0):
+        print("Turning it on")
+        GPIO.output(pin,GPIO.HIGH)
+    else:
+        print("Turning it off")
+        GPIO.output(pin,GPIO.LOW)

website/coolerControl.py

@@ -1,31 +1,47 @@
 import RPi.GPIO as GPIO
 import time
-import tempRead
-import target
 import numpy as np
-
+import target
+import tempRead
 GPIO.setmode(GPIO.BCM)
 GPIO.setwarnings(False)
-pumps = 14
-peltier = 15
+pumps = 24
+peltier = 25
 GPIO.setup(pumps,GPIO.OUT)
 GPIO.setup(peltier,GPIO.OUT)
 recentlyCycled = False
 coolers = False
 while True:
 
     try:
-        tempTarget = target.readTarget()
-        tempTarget = float(tempTarget)
 
+        try:
+            tempTarget = target.readTarget()
+            tempTarget = float(tempTarget)
+        except:
+            tempTarget = 3
+            print("Something went wrong, could not read TempTarget")
+        time.sleep(0.01)
+        #print("\n\n")
+
+        #print(tempTarget)
+        #print("ok")
+	#print(GPIO.input(pumps))
+        try:
+            actualTemp = tempRead.get_temp()
+        except:
+            print("Could not read temp")
+            actualTemp = 5
+        #print(actualTemp)
+        #print("her")
         #actualTemp = tempRead.read_temp()
-        actualTemp = tempRead.get_temp()
-        if tempTarget > actualTemp + 0.5 and GPIO.input(pumps) == 1:
+        #actualTemp = tempRead.get_temp()
+        if tempTarget > float(actualTemp) + 0.5 and GPIO.input(pumps) == 1:
             print("Turning OFF coolers")
             GPIO.output(pumps,GPIO.LOW)
             GPIO.output(peltier,GPIO.LOW)
             recentlyCycled = False
-        elif tempTarget< actualTemp and GPIO.input(pumps) == 0:
+        elif tempTarget < actualTemp and GPIO.input(pumps) == 0:
             print("Turning ON coolers")
             GPIO.output(pumps,GPIO.HIGH)
             GPIO.output(peltier,GPIO.HIGH)
@@ -34,10 +50,11 @@
             GPIO.output(pumps,GPIO.HIGH)
             GPIO.output(peltier,GPIO.HIGH)
             print("Cycling hot water")
-            time.sleep(2)
+            time.sleep(5)
             GPIO.output(pumps,GPIO.LOW)
             GPIO.output(peltier,GPIO.LOW)
             recentlyCycled = True
+
         '''except Exception as e:
             print("Failed to do it")
             print(e)
@@ -47,6 +64,6 @@
             print("Failed to do it")
             #exit()'''
     except:
-        a = 2
+        print("\n\nSomething went terribly wrong!!!\n\n")
 
 

website/coolerControl.py.save

@@ -0,0 +1,57 @@
+import RPi.GPIO as GPIO
+import time
+import numpy as np
+
+GPIO.setmode(GPIO.BCM)
+GPIO.setwarnings(False)
+pumps = 24
+peltier = 25
+GPIO.setup(pumps,GPIO.OUT)
+GPIO.setup(peltier,GPIO.OUT)
+recentlyCycled = False
+coolers = False
+while True:
+
+    try:
+       # print("FUCK")
+        tempTarget = target.readTarget()
+        tempTarget = float(tempTarget)
+        time.sleep(0.01)
+        #print("\n\n")
+        print(tempTarget)
+        print(GPIO.input(pumps))
+        actualTemp = tempRead.get_temp()
+        print(actualTemp)
+        print("\n\n")
+        #actualTemp = tempRead.read_temp()
+        #actualTemp = tempRead.get_temp()
+        if tempTarget > actualTemp + 0.5 and GPIO.input(pumps) == 1:
+            print("Turning OFF coolers")
+            GPIO.output(pumps,GPIO.LOW)
+            GPIO.output(peltier,GPIO.LOW)
+            recentlyCycled = False
+        elif tempTarget< actualTemp and GPIO.input(pumps) == 0:
+            print("Turning ON coolers")
+            GPIO.output(pumps,GPIO.HIGH)
+            GPIO.output(peltier,GFOPIO.HIGH)
+            recentlyCycled = False
+        elif tempTarget < actualTemp + 0.2 and GPIO.input(pumps) == 0 and recentlyCycled == False:
+            GPIO.output(pumps,GPIO.HIGH)
+            GPIO.output(peltier,GPIO.HIGH)
+            print("Cycling hot water")
+            time.sleep(5)
+            GPIO.output(pumps,GPIO.LOW)
+            GPIO.output(peltier,GPIO.LOW)
+            recentlyCycled = True
+        '''except Exception as e:
+            print("Failed to do it")
+            print(e)
+            print(type(tempTarget))
+            print(type(actualTemp))
+            print(type(GPIO.input(14)))
+            print("Failed to do it")
+            #exit()'''
+    except:
+        a = 2
+
+

website/coolerControl.py.save.1

@@ -0,0 +1,58 @@
+import RPi.GPIO as GPIO
+import time
+import numpy as np
+import target
+GPIO.setmode(GPIO.BCM)
+GPIO.setwarnings(False)
+pumps = 24
+peltier = 25
+GPIO.setup(pumps,GPIO.OUT)
+GPIO.setup(peltier,GPIO.OUT)
+recentlyCycled = False
+coolers = False
+while True:
+
+    try:
+
+        tempTarget = target.readTarget(
+        tempTarget = float(tempTarget)
+        time.sleep(0.01)
+        #print("\n\n")
+        print("ok")
+        print(tempTarget)
+        print(GPIO.input(pumps))
+        actualTemp = tempRead.get_temp()
+        print(actualTemp)
+        print("\n\n")
+        #actualTemp = tempRead.read_temp()
+        #actualTemp = tempRead.get_temp()
+        if tempTarget > actualTemp + 0.5 and GPIO.input(pumps) == 1:
+            print("Turning OFF coolers")
+            GPIO.output(pumps,GPIO.LOW)
+            GPIO.output(peltier,GPIO.LOW)
+            recentlyCycled = False
+        elif tempTarget< actualTemp and GPIO.input(pumps) == 0:
+            print("Turning ON coolers")
+            GPIO.output(pumps,GPIO.HIGH)
+            GPIO.output(peltier,GFOPIO.HIGH)
+            recentlyCycled = False
+        elif tempTarget < actualTemp + 0.2 and GPIO.input(pumps) == 0 and recentlyCycled == False:
+            GPIO.output(pumps,GPIO.HIGH)
+            GPIO.output(peltier,GPIO.HIGH)
+            print("Cycling hot water")
+            time.sleep(5)
+            GPIO.output(pumps,GPIO.LOW)
+            GPIO.output(peltier,GPIO.LOW)
+            recentlyCycled = True
+        '''except Exception as e:
+            print("Failed to do it")
+            print(e)
+            print(type(tempTarget))
+            print(type(actualTemp))
+            print(type(GPIO.input(14)))
+            print("Failed to do it")
+            #exit()'''
+    except:
+        a = 2
+
+

website/homepage.py

@@ -14,7 +14,7 @@
 import RPi.GPIO as GPIO
 GPIO.setmode(GPIO.BCM)
 GPIO.setwarnings(False)
-GPIO.setup(14,GPIO.OUT)
+GPIO.setup(24,GPIO.OUT)
 
 s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
 s.connect(("8.8.8.8", 80))
@@ -24,11 +24,11 @@
 @app.route('/',methods = ['GET'])
 @app.route('/send',methods = ['GET','POST'])
 def send():
-    return render_template('age.html', ip=s.getsockname()[0])
+    return render_template('age.html', ip="ecbeer.dk")#=s.getsockname()[0])
 
 @app.route('/admin',methods = ['GET','POST'])
 def admin():
-    return render_template('admin.html', ip=s.getsockname()[0])
+    return render_template('admin.html', ip="ecbeer.dk")#ip=s.getsockname()[0])
 
 @app.route('/images',methods = ['GET','POST'])
 def images():
@@ -60,7 +60,7 @@ def charts():
 @app.route('/readTarget',methods = ['GET','POST'])
 
 def readTarget():
-    list ={'target':[target.readTarget()],'status':[str(GPIO.input(14))]}
+    list ={'target':[target.readTarget()],'status':[str(GPIO.input(24))]}
     return jsonify(list) #Returns JSON with list
 
 
@@ -78,7 +78,18 @@ def estimate():
     list ={'estimate':[ai.estimate()]}
     return jsonify(list) #Returns JSON with list
 
+@app.route('/turnOff',methods = ['GET','POST'])
+def turnOff():
+    os.system("sudo shutdown -h now")
+
+@app.route('/reboot',methods = ['GET','POST'])
+def reboot():
+    print("Rebooting")
+    os.system("sudo reboot")
+
 if __name__ == '__main__':
     app.run(debug=False,port=80,host='0.0.0.0')    
 
 
+
+

website/pinRead.py

@@ -0,0 +1,12 @@
+import RPi.GPIO as GPIO
+import time
+import tempRead
+import target
+import numpy as np
+
+GPIO.setmode(GPIO.BCM)
+GPIO.setwarnings(False)
+while True:
+    pin = int(input("Choose a pin: "))
+    GPIO.setup(int(pin),GPIO.OUT)
+    print(str(GPIO.input(pin)))

website/targetTemp.txt

@@ -1 +1 @@
-3
+10

website/tempData.txt

@@ -1 +1 @@
-17.75;28.625
+19.437;33.125

website/tempDataMain.txt

@@ -1 +1 @@
-5.312
+5.375

website/tempRead.py

@@ -35,9 +35,10 @@ def read_temp():
    file.close()
    return(parsedTemp,f[:f.find(";")],f[f.find(";")+1:])
 def get_temp():
+   #print("OK")
    parsedTemp = parse_temp(temp_sensor0)
    f = open("tempDataMain.txt","w")
    f.write(str(parsedTemp))
    f.close()
-   return parsedTemp
-print(get_temp())
+   return parsedTemp # parsedTemp
+#print(get_temp())