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_wait_after_close_using_cardphone',"4.2")
+ self.config_parser.set('tracker','sec_wait_for_movement_before_warning',"30")
+ self.config_parser.set('tracker','sec_wait_after_close_using_manualswitch',"25.0")
+ self.config_parser.set('tracker','sec_movement_before_manual_switch',"-1.0") #neg duration means: movement has to occur _after_ door was closed manually
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',"1020")
- self.config_parser.set('tracker','photo_artif_light',"960")
+ self.config_parser.set('tracker','photo_artif_light',"970")
self.config_parser.add_section('debug')
self.config_parser.set('debug','enabled',"False")
self.config_mtime=0
if len(line) < 1:
raise Exception("EOF on Subprocess, daemon seems to have quit, returncode: %d",sshp.returncode)
logging.debug("trackSensorStatusThread: Got Line: " + line)
- connection_listener.distributeData(line)
+ if not line.startswith("Warning: Permanently added"):
+ connection_listener.distributeData(line)
m = RE_MOVEMENT.match(line)
if not m is None:
status_tracker.movementDetected()
self.presence_notify_lock=threading.Lock()
#timer
self.timer=None
+ self.timer_timeout=0
def doorOpen(self,who,how):
self.uwscfg.checkConfigUpdates()
self.lock.acquire()
self.door_open_previously = self.door_open
self.lock.release()
+ loggin.debug("doorOpen: open: %s, who: %s, how:%s, manual_switch: %s; physically_present: %s" % (self.door_open,self.door_who,how,self.door_manual_switch_used,self.door_manual_switch_used));
def doorClosed(self,who,how):
self.uwscfg.checkConfigUpdates()
self.lock.acquire()
self.door_open_previously = self.door_open
self.lock.release()
+ loggin.debug("doorClosed: open: %s, who: %s, how:%s, manual_switch: %s; physically_present: %s" % (self.door_open,self.door_who,how,self.door_manual_switch_used,self.door_manual_switch_used));
+
def movementDetected(self):
self.uwscfg.checkConfigUpdates()
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:
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
- self.checkAgainIn(float(self.uwscfg.tracker_sec_necessary_to_move_through_door))
+ elif self.door_manual_switch_used and time.time() - self.last_door_operation_unixts <= float(self.uwscfg.tracker_sec_wait_after_close_using_manualswitch):
+ self.checkAgainIn(float(self.uwscfg.tracker_sec_wait_after_close_using_manualswitch))
+ 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_wait_after_close_using_cardphone):
+ self.checkAgainIn(float(self.uwscfg.tracker_sec_wait_after_close_using_cardphone))
return self.last_somebody_present_result
- elif self.last_movement_unixts > self.last_door_operation_unixts - 0.3 and self.door_manual_switch_used:
+ 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
def getPossibleWarning(self):
with self.lock:
somebody_present=self.last_somebody_present_result
- if self.door_open and not somebody_present and time.time() - self.last_door_operation_unixts >= 2* float(self.uwscfg.tracker_sec_necessary_to_move_through_door):
+ if self.door_open and not somebody_present and time.time() - self.last_door_operation_unixts >= float(self.uwscfg.tracker_sec_wait_for_movement_before_warning):
return "Door opened recently but nobody present"
elif self.door_open and not somebody_present:
- self.checkAgainIn(2*float(self.uwscfg.tracker_sec_necessary_to_move_through_door))
+ self.checkAgainIn(float(self.uwscfg.tracker_sec_wait_for_movement_before_warning))
return None
# elif not somebody_present and self.last_light_unixts > self.last_door_operation_unixts and self.last_light_value > int(self.uwscfg.tracker_photo_artif_light):
#return "Nobody here but light is still on"