X-Git-Url: https://git.realraum.at/?a=blobdiff_plain;f=go%2Fr3-eventbroker_zmq%2Fsockettoevent.go;h=6511ff03e91090cae201cb24d6c7404115d20f40;hb=a8e0651d52192d208758ae9a59e21af313685da4;hp=2445c78be70624467ebf7de71998d085931ed6d5;hpb=5fd34fb01f672ea16f64eb7e4a136417f2e949f8;p=svn42.git

diff --git a/go/r3-eventbroker_zmq/sockettoevent.go b/go/r3-eventbroker_zmq/sockettoevent.go
index 2445c78..6511ff0 100644
--- a/go/r3-eventbroker_zmq/sockettoevent.go
+++ b/go/r3-eventbroker_zmq/sockettoevent.go
@@ -29,19 +29,19 @@ var (
 
 func parseSocketInputLine_State(lines [][]byte, ps *pubsub.PubSub, ts int64) {
     switch string(lines[0]) {
-        case "closed,":
-            ps.Pub(r3events.DoorLockUpdate{0, true, ts}, "door")
-        case "opened,":
-            ps.Pub(r3events.DoorLockUpdate{0, false, ts}, "door")
+        case "closed":
+            ps.Pub(r3events.DoorLockUpdate{true, ts}, "door")
+        case "opened":
+            ps.Pub(r3events.DoorLockUpdate{false, ts}, "door")
         case "manual":   //movement
-        case "error,":
-        case "reset,":
-            ps.Pub(r3events.DoorLockUpdate{0, true, ts}, "door")
+        case "error":
+        case "reset":
+            ps.Pub(r3events.DoorLockUpdate{true, ts}, "door")
         case "timeout":   //after open | after close
-        case "opening,":
-        case "closing,":
+        case "opening":
+        case "closing":
         default:
-            log.Print("parseSocketInputLine_State: Unexpected State:", lines)
+            if Syslog_ != nil {Syslog_.Print("parseSocketInputLine_State: Unexpected State:", lines)}
     }
 }
 
@@ -56,8 +56,8 @@ func ParseSocketInputLine(lines [][]byte, ps *pubsub.PubSub, keylookup_socket *z
             parseSocketInputLine_State(lines[1:], ps, ts)
         case "Status:":
             if len(lines) < 3 { return }
-            ps.Pub(r3events.DoorLockUpdate{0, string(lines[1]) == "closed,", ts}, "door")
-            ps.Pub(r3events.DoorAjarUpdate{0, string(lines[len(lines)-1]) == "shut", ts}, "door")
+            ps.Pub(r3events.DoorLockUpdate{string(lines[1]) == "closed,", ts}, "door")
+            ps.Pub(r3events.DoorAjarUpdate{string(lines[len(lines)-1]) == "shut", ts}, "door")
         case "Info(card):":
             if len(lines) < 3 { return }
             if string(lines[2]) != "found" { return }
@@ -74,7 +74,7 @@ func ParseSocketInputLine(lines [][]byte, ps *pubsub.PubSub, keylookup_socket *z
             }
         case "Info(ajar):":
             if len(lines) < 5 { return }
-            ps.Pub(r3events.DoorAjarUpdate{0, string(lines[4]) == "shut", ts}, "door")
+            ps.Pub(r3events.DoorAjarUpdate{string(lines[4]) == "shut", ts}, "door")
         case "open", "close", "toggle", "reset":
             ps.Pub(r3events.DoorCommandEvent{string(lines[0]), string(lines[1]), string(lines[2]), ts},"doorcmd")
         case "photo0":
@@ -91,7 +91,7 @@ func ParseSocketInputLine(lines [][]byte, ps *pubsub.PubSub, keylookup_socket *z
             //try decode r3event
             evnt, err := r3events.UnmarshalByteByte2Event(lines)
             if err == nil {ps.Pub(evnt, "movement")}
-        case "ButtonPressUpdate" :
+        case "BoreDoomButtonPressEvent" :
             //try decode r3event
             evnt, err := r3events.UnmarshalByteByte2Event(lines)
             if err == nil {ps.Pub(evnt, "buttons")}
@@ -110,7 +110,7 @@ func MakeTimeTick(ps *pubsub.PubSub) {
     //~ match_photo := re_photo_.FindStringSubmatch(line)
 	//~ if match_button != nil {
         //~ // brn.Oboite("button0", ts)
-        //~ ps.Pub(ButtonPressUpdate{0, ts}, "buttons")
+        //~ ps.Pub(BoreDoomButtonPressEvent{0, ts}, "buttons")
 	//~ } else if match_temp != nil {
 		//~ newtemp, err := strconv.ParseFloat((match_temp[1]), 32)
 		//~ if err == nil {