From 7668456c4f0e245032433ab291b93cb855acb7d8 Mon Sep 17 00:00:00 2001
From: gcohen
Date: Tue, 30 Dec 2014 15:34:12 -0800
Subject: adding PN control

---
 python/examples/futureHouse/futureHouse.py | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'python')

diff --git a/python/examples/futureHouse/futureHouse.py b/python/examples/futureHouse/futureHouse.py
index 44b42ed..a7e6966 100644
--- a/python/examples/futureHouse/futureHouse.py
+++ b/python/examples/futureHouse/futureHouse.py
@@ -42,13 +42,14 @@ leds = [
     {'name': 'stove', 'minPulseLength': 150, 'maxPulseLength': 2600, 'waitFloor': 0.0001, 'waitCeiling': 0.005}
 ]
 
-
-
+def pubMessage(message):
+    print(message)
 
 def callback(message, channel):
 
     # LED Setters
     if 'ledID' in message:
+
         print "message received for LED: " + leds[message['ledID']]['name']
 
         if 'minPulseLength' in message:
@@ -64,7 +65,10 @@ def callback(message, channel):
             print "Setting waitFloor to: " + str(message['waitFloor'])
             leds[message['ledID']]['waitFloor'] = message['waitFloor']
 
-    if 'getEnviro' in message:
+        pubnub.publish(channel, leds, callback=pubMessage, error=pubMessage)
+
+
+if 'getEnviro' in message:
         enviro = {}
         enviro['temp1'] = '{0:0.2f} *C'.format(sensor.read_temperature())
         enviro['pres1'] = '{0:0.2f} Pa'.format(sensor.read_pressure())
@@ -72,9 +76,6 @@ def callback(message, channel):
         enviro['pres2'] = '{0:0.2f} Pa'.format(sensor.read_sealevel_pressure())
         enviro['humidity1'], enviro['temp2'] = Adafruit_DHT.read_retry(Adafruit_DHT.DHT11, 4)
 
-        def pubMessage(message):
-            print(message)
-
         pubnub.publish(channel, enviro, callback=pubMessage, error=pubMessage)
 
     if 'openDoor' in message:
-- 
cgit v1.2.3