X-Git-Url: https://git.realraum.at/?a=blobdiff_plain;f=switch-power.py;h=9f0a3a1654df108e73c8c6fae93ff3814318aff2;hb=d60ba8aa4d7b60a15bdc8030a7e73fcc4810c48c;hp=9e673b8587bc74abfaf25829f00b73ab0f34c52e;hpb=cd3f667ea477e15aa1ac14fa6b56f08164eed850;p=svn42.git

diff --git a/switch-power.py b/switch-power.py
index 9e673b8..9f0a3a1 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')
@@ -135,25 +135,33 @@ status_presense=None
 room_is_bright=None
 
 def eventRoomGotBright():
+  global room_is_bright
+  logging.debug("eventRoomGotBright()")
   room_is_bright=True
 
 def eventRoomGotDark():
+  global room_is_bright
+  logging.debug("eventRoomGotDark()")
   room_is_bright=False
 
 def eventDaylightStart():
+  logging.debug("eventDaylightStart()")
   for id in uwscfg.slug_ids_logo.split(" "):
     switchPower(id,False)
 
 def eventDaylightStop():
+  logging.debug("eventDaylightStop()")
   if not isWolfHour():
     for id in uwscfg.slug_ids_logo.split(" "):
       switchPower(id,True)
 
 def eventWolfHourStart():
+  logging.debug("eventWolfHourStart()")
   for id in uwscfg.slug_ids_logo.split(" "):
     switchPower(id,False)
 
 def eventWolfHourStop():
+  logging.debug("eventWolfHourStop()")
   if haveDaylight():
     for id in uwscfg.slug_ids_logo.split(" "):
       switchPower(id,True)
@@ -175,13 +183,14 @@ def eventPeriodical():
 #      switchPower(id,presumed_state)
 
 def eventPresent():
-  global status_presense
+  global status_presense,room_is_bright
+  logging.debug("eventPresent()");
   status_presense=True
   if haveDaylight():
-    if room_is_bright:
-      present_ids=uwscfg.slug_ids_present_day_bright_room
-    else:
+    if room_is_bright is False:
       present_ids=uwscfg.slug_ids_present_day_dark_room
+    else:
+      present_ids=uwscfg.slug_ids_present_day_bright_room
   else:
     present_ids=uwscfg.slug_ids_present_night
   logging.info("event: someone present, switching on: "+present_ids)
@@ -190,20 +199,21 @@ def eventPresent():
 
 def eventNobodyHere():
   global status_presense
+  logging.debug("eventNobodyHere()");
   status_presense=False
   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("event: Panic:, switching around: "+uwscfg.slug_ids_panic)
+  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])