aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/protocol
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2014-10-01 02:55:54 +1300
committerAnton Tananaev <anton.tananaev@gmail.com>2014-10-01 02:55:54 +1300
commit9cab5ed55b930c9a227cb0a9bf4d43913c2249b4 (patch)
tree4f5fc36e7f55bdf87f07f73d5ab159f12a2ffba8 /src/org/traccar/protocol
parent342d98583ac923239f769aaf70bbc9e7979c139f (diff)
downloadtrackermap-server-9cab5ed55b930c9a227cb0a9bf4d43913c2249b4.tar.gz
trackermap-server-9cab5ed55b930c9a227cb0a9bf4d43913c2249b4.tar.bz2
trackermap-server-9cab5ed55b930c9a227cb0a9bf4d43913c2249b4.zip
Parse V680 event field
Diffstat (limited to 'src/org/traccar/protocol')
-rw-r--r--src/org/traccar/protocol/V680ProtocolDecoder.java5
1 files changed, 4 insertions, 1 deletions
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++));