projects
/
svn42.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r3events package
[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
154c6d2
..
aac99f5
100644
(file)
--- a/
go/r3-eventbroker_zmq/presence.go
+++ b/
go/r3-eventbroker_zmq/presence.go
@@
-6,13
+6,9
@@
import (
"time"
//~ "./brain"
pubsub "github.com/tuxychandru/pubsub"
"time"
//~ "./brain"
pubsub "github.com/tuxychandru/pubsub"
+ "./r3events"
)
)
-type PresenceUpdate struct {
- Present bool
- Ts int64
-}
-
type doorstate struct {
locked bool
shut bool
type doorstate struct {
locked bool
shut bool
@@
-30,20
+26,20
@@
func MetaEventRoutine_Presence(ps *pubsub.PubSub) {
new_presence := last_presence
ts := time.Now().Unix()
switch evnt := event.(type) {
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
}
if evnt.Movement {
last_movement = evnt.Ts
} else {
last_movement = 0
}
- case ButtonPressUpdate:
+ case r3events.ButtonPressUpdate:
last_buttonpress = evnt.Ts
new_presence = true
//~ case DoorCommandEvent:
//~ last_door_cmd = &evnt
last_buttonpress = evnt.Ts
new_presence = true
//~ case DoorCommandEvent:
//~ last_door_cmd = &evnt
- case DoorLockUpdate:
+ case r3events.DoorLockUpdate:
doorstatemap[evnt.DoorID]=doorstate{locked:evnt.Locked, shut:doorstatemap[evnt.DoorID].shut}
doorstatemap[evnt.DoorID]=doorstate{locked:evnt.Locked, shut:doorstatemap[evnt.DoorID].shut}
- case DoorAjarUpdate:
+ case r3events.DoorAjarUpdate:
doorstatemap[evnt.DoorID]=doorstate{locked:doorstatemap[evnt.DoorID].locked, shut:evnt.Shut}
}
doorstatemap[evnt.DoorID]=doorstate{locked:doorstatemap[evnt.DoorID].locked, shut:evnt.Shut}
}
@@
-66,7
+62,7
@@
func MetaEventRoutine_Presence(ps *pubsub.PubSub) {
if new_presence != last_presence {
last_presence = new_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
}
}
}
\ No newline at end of file