X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=third-party%2Floft.groovy;h=776e3316ef99dbb55a072c6795d472519050c367;hb=d3a41445973a57c2a085e925eab03a625f93b726;hp=bacb2c617bea255cf31d5a40a9a398fba7a90593;hpb=3325c1b0cc49b9fbbc497cb3612f7aeff5263eca;p=smartapps.git

diff --git a/third-party/loft.groovy b/third-party/loft.groovy
index bacb2c6..776e331 100755
--- a/third-party/loft.groovy
+++ b/third-party/loft.groovy
@@ -22,7 +22,7 @@ definition(
     iconX3Url: "https://s3.amazonaws.com/smartapp-icons/Convenience/Cat-Convenience@2x.png")
 
 preferences {
-    page(name: selectThings)
+    page(name: "selectThings")
 }
 
 def selectThings() {
@@ -58,16 +58,16 @@ def updated() {
 }
 
 def initialize() {
-    subscribe(monitor_switches, "switch", eventHandler)
-    subscribe(monitor_motion, "motion", eventHandler)
-    subscribe(monitor_presence, "presence", eventHandler)
-    subscribe(location, "mode", eventHandler)
-    subscribe(location, "sunset", eventHandler)
-    subscribe(location, "sunrise", eventHandler)
+    subscribe(monitor_switches, "switch", eventHandler1)
+    subscribe(monitor_motion, "motion", eventHandler1)
+    subscribe(monitor_presence, "presence", eventHandler1)
+    subscribe(location, "mode", eventHandler1)
+    subscribe(location, "sunset", eventHandler1)
+    subscribe(location, "sunrise", eventHandler1)
     tick()
 }
 
-def eventHandler(evt) {
+def eventHandler1(evt) {
     def everyone_here = presense_is_after(monitor_presence, "present", 10)
     def everyone_gone = presense_is_after(monitor_presence, "not present", 10)
     def current_count = monitor_presence.findAll { it.currentPresence == "present" }.size()
@@ -215,14 +215,14 @@ def eventHandler(evt) {
 def changeMode(mode) {
     //voice?.speak("changing mode to ${mode}")
     setLocationMode(mode)
-    eventHandler([
+    eventHandler1([
         displayName: "changeMode",
         value:       mode
     ])
 }
 
 def tick() {
-    eventHandler([
+    eventHandler1([
       displayName: "tick",
       value: "tock"
     ])
@@ -243,7 +243,8 @@ def webhook(map) {
 
 
 private is_daytime() {
-    def data = getWeatherFeature("astronomy")
+    return true
+    /*def data = getWeatherFeature("astronomy")
     def sunset = "${data.moon_phase.sunset.hour}${data.moon_phase.sunset.minute}"
     def sunrise = "${data.moon_phase.sunrise.hour}${data.moon_phase.sunrise.minute}"
     def current = "${data.moon_phase.current_time.hour}${data.moon_phase.current_time.minute}"
@@ -252,7 +253,7 @@ private is_daytime() {
     }
     else {
         return false
-    }
+    }*/
 }
 
 private presense_is_after(people, presence, minutes) {