X-Git-Url: https://git.realraum.at/?a=blobdiff_plain;f=switch-power.py;h=c8707603d886558f0d2354ca7d5059d7c286714e;hb=a8262dc8575deeac26e4d19a33ee12841d2e9a78;hp=e51562c0f3310aad3a68a4e4ccbb2568acaa9b47;hpb=4c1846de7736a0cadc7a4f58d09a99a869cceffe;p=svn42.git

diff --git a/switch-power.py b/switch-power.py
index e51562c..c870760 100755
--- a/switch-power.py
+++ b/switch-power.py
@@ -36,11 +36,11 @@ class UWSConfig:
     self.config_parser.add_section('slug')
     self.config_parser.set('slug','cgiuri','http://slug.realraum.at/cgi-bin/switch.cgi?id=%ID%&power=%ONOFF%')
     self.config_parser.set('slug','ids_logo','logo')
-    self.config_parser.set('slug','ids_present_day_bright_room','werkzeug')
-    self.config_parser.set('slug','ids_present_day_dark_room','decke werkzeug')
-    self.config_parser.set('slug','ids_present_night','werkzeug schreibtisch idee labor')
-    self.config_parser.set('slug','ids_panic','idee schreibtisch labor werkzeug deckevorne deckehinten')
-    self.config_parser.set('slug','ids_nonpresent_off','lichter stereo')
+    self.config_parser.set('slug','ids_present_day_bright_room','ymhpoweron werkzeug ymhcd')
+    self.config_parser.set('slug','ids_present_day_dark_room','ymhpoweron decke werkzeug ymhcd')
+    self.config_parser.set('slug','ids_present_night','ymhpoweron werkzeug schreibtisch idee labor ymhcd')
+    self.config_parser.set('slug','ids_panic','idee ymhmute labor werkzeug deckevorne deckehinten')
+    self.config_parser.set('slug','ids_nonpresent_off','ymhvoldown ymhvoldown ymhvoldown ymhvoldown ymhvoldown ymhvoldown ymhvoldown ymhvoldown ymhvoldown ymhvoldown ymhvoldown ymhvoldown lichter ymhpoweroff lichter')
     self.config_parser.set('slug','light_threshold_brightness','400')
     #self.config_parser.set('slug','time_day','6:00-17:00')
     self.config_parser.add_section('debug')
@@ -204,21 +204,38 @@ def eventNobodyHere():
   present_ids=uwscfg.slug_ids_nonpresent_off
   logging.info("event: noone here, switching off: "+present_ids)
   for id in present_ids.split(" "):
-    switchPower(id,False)
-  for id in present_ids.split(" "):
-    time.sleep(0.3)
+    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)
-  for delay in map(lambda e: (40-e)/133.0,range(0,20)):
-    e = random.choice(lst2)
-    e[1]=not e[1]
-    switchPower(e[0],e[1]) 
+  lst2 = map(lambda e:[e,False], lst1)
+  for id in lst1:
+    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()