X-Git-Url: https://git.realraum.at/?a=blobdiff_plain;f=go%2Fr3-eventbroker_zmq%2Fpresence.go;h=8ea269359cf9522f385812daed454ee13365847e;hb=a87c91b7d4544703879b7ef6e472b863765e3949;hp=ecaa1469a1902ecd98b55407246a9352d6009220;hpb=0d2bd96d2c019a7c0e0282898809fb03962ca701;p=svn42.git diff --git a/go/r3-eventbroker_zmq/presence.go b/go/r3-eventbroker_zmq/presence.go index ecaa146..8ea2693 100644 --- a/go/r3-eventbroker_zmq/presence.go +++ b/go/r3-eventbroker_zmq/presence.go @@ -3,61 +3,88 @@ package main import ( - "time" - //~ "./brain" - pubsub "github.com/tuxychandru/pubsub" - "./r3events" - ) + "time" + //~ "./brain" + pubsub "github.com/tuxychandru/pubsub" + r3events "svn.spreadspace.org/realraum/go.svn/r3events" +) -func MetaEventRoutine_Presence(ps *pubsub.PubSub) { - //~ var last_door_cmd *DoorCommandEvent - var last_presence bool - var last_movement, last_buttonpress int64 - var front_locked, front_shut, back_shut bool = true, true, true +func MetaEventRoutine_Presence(ps *pubsub.PubSub, movement_timeout, button_timeout int64) { + var last_door_cmd *r3events.DoorCommandEvent + var last_presence bool + var last_event_indicating_presence, last_frontlock_use, last_manual_lockhandling int64 + var front_locked, front_shut, back_shut bool = true, true, true - events_chan := ps.Sub("door", "doorcmd", "buttons", "movement") - defer ps.Unsub(events_chan, "door", "doorcmd", "buttons", "movement") + events_chan := ps.Sub("door", "doorcmd", "buttons", "movement") + defer ps.Unsub(events_chan, "door", "doorcmd", "buttons", "movement") - for event := range(events_chan) { - //~ Debug_.Printf("Presence: %s - %s", event, doorstatemap) - new_presence := last_presence - ts := time.Now().Unix() - switch evnt := event.(type) { - case r3events.SomethingReallyIsMoving: - if evnt.Movement { - last_movement = evnt.Ts - } else { - last_movement = 0 - } - case r3events.BoreDoomButtonPressEvent: - last_buttonpress = evnt.Ts - new_presence = true - //~ case DoorCommandEvent: - //~ last_door_cmd = &evnt - case r3events.DoorLockUpdate: - front_locked = evnt.Locked - case r3events.DoorAjarUpdate: - front_shut = evnt.Shut - case r3events.BackdoorAjarUpdate: - back_shut = evnt.Shut - } + for event := range events_chan { + Debug_.Printf("Presence prior: %t : %T %+v", last_presence, event, event) + new_presence := last_presence + ts := time.Now().Unix() + evnt_type := r3events.NameOfStruct(event) + switch evnt := event.(type) { + case r3events.SomethingReallyIsMoving: + if evnt.Movement { + //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 { + 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 >= 90 && last_event_indicating_presence > 1800 && (last_door_cmd == nil || (last_door_cmd.Using != "Button" && last_door_cmd.Ts >= last_manual_lockhandling)) { + new_presence = false + } + } + case r3events.BoreDoomButtonPressEvent: + new_presence = true + last_event_indicating_presence = evnt.Ts + case r3events.DoorCommandEvent: + last_door_cmd = &evnt + case r3events.DoorManualMovementEvent: + last_manual_lockhandling = evnt.Ts + last_event_indicating_presence = evnt.Ts + 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 - any_door_ajar := ! (front_shut && back_shut) + any_door_unlocked := (front_locked == false) + any_door_ajar := !(front_shut && back_shut) - if new_presence != last_presence { - //... skip state check .. we had a definite presence event - } else if any_door_unlocked || any_door_ajar { - new_presence = true - } else if last_movement != 0 || ts - last_buttonpress < 200 { - new_presence = true - } else { - new_presence = false - } - //~ Debug_.Printf("Presence: new: %s , last:%s", new_presence, last_presence) - if new_presence != last_presence { - last_presence = new_presence - ps.Pub(r3events.PresenceUpdate{new_presence, ts} , "presence") - } - } -} \ No newline at end of file + if new_presence != last_presence { + //... skip state check .. we had a definite presence event + } else if any_door_unlocked || any_door_ajar { + new_presence = true + } else if last_door_cmd != nil && (last_door_cmd.Using == "Button" || last_door_cmd.Ts < last_manual_lockhandling) { + // if last_door_cmd is set then: if either door was closed using Button or if time of manual lock movement is greater (newer) than timestamp of last_door_cmd + new_presence = true + } else if evnt_type == "DoorCommandEvent" { + //don't set presence to false for just a door command, wait until we receive a LockUpdate + //(fixes "door manually locked -> door opened with card from outside -> nobody present status sent since door is locked and we havent received door unloked event yet"-problem) + continue + } else { + new_presence = false + } + //~ Debug_.Printf("Presence: new: %s , last:%s", new_presence, last_presence) + if new_presence != last_presence { + last_presence = new_presence + ps.Pub(r3events.PresenceUpdate{new_presence, ts}, "presence") + Syslog_.Printf("Presence: %t", new_presence) + } + } +}