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

diff --git a/switch-power.py b/switch-power.py
index a9ebc29..0c8069d 100755
--- a/switch-power.py
+++ b/switch-power.py
@@ -36,10 +36,12 @@ 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','werkzeug')
-    self.config_parser.set('slug','ids_present_night','werkzeug schreibtisch idee labor')
-    self.config_parser.set('slug','ids_panic','idee schreibtisch labor werkzeug')
-    self.config_parser.set('slug','ids_nonpresent_off','lichter stereo deckehinten')
+    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')
     self.config_parser.set('debug','enabled',"False")
@@ -118,7 +120,7 @@ def switchPower(powerid,turn_on=False):
 
 def haveDaylight():
   dawn_per_month = {1:8, 2:7, 3:6, 4:6, 5:5, 6:5, 7:5, 8:6, 9:7, 10:8, 11:8, 12:8}
-  dusk_per_month = {1:16, 2:17, 3:18, 4:20, 5:21, 6:21, 7:21, 8:20, 9:19, 10:18, 11:16, 12:16}
+  dusk_per_month = {1:16, 2:17, 3:18, 4:20, 5:20, 6:21, 7:21, 8:20, 9:19, 10:18, 11:16, 12:16}
   hour = datetime.datetime.now().hour
   month = datetime.datetime.now().month
   return (hour >= dawn_per_month[month] and hour < dusk_per_month[month])
@@ -130,21 +132,36 @@ def isWolfHour():
 ######### EVENTS ###############  
 unixts_last_movement=0
 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)
@@ -166,10 +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():
-    present_ids=uwscfg.slug_ids_present_day
+    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)
@@ -178,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]) 
@@ -233,6 +255,7 @@ else:
 RE_PRESENCE = re.compile(r'Presence: (yes|no)(?:, (opened|closed), (.+))?')
 RE_BUTTON = re.compile(r'PanicButton|button\d?')
 RE_MOVEMENT = re.compile(r'movement')
+RE_PHOTO = re.compile(r'photo\d: [^0-9]*?(\d+)')
 daylight=None
 wolfhour=None
 unixts_last_periodical=0
@@ -290,6 +313,16 @@ while True:
       if not m is None:
         eventMovement()
         continue
+      m = RE_PHOTO.match(line)
+      if not m is None:
+        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()
+        continue
           
   except Exception, ex:
     logging.error("main: "+str(ex))