aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/protocol/Xexun2ProtocolDecoder.java
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2015-02-25 14:18:03 +1300
committerAnton Tananaev <anton.tananaev@gmail.com>2015-02-25 14:18:03 +1300
commit595221ee506b59386694da5f4f892d04cd865e63 (patch)
tree72f11ef99c29ac1f45e31d80e2459ae9e1024b2a /src/org/traccar/protocol/Xexun2ProtocolDecoder.java
parente31017a798a2f6404569ab52be60e6f4846db576 (diff)
downloadtrackermap-server-595221ee506b59386694da5f4f892d04cd865e63.tar.gz
trackermap-server-595221ee506b59386694da5f4f892d04cd865e63.tar.bz2
trackermap-server-595221ee506b59386694da5f4f892d04cd865e63.zip
Support new Xexun format (fix #1096)
Diffstat (limited to 'src/org/traccar/protocol/Xexun2ProtocolDecoder.java')
-rw-r--r--src/org/traccar/protocol/Xexun2ProtocolDecoder.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/org/traccar/protocol/Xexun2ProtocolDecoder.java b/src/org/traccar/protocol/Xexun2ProtocolDecoder.java
index ea2197b31..d60e48750 100644
--- a/src/org/traccar/protocol/Xexun2ProtocolDecoder.java
+++ b/src/org/traccar/protocol/Xexun2ProtocolDecoder.java
@@ -50,14 +50,14 @@ public class Xexun2ProtocolDecoder extends BaseProtocolDecoder {
"(\\d+\\.\\d+)," + // Speed
"(\\d+\\.\\d+)?," + // Course
"(\\d{2})(\\d{2})(\\d{2})," + // Date (DDMMYY)
- "[^,]*,[^,]*,.\\*..," + // Checksum
+ "[^\\*]*\\*..," + // Checksum
"([FL])," + // Signal
"(?:([^,]*),)?" + // Alarm
".*imei:" +
"(\\d+)," + // IMEI
"(\\d+)," + // Satellites
"(-?\\d+\\.\\d+)?," + // Altitude
- "[FL]:(\\d+\\.\\d+)V," + // Power
+ "[FL]:(\\d+\\.\\d+)V" + // Power
".*" +
"[\r\n]*");