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','num_movements_req_on_nonpresence_until_present',"3")
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',"970")
def trackDoorStatusThread(uwscfg, status_tracker,connection_listener):
global door_sockhandle, door_socklock, threads_running
#socket.setdefaulttimeout(10.0) #affects all new Socket Connections (urllib as well)
- RE_STATUS = re.compile(r'Status: (\w+), idle',re.I)
+ RE_STATUS = re.compile(r'Status: (\w+), idle.*',re.I)
RE_REQUEST = re.compile(r'Request: (\w+) (?:(Card|Phone) )?(.+)',re.I)
RE_ERROR = re.compile(r'Error: (.+)',re.I)
while threads_running:
#timer
self.timer=None
self.timer_timeout=0
+ self.num_movements_during_nonpresences = 0
def doorOpen(self,who,how):
self.uwscfg.checkConfigUpdates()
def somebodyPresent(self):
with self.lock:
+ #door open:
if self.door_open:
+ self.num_movements_during_nonpresences = 0
if self.door_physically_present:
return True
elif self.last_movement_unixts > self.last_door_operation_unixts:
return True
else:
return False
- 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
+ # door closed:
+ # door not closed from inside, but with card/phone .. check again in ...
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.num_movements_during_nonpresences = 0
self.checkAgainIn(float(self.uwscfg.tracker_sec_wait_after_close_using_cardphone))
+ return self.last_somebody_present_result
+ # door closed from inside, stay on last status ....
+ 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.num_movements_during_nonpresences = 0
+ self.checkAgainIn(float(self.uwscfg.tracker_sec_wait_after_close_using_manualswitch))
return self.last_somebody_present_result
+ # door closed from inside and movement detected around that time
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):
+ self.num_movements_during_nonpresences = 0
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
+ ##door was closed and nobody here But movement is dedected:
+ #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):
+ # self.num_movements_during_nonpresences += 1
+ # if self.num_movements_during_nonpresences >= int(self.uwscfg.tracker_num_movements_req_on_nonpresence_until_present):
+ # return True
+ # else:
+ # return False
else:
+ self.num_movements_during_nonpresences = 0
return False
def getPossibleWarning(self):