fixed typo at switch.cgi (rec

[svn42.git] / switch-power.py

diff --git a/switch-power.py b/switch-power.py
index 9f0a3a1..c870760 100755 (executable)
--- a/switch-power.py
+++ b/switch-power.py
@@ -207,18 +207,35 @@ def eventNobodyHere():
     time.sleep(0.2)
     switchPower(id,False)
 
+##def eventPanic():
+##  logging.info("eventPanic(): switching around: "+uwscfg.slug_ids_panic)
+##  lst1 = uwscfg.slug_ids_panic.split(" ")
+##  lst2 = map(lambda e:[e,False], lst1)
+##  for id in lst1:
+##    switchPower(id,False)
+##  for delay in map(lambda e: (40-e)/33.0,range(10,33)):
+##    e = random.choice(lst2)
+##    e[1]=not e[1]
+##    switchPower(e[0],e[1]) 
+##    time.sleep(delay)
+##  random.shuffle(lst1)
+##  for id in lst1:
+##    switchPower(id,False)
+##  time.sleep(1.2)
+##  eventPresent()
+    
 def eventPanic():
   logging.info("eventPanic(): switching around: "+uwscfg.slug_ids_panic)
   lst1 = uwscfg.slug_ids_panic.split(" ")
-  lst2 = map(lambda e:[e,True], lst1)
+  lst2 = map(lambda e:[e,False], lst1)
   for id in lst1:
-    switchPower(id,True)
-  for delay in map(lambda e: (40-e)/33.0,range(0,20)):
-    e = random.choice(lst2)
-    e[1]=not e[1]
-    switchPower(e[0],e[1]) 
+    switchPower(id,False)
+  for times in range(1,6):
+    delay = random.choice([0.3,1.4,0.9,0.5,0.3,1.4,0.9,0.5,2.2])
     time.sleep(delay)
-  random.shuffle(lst1)
+    for e in lst2:
+      e[1]=not e[1]
+      switchPower(e[0],e[1]) 
   for id in lst1:
     switchPower(id,False)
   time.sleep(1.2)
@@ -315,7 +332,10 @@ while True:
         continue
       m = RE_PHOTO.match(line)
       if not m is None:
-        if m.group(1) >= int(uwscfg.slug_light_threshold_brightness):
+        light_value = int(m.group(1))
+        light_threshold = int(uwscfg.slug_light_threshold_brightness)
+        #logging.debug("photo value: %d  threshold: %s" % (light_value,light_threshold))
+        if light_value >= light_threshold:
           eventRoomGotBright()
         else:
           eventRoomGotDark()