X-Git-Url: https://git.realraum.at/?a=blobdiff_plain;f=switch-power.py;h=32fbdee93951f810c6cbb5f41343a2f6d2ca625c;hb=dee857a276678d40a8d8ae7ff64f7f94cc311b27;hp=b3dbfab51f2b3879ea2c51f0516d1cd466e93e43;hpb=c7774bf8752d8825067cee013113fba06e777486;p=svn42.git

diff --git a/switch-power.py b/switch-power.py
index b3dbfab..32fbdee 100755
--- a/switch-power.py
+++ b/switch-power.py
@@ -32,6 +32,8 @@ class UWSConfig:
     self.config_parser=ConfigParser.ConfigParser()
     self.config_parser.add_section('powerswitching')
     self.config_parser.set('powerswitching','min_secs_periodical_event','59')
+    self.config_parser.set('powerswitching','secs_movement_before_presence_to_launch_event','1')
+    self.config_parser.set('powerswitching','secs_presence_before_movement_to_launch_event','120')
     self.config_parser.set('powerswitching','max_secs_since_movement','600')
     self.config_parser.add_section('slug')
     self.config_parser.set('slug','cgiuri','http://slug.realraum.at/cgi-bin/switch.cgi?id=%ID%&power=%ONOFF%')
@@ -129,11 +131,32 @@ def isWolfHour():
   hour = datetime.datetime.now().hour
   return (hour >= 2 and hour < 6)
 
-######### EVENTS ###############  
+######### ALGOS ###############
+
+def switchLogo(status_presence):
+  logo_action=None
+  if status_presence:
+    logo_action=True
+  else:
+    if haveDaylight():
+      logo_action=False
+    else:
+       if isWolfHour():
+          logo_action=False
+       else:
+          logo_action=True
+  if not logo_action is None:
+    logging.info("switchLogo: logo_action:%s" % str(logo_action))
+    for id in uwscfg.slug_ids_logo.split(" "):
+      switchPower(id,logo_action)
+
+######### EVENTS ###############
 unixts_last_movement=0
-status_presense=None
+unixts_last_presence=0
+status_presence=None
 room_is_bright=None
 
+
 def eventRoomGotBright():
   global room_is_bright
   logging.debug("eventRoomGotBright()")
@@ -145,40 +168,38 @@ def eventRoomGotDark():
   room_is_bright=False
 
 def eventDaylightStart():
+  global status_presence
   logging.debug("eventDaylightStart()")
-  logging.info("event: daylight is here, switching off: "+uwscfg.slug_ids_logo)
-  for id in uwscfg.slug_ids_logo.split(" "):
-    switchPower(id,False)
+  switchLogo(status_presence)
 
 def eventDaylightStop():
+  global status_presence
   logging.debug("eventDaylightStop()")
-  if not isWolfHour():
-    logging.info("event: daylight ends, switching on: "+uwscfg.slug_ids_logo)
-    for id in uwscfg.slug_ids_logo.split(" "):
-      switchPower(id,True)
+  switchLogo(status_presence)
 
 def eventWolfHourStart():
+  global status_presence
   logging.debug("eventWolfHourStart()")
-  logging.info("event: nobody on the street time, switching off: "+uwscfg.slug_ids_logo)
-  for id in uwscfg.slug_ids_logo.split(" "):
-    switchPower(id,False)
+  switchLogo(status_presence)
 
 def eventWolfHourStop():
+  global status_presence
   logging.debug("eventWolfHourStop()")
-  if haveDaylight():
-    logging.info("event: people might be on street now, switching on: "+uwscfg.slug_ids_logo)
-    for id in uwscfg.slug_ids_logo.split(" "):
-      switchPower(id,True)
-
+  switchLogo(status_presence)
+  
 def eventMovement():
-  global unixts_last_movement
+  global unixts_last_movement, unixts_last_presence
   unixts_last_movement=time.time()
+  if (time.time() - unixts_last_presence) <= uwscfg.powerswitching_secs_presence_before_movement_to_launch_event:
+    eventPresentAndMoved()
+    unixts_last_presence=0  # so that eventPresentAndMoved will only launch once per presence event (i.e. supress multiple movement events)
+  
 
 def eventPeriodical():
-  pass
+  pass 
 
 #  global unixts_last_movement
-#  if status_presense is True and unixts_last_movement + int(uwscfg.powerswitching_max_secs_since_movement) >= time.time():
+#  if status_presence is True and unixts_last_movement + int(uwscfg.powerswitching_max_secs_since_movement) >= time.time():
 #    presumed_state=not (haveDaylight() or isWolfHour())
 #    logging.debug("event: periodical event")
 #    for id in uwscfg.slug_ids_logo.split(" "):
@@ -187,9 +208,16 @@ def eventPeriodical():
 #      switchPower(id,presumed_state)
 
 def eventPresent():
-  global status_presense,room_is_bright
+  global status_presence,room_is_bright,unixts_last_movement,uwscfg,unixts_last_presence
+  unixts_last_presence=time.time()
+  if ( time.time() - unixts_last_movement ) <= uwscfg.powerswitching_secs_movement_before_presence_to_launch_event:
+    eventPresentAndMoved()
+  
+
+def eventPresentAndMoved():
+  global status_presence,room_is_bright
   logging.debug("eventPresent()");
-  status_presense=True
+  status_presence=True
   if haveDaylight():
     if room_is_bright is False:
       present_ids=uwscfg.slug_ids_present_day_dark_room
@@ -200,20 +228,24 @@ def eventPresent():
   logging.info("event: someone present, switching on: "+present_ids)
   for id in present_ids.split(" "):
     switchPower(id,True)
+  switchLogo(status_presence)
 
 def eventNobodyHere():
-  global status_presense
+  global status_presence
   logging.debug("eventNobodyHere()");
-  status_presense=False
+  status_presence=False
   present_ids=uwscfg.slug_ids_nonpresent_off
   logging.info("event: noone here, switching off: "+present_ids)
-  for id in present_ids.split(" "):
-    time.sleep(0.2)
+  present_id_list=present_ids.split(" ")
+  for id in present_id_list:
+    time.sleep(0.15)
     switchPower(id,False)
-  present_ids.reverse()
-  time.sleep(4)
-  for id in present_ids.split(" "):
-    time.sleep(0.3)
+  present_id_list.reverse()
+  time.sleep(0.15)
+  switchLogo(status_presence)
+  time.sleep(2)
+  for id in present_id_list:
+    time.sleep(0.15)
     switchPower(id,False)
 
 ##def eventPanic():