X-Git-Url: https://git.realraum.at/?a=blobdiff_plain;f=go%2Fr3-eventbroker_zmq%2Fpresence.go;h=3677b277cabcac88dfb74fb06719cf7c4ba14fd3;hb=91ed9fe7c53c26cad5771ef4727da01eae932fa0;hp=1a6f11cbb839e0d6b9a837691d33b4a0fe00abba;hpb=51f3617510d7e89a8b432e052db16e0eb9864085;p=svn42.git

diff --git a/go/r3-eventbroker_zmq/presence.go b/go/r3-eventbroker_zmq/presence.go
index 1a6f11c..3677b27 100644
--- a/go/r3-eventbroker_zmq/presence.go
+++ b/go/r3-eventbroker_zmq/presence.go
@@ -10,9 +10,9 @@ import (
     )
 
 func MetaEventRoutine_Presence(ps *pubsub.PubSub, movement_timeout, button_timeout int64) {
-    //~ var last_door_cmd *r3events.DoorCommandEvent
+    var last_door_cmd *r3events.DoorCommandEvent
     var last_presence bool
-    var last_movement, last_buttonpress, last_frontlock_use int64
+    var last_event_indicating_presence, last_frontlock_use int64
     var front_locked, front_shut, back_shut bool = true, true, true
 
     events_chan := ps.Sub("door", "doorcmd", "buttons", "movement")
@@ -25,27 +25,36 @@ func MetaEventRoutine_Presence(ps *pubsub.PubSub, movement_timeout, button_timeo
         switch evnt := event.(type) {
             case r3events.SomethingReallyIsMoving:
                 if evnt.Movement {
-                    last_movement = evnt.Ts
+                    //ignore movements that happened just after locking door
+                    if (evnt.Ts - last_event_indicating_presence) > movement_timeout {
+                        new_presence = true
+                    }
+                    last_event_indicating_presence = evnt.Ts
                 } else {
-                    last_movement = 0
-                    if last_presence { Syslog_.Print("Presence: Mhh, SomethingReallyIsMoving{false} received but presence still true. Quite still a bunch we have here.") }
+                    if last_presence { Syslog_.Printf("Presence: Mhh, SomethingReallyIsMoving{%+v} received but presence still true. Quite still a bunch we have here.", evnt) }
+                    if front_locked && front_shut && back_shut && evnt.Confidence >= 20 && last_event_indicating_presence > 1800 {
+                        new_presence = false
+                    }
                 }
             case r3events.BoreDoomButtonPressEvent:
-                last_buttonpress = evnt.Ts
                 new_presence = true
+                last_event_indicating_presence = evnt.Ts
             case r3events.DoorCommandEvent:
-                //~ last_door_cmd = &evnt
+                last_door_cmd = &evnt
             case r3events.DoorLockUpdate:
                 front_locked = evnt.Locked
                 last_frontlock_use = evnt.Ts
+                last_event_indicating_presence = evnt.Ts
             case r3events.DoorAjarUpdate:
                 if front_shut == false && evnt.Shut && front_locked && evnt.Ts - last_frontlock_use > 2 {
                     Syslog_.Print("Presence: ignoring frontdoor ajar event, since obviously someone is fooling around with the microswitch while the door is still open")
                 } else {
                     front_shut = evnt.Shut
                 }
+                last_event_indicating_presence = evnt.Ts
             case r3events.BackdoorAjarUpdate:
                 back_shut = evnt.Shut
+                last_event_indicating_presence = evnt.Ts
         }
 
         any_door_unlocked := (front_locked == false)
@@ -55,7 +64,7 @@ func MetaEventRoutine_Presence(ps *pubsub.PubSub, movement_timeout, button_timeo
             //... skip state check .. we had a definite presence event
         } else if any_door_unlocked || any_door_ajar {
             new_presence = true
-        } else if ts - last_movement < movement_timeout || ts - last_buttonpress < button_timeout {
+        } else if last_door_cmd.Using == "Button" {
             new_presence = true
         } else {
             new_presence = false