diff --git a/server.py b/server.py index 1e55140..f28d85e 100644 --- a/server.py +++ b/server.py @@ -2,6 +2,8 @@ import os import sys import yaml from flask import Flask, request, render_template, send_file, redirect, send_from_directory + +import source # take a look in source/__init__.py from brewSensor import BCM600Sensor, DHT11Sensor, BrewSensor from brewCamera import BrewCamera from brewRelay import BrewRelay diff --git a/source/__init__.py b/source/__init__.py new file mode 100644 index 0000000..aedcba7 --- /dev/null +++ b/source/__init__.py @@ -0,0 +1,5 @@ +print('at init') + +import sys +sys.path.append('/home/pi/brewLogger/source') +print('added to source') diff --git a/brewCamera.py b/source/brewCamera.py similarity index 100% rename from brewCamera.py rename to source/brewCamera.py diff --git a/brewRelay.py b/source/brewRelay.py similarity index 100% rename from brewRelay.py rename to source/brewRelay.py diff --git a/brewSensor.py b/source/brewSensor.py similarity index 98% rename from brewSensor.py rename to source/brewSensor.py index 73787fe..1cb45c6 100644 --- a/brewSensor.py +++ b/source/brewSensor.py @@ -183,7 +183,8 @@ class BCM600Sensor(BrewSensor): if __name__ == '__main__': - brewSensor = DHT11Sensor(13, 'outside', 30) +# brewSensor = DHT11Sensor(13, 'outside', 30) + brewSensor = BCM600Sensor('inside', 2) while True: print(brewSensor.temp) diff --git a/logger.py b/source/logger.py similarity index 100% rename from logger.py rename to source/logger.py diff --git a/utils.py b/source/utils.py similarity index 91% rename from utils.py rename to source/utils.py index 600ab4c..652da88 100644 --- a/utils.py +++ b/source/utils.py @@ -12,7 +12,7 @@ def loadYaml(filePath): def getConfig(): pwd = os.path.dirname(os.path.abspath(__file__)) - path = os.path.join(pwd, 'config.yaml') + path = os.path.join(pwd,'../', 'config.yaml') if not os.path.isfile(path): print('Please fill out and rename config file. Check README for more info.')