senaduka/old-tfm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added config prefix

Browse Source
This commit is contained in:
Senad Uka
2016-01-24 09:18:14 +01:00
parent f7061ab3da
commit d0657960f4
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
controller/sensors.py
View File

@@ -17,7 +17,7 @@ else:
# Try to grab a sensor reading. Use the read_retry method which will retry up # Try to grab a sensor reading. Use the read_retry method which will retry up
# to 15 times to get a sensor reading (waiting 2 seconds between each retry). # to 15 times to get a sensor reading (waiting 2 seconds between each retry).
humidity, temperature = Adafruit_DHT.read_retry(SENSOR_TYPE, GPIO_PIN_DHT) humidity, temperature = Adafruit_DHT.read_retry(SENSOR_TYPE, config.GPIO_PIN_DHT)
# Un-comment the line below to convert the temperature to Fahrenheit. # Un-comment the line below to convert the temperature to Fahrenheit.
# temperature = temperature * 9/5.0 + 32 # temperature = temperature * 9/5.0 + 32
@@ -27,7 +27,7 @@ humidity, temperature = Adafruit_DHT.read_retry(SENSOR_TYPE, GPIO_PIN_DHT)
# guarantee the timing of calls to read the sensor). # guarantee the timing of calls to read the sensor).
# If this happens try again! # If this happens try again!
if temperature is not None and humidity is not None: if temperature is not None and humidity is not None:
response = requests.post(SENSORDATA_URL, json={"owner": owner, "temperatureValue": temperature, "humidityValue":humidity}) response = requests.post(config.SENSORDATA_URL, json={"owner": owner, "temperatureValue": temperature, "humidityValue":humidity})
print 'Temp={0:0.1f}*C'.format(temperature) print 'Temp={0:0.1f}*C'.format(temperature)
print 'Humidity={0:0.1f}%'.format(humidity) print 'Humidity={0:0.1f}%'.format(humidity)
if response.status_code != 200: if response.status_code != 200:

6
controller/state/__init__.py
View File

@@ -1,8 +1,8 @@
import config
def sync(): def sync():
server = Server(API_BASE_URL, CONTROLLER_ID) server = Server(config.API_BASE_URL, config.CONTROLLER_ID)
local = File(STATE_FILE) local = File(config.STATE_FILE)
server_state = server.get_state() server_state = server.get_state()
if local.present(): if local.present():

6
controller/state/changer.py
View File

@@ -7,7 +7,7 @@ class Changer(object):
self.local_state = local_state self.local_state = local_state
self.remote_state = remote_state self.remote_state = remote_state
GPIO.setmode(GPIO.BCM) # Broadcom pin-numbering scheme GPIO.setmode(GPIO.BCM) # Broadcom pin-numbering scheme
GPIO.setup(GPIO_PIN_VALVE, GPIO.OUT) GPIO.setup(config.GPIO_PIN_VALVE, GPIO.OUT)
self.states = { self.states = {
'opening': self.open_valve, 'opening': self.open_valve,
@@ -26,11 +26,11 @@ class Changer(object):
return self.local_state return self.local_state
def open_valve(): def open_valve():
GPIO.output(GPIO_PIN_VALVE, GPIO.HIGH) GPIO.output(config.GPIO_PIN_VALVE, GPIO.HIGH)
self.local_state['out_valve'] = 'open' self.local_state['out_valve'] = 'open'
def close_valve(): def close_valve():
GPIO.output(GPIO_PIN_VALVE, GPIO.LOW) GPIO.output(config.GPIO_PIN_VALVE, GPIO.LOW)
self.local_state['out_valve'] = 'closed' self.local_state['out_valve'] = 'closed'
def validate_states(self): def validate_states(self):