From 9cab5ed55b930c9a227cb0a9bf4d43913c2249b4 Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Wed, 1 Oct 2014 02:55:54 +1300 Subject: Parse V680 event field --- src/org/traccar/protocol/V680ProtocolDecoder.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/org/traccar/protocol/V680ProtocolDecoder.java b/src/org/traccar/protocol/V680ProtocolDecoder.java index ab70b477e..25c943e57 100644 --- a/src/org/traccar/protocol/V680ProtocolDecoder.java +++ b/src/org/traccar/protocol/V680ProtocolDecoder.java @@ -40,7 +40,7 @@ public class V680ProtocolDecoder extends BaseProtocolDecoder { "([^#]*)#)?" + // User "(\\d+)#" + // Fix "([^#]+)#" + // Password - "[^#]+#" + + "([^#]+)#" + // Event "(\\d+)#" + // Packet number "([^#]+)?#?" + // GSM base station "(?:[^#]+#)?" + @@ -107,6 +107,9 @@ public class V680ProtocolDecoder extends BaseProtocolDecoder { // Password extendedInfo.set("password", parser.group(index++)); + // Event + extendedInfo.set("event", parser.group(index++)); + // Packet number extendedInfo.set("packet", parser.group(index++)); -- cgit v1.2.3