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
self.timer=threading.Timer(sec, self.checkPresenceStateChangeAndNotify)
self.timer.start()
- #TODO: check brightness level from cam or an arduino sensor
def somebodyPresent(self):
with self.lock:
if self.door_open:
return True
else:
return False
- elif time.time() - self.last_door_operation_unixts <= 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_manual_close):
+ #start timer, checkPresenceStateChangeAndNotify after tracker_sec_wait_movement
+ self.checkAgainIn(float(self.uwscfg.tracker_sec_wait_after_manual_close))
+ 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):
#start timer, checkPresenceStateChangeAndNotify after tracker_sec_wait_movement
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
elif self.door_open and not somebody_present:
self.checkAgainIn(2*float(self.uwscfg.tracker_sec_necessary_to_move_through_door))
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"
+# 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"
else:
return None