Loading peripherals from yaml file moved from server to seperate file.
This commit is contained in:
		
							
								
								
									
										17
									
								
								server.py
									
									
									
									
									
								
							
							
						
						
									
										17
									
								
								server.py
									
									
									
									
									
								
							| @@ -1,26 +1,19 @@ | |||||||
| import os | import os | ||||||
| import sys | import sys | ||||||
| import yaml |  | ||||||
| from flask import Flask, request, render_template, send_file, redirect, send_from_directory | from flask import Flask, request, render_template, send_file, redirect, send_from_directory | ||||||
|  |  | ||||||
| import source # take a look in source/__init__.py | import source # take a look in source/__init__.py | ||||||
| from brewSensor import BME680Sensor, DHT11Sensor, BrewSensor |  | ||||||
| from brewCamera import BrewCamera | from brewCamera import BrewCamera | ||||||
|  | from brewSensor import BrewSensor | ||||||
| from brewRelay import BrewRelay | from brewRelay import BrewRelay | ||||||
|  | import source.loader as loader | ||||||
|  |  | ||||||
| app = Flask(__name__) | app = Flask(__name__) | ||||||
| brewCamera = BrewCamera(20) | brewCamera = BrewCamera(20) | ||||||
|  |  | ||||||
| def readYaml(filePath): | externalPeripherals = loader.load('brew.yaml') | ||||||
|   loader = yaml.SafeLoader | sensors = externalPeripherals['sensors'] | ||||||
|   loader.add_constructor('!Relay', BrewRelay.fromYaml) | relays = externalPeripherals['relays'] | ||||||
|   loader.add_constructor('!bme680', BME680Sensor.fromYaml) |  | ||||||
|   loader.add_constructor('!dht11', DHT11Sensor.fromYaml) |  | ||||||
|   return yaml.load(open(filePath, "rb"), Loader=loader) |  | ||||||
|  |  | ||||||
| rangers = readYaml('brew.yaml') |  | ||||||
| sensors = rangers['sensors'] |  | ||||||
| relays = rangers['relays'] |  | ||||||
|  |  | ||||||
| if sys.argv[-1] == '-c': | if sys.argv[-1] == '-c': | ||||||
|     brewCamera.spawnBackgroundCapture() |     brewCamera.spawnBackgroundCapture() | ||||||
|   | |||||||
							
								
								
									
										12
									
								
								source/loader.py
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										12
									
								
								source/loader.py
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,12 @@ | |||||||
|  | import yaml | ||||||
|  |  | ||||||
|  | from brewSensor import BME680Sensor, DHT11Sensor | ||||||
|  | from brewRelay import BrewRelay | ||||||
|  |  | ||||||
|  | def load(filePath): | ||||||
|  |   loader = yaml.SafeLoader | ||||||
|  |   loader.add_constructor('!Relay', BrewRelay.fromYaml) | ||||||
|  |   loader.add_constructor('!bme680', BME680Sensor.fromYaml) | ||||||
|  |   loader.add_constructor('!dht11', DHT11Sensor.fromYaml) | ||||||
|  |   return yaml.load(open(filePath, "rb"), Loader=loader) | ||||||
|  |  | ||||||
		Reference in New Issue
	
	Block a user