self.config_parser.set('sensors','remote_shell',"usocket")
self.config_parser.add_section('tracker')
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_wait_for_movement_before_warning',"60")
+ self.config_parser.set('tracker','sec_wait_after_close_using_manualswitch',"22.0")
+ self.config_parser.set('tracker','sec_movement_before_manual_switch',"-3.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")
if self.door_open != self.door_open_previously:
self.door_who=who
self.door_manual_switch_used=(who is None or len(who) == 0)
- self.door_physically_present=(self.door_manual_switch_used or how == "Card")
+ self.door_physically_present=(self.door_manual_switch_used or how.startswith("Card"))
if not self.door_open_previously is None:
self.last_door_operation_unixts=time.time()
self.lock.release()
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));
+ logging.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_physically_present));
def doorClosed(self,who,how):
self.uwscfg.checkConfigUpdates()
if self.door_open != self.door_open_previously:
self.door_who=who
self.door_manual_switch_used=(who is None or len(who) == 0)
- self.door_physically_present=(self.door_manual_switch_used or how == "Card")
+ self.door_physically_present=(self.door_manual_switch_used or how.startswith("Card"))
if not self.door_open_previously is None:
self.last_door_operation_unixts=time.time()
self.lock.release()
self.lock.acquire()
self.door_open_previously = self.door_open
self.lock.release()
+ logging.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_physically_present));
+
def movementDetected(self):
self.uwscfg.checkConfigUpdates()
def checkAgainIn(self, sec):
+ if sec <= 0.0:
+ return
if self.timer_timeout < time.time():
logging.debug("checkAgainIn: starting Timer with timeout %fs" % sec)
self.timer=threading.Timer(sec, self.checkPresenceStateChangeAndNotify)
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 - float(self.uwscfg.tracker_sec_movement_before_manual_switch) and self.door_manual_switch_used:
+ elif self.door_manual_switch_used and self.last_movement_unixts > self.last_door_operation_unixts - float(self.uwscfg.tracker_sec_movement_before_manual_switch):
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