aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/protocol
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2015-04-06 11:45:58 +1200
committerAnton Tananaev <anton.tananaev@gmail.com>2015-04-06 11:45:58 +1200
commit0549b3ffd07d10d48f35434034a01d1504585df5 (patch)
tree66fb97648fde1569a3777c0e01e0015dc1f2ef85 /src/org/traccar/protocol
parentb16f2be8393581cd516bf8b6c3d188cd6073a80c (diff)
downloadtrackermap-server-0549b3ffd07d10d48f35434034a01d1504585df5.tar.gz
trackermap-server-0549b3ffd07d10d48f35434034a01d1504585df5.tar.bz2
trackermap-server-0549b3ffd07d10d48f35434034a01d1504585df5.zip
Support TT8850 device (fix #880)
Diffstat (limited to 'src/org/traccar/protocol')
-rw-r--r--src/org/traccar/protocol/Gl200ProtocolDecoder.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/org/traccar/protocol/Gl200ProtocolDecoder.java b/src/org/traccar/protocol/Gl200ProtocolDecoder.java
index 0ce8bff5e..38ecdf4f3 100644
--- a/src/org/traccar/protocol/Gl200ProtocolDecoder.java
+++ b/src/org/traccar/protocol/Gl200ProtocolDecoder.java
@@ -37,8 +37,10 @@ public class Gl200ProtocolDecoder extends BaseProtocolDecoder {
}
private static final Pattern pattern = Pattern.compile(
- "\\+(?:RESP|BUFF):GT...," +
- "[0-9a-fA-F]{6}," + // Protocol version
+ "(?:(?:\\+(?:RESP|BUFF):)|" +
+ "(?:\\x00\\x04,\\p{XDigit}{4},[01],))" +
+ "GT...," +
+ "(?:[0-9a-fA-F]{6})?," + // Protocol version
"(\\d{15}),.*," + // IMEI
"(\\d*)," + // GPS accuracy
"(\\d+.\\d)?," + // Speed