X-Git-Url: https://git.realraum.at/?p=svn42.git;a=blobdiff_plain;f=track-presence.py;h=36580daa464b35c6a237936a9df23ae777485ff9;hp=827ccb022ba84825eb96c1cd102a19b0d1479981;hb=113bbdcd601a58c72ffa4a726036abfd938eb33d;hpb=201ce1a9e4a71df91c15fc472cbf9ddea3d7589b

diff --git a/track-presence.py b/track-presence.py
index 827ccb0..36580da 100755
--- a/track-presence.py
+++ b/track-presence.py
@@ -296,6 +296,7 @@ class StatusTracker: #(threading.Thread):
     #State locked by self.lock
     self.door_unlocked_previously=None
     self.door_unlocked=False
+    self.door_closed=True
     self.door_manual_switch_used=False
     self.door_physically_present=True
     self.door_who=None
@@ -446,10 +447,10 @@ class StatusTracker: #(threading.Thread):
   def getPossibleWarning(self):
     with self.lock:
       somebody_present=self.last_somebody_present_result
-      if not self.door_unlocked and not somebody_present and self.door_open:
-        return "Nobody here and door locked but still ajar !"
+      if not somebody_present and not self.door_closed:
+        return "Nobody here but door ajar !"
       elif self.door_unlocked 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"
+        return "Door unlocked recently but nobody present"
       elif self.door_unlocked and not somebody_present:
         self.checkAgainIn(float(self.uwscfg.tracker_sec_wait_for_movement_before_warning))
         return None
@@ -471,7 +472,7 @@ class StatusTracker: #(threading.Thread):
     #no acquiring of self.lock, "just" reading. chance wrong reads in favour of avoiding race conditions (is python var _read_ threadsafe ?)
     with self.presence_notify_lock:
       somebody_present = self.somebodyPresent()
-      logging.debug("checkPresenceStateChangeAndNotify: somebody_present=%s, door_locked=%s, door_ajar=%s, door_who=%s, who=%s, light=%s" % (somebody_present,not self.door_unlocked, self.door_open, self.door_who,self.who_might_be_here, str(self.last_light_value)))
+      logging.debug("checkPresenceStateChangeAndNotify: somebody_present=%s, door_locked=%s, door_ajar=%s, door_who=%s, who=%s, light=%s" % (somebody_present,not self.door_unlocked, not self.door_closed, self.door_who,self.who_might_be_here, str(self.last_light_value)))
       if somebody_present != self.last_somebody_present_result:
         self.last_somebody_present_result = somebody_present
         if not self.status_change_handler is None: