presence and power on/off timer improvements

[svn42.git] / track-presence.py

diff --git a/track-presence.py b/track-presence.py
index 78c75b0..532f5e0 100755 (executable)
--- a/track-presence.py
+++ b/track-presence.py
@@ -46,11 +46,13 @@ class UWSConfig:
     self.config_parser.set('sensors','remote_socket',"/var/run/powersensordaemon/cmd.sock")
     self.config_parser.set('sensors','remote_shell',"usocket")
     self.config_parser.add_section('tracker')
-    self.config_parser.set('tracker','sec_necessary_to_move_through_door',"10.0")
+    self.config_parser.set('tracker','sec_necessary_to_move_through_door',"5.0")
+    self.config_parser.set('tracker','sec_wait_after_manual_close',"12.0")
+    self.config_parser.set('tracker','sec_movement_before_manual_switch',"0.8")
     self.config_parser.set('tracker','sec_general_movement_timeout',"3600")
     self.config_parser.set('tracker','server_socket',"/var/run/tuer/presence.socket")
-    self.config_parser.set('tracker','photo_flashlight',"950")
-    self.config_parser.set('tracker','photo_artif_light',"150")
+    self.config_parser.set('tracker','photo_flashlight',"1020")
+    self.config_parser.set('tracker','photo_artif_light',"960")
     self.config_parser.add_section('debug')
     self.config_parser.set('debug','enabled',"False")
     self.config_mtime=0
@@ -300,6 +302,7 @@ class StatusTracker: #(threading.Thread):
     self.presence_notify_lock=threading.Lock()
     #timer
     self.timer=None
+    self.timer_timeout=0
     
   def doorOpen(self,who,how):
     self.uwscfg.checkConfigUpdates()
@@ -362,12 +365,13 @@ class StatusTracker: #(threading.Thread):
 
 
   def checkAgainIn(self, sec):
-    #~ if not self.timer is None:
-      #~ logging.debug("checkAgainIn: canceled previous running Timer")
-      #~ self.timer.cancel()
-    logging.debug("checkAgainIn: starting Timer with timeout %fs" % sec)
-    self.timer=threading.Timer(sec, self.checkPresenceStateChangeAndNotify)
-    self.timer.start()
+    if self.timer_timeout < time.time():
+      logging.debug("checkAgainIn: starting Timer with timeout %fs" % sec)
+      self.timer=threading.Timer(sec, self.checkPresenceStateChangeAndNotify)
+      self.timer.start()
+      self.timer_timeout = time.time() + sec
+    else:
+      logging.debug("checkAgainIn: not starting timer, already one scheduled in %fs" % (time.time() - self.timer_timeout))
   
   def somebodyPresent(self):
     with self.lock:
@@ -378,11 +382,15 @@ class StatusTracker: #(threading.Thread):
           return True
         else:
           return False
-      elif time.time() - self.last_door_operation_unixts <= float(self.uwscfg.tracker_sec_necessary_to_move_through_door):
-        #start timer, checkPresenceStateChangeAndNotify after tracker_sec_wait_movement
+      elif self.door_manual_switch_used and time.time() - self.last_door_operation_unixts <= float(self.uwscfg.tracker_sec_wait_after_manual_close):
+        self.checkAgainIn(float(self.uwscfg.tracker_sec_wait_after_manual_close))
+        return self.last_somebody_present_result
+      elif not self.door_manual_switch_used and time.time() - self.last_door_operation_unixts <= float(self.uwscfg.tracker_sec_necessary_to_move_through_door):
         self.checkAgainIn(float(self.uwscfg.tracker_sec_necessary_to_move_through_door))
         return self.last_somebody_present_result
-      elif self.last_movement_unixts > self.last_door_operation_unixts and (self.door_manual_switch_used or ( time.time() - self.last_movement_unixts < float(self.uwscfg.tracker_sec_general_movement_timeout))):
+      elif self.last_movement_unixts > self.last_door_operation_unixts - float(self.uwscfg.tracker_sec_movement_before_manual_switch) and self.door_manual_switch_used:
+        return True
+      elif self.last_movement_unixts > self.last_door_operation_unixts and time.time() - self.last_movement_unixts < float(self.uwscfg.tracker_sec_general_movement_timeout):
         return True
       else:
         return False