more proper import

[svn42.git] / go / r3-eventbroker_zmq / presence.go

diff --git a/go/r3-eventbroker_zmq/presence.go b/go/r3-eventbroker_zmq/presence.go
index 953af11..d65788d 100644 (file)
--- a/go/r3-eventbroker_zmq/presence.go
+++ b/go/r3-eventbroker_zmq/presence.go
@@ -6,54 +6,45 @@ import (
     "time"
     //~ "./brain"
     pubsub "github.com/tuxychandru/pubsub"
+    r3events "svn.spreadspace.org/realraum/go.svn/r3events"
     )
 
-type PresenceUpdate struct {
-    Present bool
-    Ts int64
-}
-
-type doorstate struct {
-    locked bool
-    shut bool
-}
-
 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)
+    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")
+
     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 SomethingReallyIsMoving:
+            case r3events.SomethingReallyIsMoving:
                 if evnt.Movement {
                     last_movement = evnt.Ts
                 } else {
                     last_movement = 0
                 }
-            case ButtonPressUpdate:
+            case r3events.BoreDoomButtonPressEvent:
                 last_buttonpress = evnt.Ts
                 new_presence = true
             //~ case DoorCommandEvent:
                 //~ last_door_cmd = &evnt
-            case DoorLockUpdate:
-                doorstatemap[evnt.DoorID]=doorstate{locked:evnt.Locked, shut:doorstatemap[evnt.DoorID].shut}
-            case DoorAjarUpdate:
-                doorstatemap[evnt.DoorID]=doorstate{locked:doorstatemap[evnt.DoorID].locked, shut:evnt.Shut}
+            case r3events.DoorLockUpdate:
+                front_locked = evnt.Locked
+            case r3events.DoorAjarUpdate:
+                front_shut = evnt.Shut
+            case r3events.BackdoorAjarUpdate:
+                back_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 }
-        }
-        
+
+        any_door_unlocked := ! front_locked
+        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 {
@@ -63,10 +54,10 @@ func MetaEventRoutine_Presence(ps *pubsub.PubSub) {
         } 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(PresenceUpdate{new_presence, ts} , "presence")
+            ps.Pub(r3events.PresenceUpdate{new_presence, ts} , "presence")
         }
     }
 }
\ No newline at end of file