X-Git-Url: https://git.realraum.at/?a=blobdiff_plain;f=go%2Fr3-eventbroker_zmq%2Fpresence.go;h=154c6d23dbc2d0de9fdd9d4f32695db8a3865a0e;hb=237458a36b6c7f5014d9ee61b816a61ebdc5b57d;hp=953af110a6dc5451f77be5e7660eca186bad601f;hpb=957f71721b04698dd588ffc8dc2ed10775050451;p=svn42.git diff --git a/go/r3-eventbroker_zmq/presence.go b/go/r3-eventbroker_zmq/presence.go index 953af11..154c6d2 100644 --- a/go/r3-eventbroker_zmq/presence.go +++ b/go/r3-eventbroker_zmq/presence.go @@ -22,10 +22,10 @@ func MetaEventRoutine_Presence(ps *pubsub.PubSub) { //~ var last_door_cmd *DoorCommandEvent var last_presence bool var last_movement, last_buttonpress int64 - doorstatemap := make(map[byte]doorstate,1) + doorstatemap := make(map[int]doorstate,1) events_chan := ps.Sub("door", "doorcmd", "buttons", "movement") - + for event := range(events_chan) { new_presence := last_presence ts := time.Now().Unix() @@ -46,14 +46,14 @@ func MetaEventRoutine_Presence(ps *pubsub.PubSub) { case DoorAjarUpdate: doorstatemap[evnt.DoorID]=doorstate{locked:doorstatemap[evnt.DoorID].locked, shut:evnt.Shut} } - + any_door_unlocked := false any_door_ajar := false for _, ds := range(doorstatemap) { if ds.locked == false {any_door_unlocked = true } if ds.shut == false {any_door_ajar = true } } - + if new_presence != last_presence { //... skip state check .. we had a definite presence event } else if any_door_unlocked || any_door_ajar { @@ -63,7 +63,7 @@ func MetaEventRoutine_Presence(ps *pubsub.PubSub) { } else { new_presence = false } - + if new_presence != last_presence { last_presence = new_presence ps.Pub(PresenceUpdate{new_presence, ts} , "presence")