diff options
| author | Hans van den Elsen <hans.elsen@esds.nl> | 2016-02-13 16:13:35 +0100 |
|---|---|---|
| committer | Hans van den Elsen <hans.elsen@esds.nl> | 2016-02-13 16:13:35 +0100 |
| commit | 54f8bba338b7262ad6c938bb2284c148fee6cd62 (patch) | |
| tree | d87961aa0c060f461d17f9ac00b8122eb34be22b /src/org/traccar/protocol/XexunProtocolDecoder.java | |
| parent | 8622ba6e081b987a96e3b1885209576f3c389266 (diff) | |
| parent | 9b11013c2376ad0401c194d5cfa0014e0a08502e (diff) | |
| download | trackermap-server-54f8bba338b7262ad6c938bb2284c148fee6cd62.tar.gz trackermap-server-54f8bba338b7262ad6c938bb2284c148fee6cd62.tar.bz2 trackermap-server-54f8bba338b7262ad6c938bb2284c148fee6cd62.zip | |
Merge branch 'master' of https://github.com/tananaev/traccar
Diffstat (limited to 'src/org/traccar/protocol/XexunProtocolDecoder.java')
| -rw-r--r-- | src/org/traccar/protocol/XexunProtocolDecoder.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/org/traccar/protocol/XexunProtocolDecoder.java b/src/org/traccar/protocol/XexunProtocolDecoder.java index f9369b463..0929ee99b 100644 --- a/src/org/traccar/protocol/XexunProtocolDecoder.java +++ b/src/org/traccar/protocol/XexunProtocolDecoder.java @@ -44,8 +44,9 @@ public class XexunProtocolDecoder extends BaseProtocolDecoder { .number("(d+.?d*)?,") // course .number("(dd)(dd)(dd),") // date .expression("[^*]*").text("*") - .number("xx,") // checksum - .expression("([FL]),") // signal + .number("xx") // checksum + .expression("\\r\\n").optional() + .expression(",([FL]),") // signal .expression("([^,]*),").optional() // alarm .any() .number("imei:(d+),") // imei |