X-Git-Url: https://git.realraum.at/?a=blobdiff_plain;f=switch-power.py;h=0c8069d2610f618fca6c3cbaf7572d34184ae55f;hb=3d9f800ee0d70494066035af472fcef381a7496c;hp=98809767930a501e697b429d1ccd5ebb4db2d87c;hpb=92a01973880a2748478f7e57ecd992bf04a88d5a;p=svn42.git

diff --git a/switch-power.py b/switch-power.py
index 9880976..0c8069d 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','sterep werkzeug ymhcd')
-    self.config_parser.set('slug','ids_present_day_dark_room','stereo decke werkzeug ymhcd')
-    self.config_parser.set('slug','ids_present_night','stereo werkzeug schreibtisch idee labor ymhcd')
-    self.config_parser.set('slug','ids_panic','idee ymhmute schreibtisch labor werkzeug deckevorne deckehinten')
-    self.config_parser.set('slug','ids_nonpresent_off','lichter stereo lichter')
+    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')
@@ -211,7 +211,9 @@ 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)):
+  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]) 
@@ -313,7 +315,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()