projects
/
svn42.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
0ae7860
)
looser parsing
author
Bernhard Tittelbach
<xro@realraum.at>
Sat, 5 Oct 2013 01:18:26 +0000
(
01:18
+0000)
committer
Bernhard Tittelbach
<xro@realraum.at>
Sat, 5 Oct 2013 01:18:26 +0000
(
01:18
+0000)
go/r3-eventbroker_zmq/sockettoevent.go
patch
|
blob
|
history
diff --git
a/go/r3-eventbroker_zmq/sockettoevent.go
b/go/r3-eventbroker_zmq/sockettoevent.go
index
3836580
..
a7a21bf
100644
(file)
--- a/
go/r3-eventbroker_zmq/sockettoevent.go
+++ b/
go/r3-eventbroker_zmq/sockettoevent.go
@@
-32,12
+32,12
@@
func parseSocketInputLine_State(lines [][]byte, ps *pubsub.PubSub, ts int64) {
ps.Pub(r3events.DoorLockUpdate{true, ts}, "door")
case "opened":
ps.Pub(r3events.DoorLockUpdate{false, ts}, "door")
ps.Pub(r3events.DoorLockUpdate{true, ts}, "door")
case "opened":
ps.Pub(r3events.DoorLockUpdate{false, ts}, "door")
- case "manual": //movement
+ case "manual", "manual_movement": //movement
case "error":
ps.Pub(r3events.DoorProblemEvent{100, ts}, "door")
case "reset":
ps.Pub(r3events.DoorLockUpdate{true, ts}, "door")
case "error":
ps.Pub(r3events.DoorProblemEvent{100, ts}, "door")
case "reset":
ps.Pub(r3events.DoorLockUpdate{true, ts}, "door")
- case "timeout": //after open | after close
+ case "timeout", "timeout_after_open", "timeout_after_close":
ps.Pub(r3events.DoorProblemEvent{10, ts}, "door")
case "opening":
case "closing":
ps.Pub(r3events.DoorProblemEvent{10, ts}, "door")
case "opening":
case "closing":
@@
-57,7
+57,8
@@
func ParseSocketInputLine(lines [][]byte, ps *pubsub.PubSub, keylookup_socket *z
parseSocketInputLine_State(lines[1:], ps, ts)
case "Status:":
if len(lines) < 3 { return }
parseSocketInputLine_State(lines[1:], ps, ts)
case "Status:":
if len(lines) < 3 { return }
- ps.Pub(r3events.DoorLockUpdate{string(lines[1]) == "closed,", ts}, "door")
+ if len(lines[1]) < 4 { return }
+ ps.Pub(r3events.DoorLockUpdate{string(lines[1])[0:4] != "open", ts}, "door")
ps.Pub(r3events.DoorAjarUpdate{string(lines[len(lines)-1]) == "shut", ts}, "door")
case "Info(card):":
if len(lines) < 3 { return }
ps.Pub(r3events.DoorAjarUpdate{string(lines[len(lines)-1]) == "shut", ts}, "door")
case "Info(card):":
if len(lines) < 3 { return }