small refactoring

[svn42.git] / switch-power.py

diff --git a/switch-power.py b/switch-power.py
index c870760..f9c5b99 100755 (executable)
--- a/switch-power.py
+++ b/switch-power.py
@@ -120,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:20, 6:21, 7:21, 8:20, 9:19, 10:18, 11:16, 12:16}
+  dusk_per_month = {1:15, 2:16, 3:17, 4:19, 5:20, 6:20, 7:20, 8:19, 9:17, 10:17, 11:16, 12:15}
   hour = datetime.datetime.now().hour
   month = datetime.datetime.now().month
   return (hour >= dawn_per_month[month] and hour < dusk_per_month[month])
@@ -129,9 +129,28 @@ 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
+status_presence=None
 room_is_bright=None
 
 def eventRoomGotBright():
@@ -145,26 +164,24 @@ def eventRoomGotDark():
   room_is_bright=False
 
 def eventDaylightStart():
+  global status_presence
   logging.debug("eventDaylightStart()")
-  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():
-    for id in uwscfg.slug_ids_logo.split(" "):
-      switchPower(id,True)
+  switchLogo(status_presence)
 
 def eventWolfHourStart():
+  global status_presence
   logging.debug("eventWolfHourStart()")
-  for id in uwscfg.slug_ids_logo.split(" "):
-    switchPower(id,False)
+  switchLogo(status_presence)
 
 def eventWolfHourStop():
+  global status_presence
   logging.debug("eventWolfHourStop()")
-  if haveDaylight():
-    for id in uwscfg.slug_ids_logo.split(" "):
-      switchPower(id,True)
+  switchLogo(status_presence)
 
 def eventMovement():
   global unixts_last_movement
@@ -174,7 +191,7 @@ def eventPeriodical():
   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(" "):
@@ -183,9 +200,9 @@ def eventPeriodical():
 #      switchPower(id,presumed_state)
 
 def eventPresent():
-  global status_presense,room_is_bright
+  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
@@ -196,15 +213,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_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():