aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/protocol/VtfmsProtocolDecoder.java
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2017-06-21 21:10:26 +1200
committerAnton Tananaev <anton.tananaev@gmail.com>2017-06-21 21:10:26 +1200
commit2f6967e7e53b70bfb0f8e20df2b6b351b8b817cb (patch)
tree0f45e3b5576a7d375b08856fe0bc056cfc27c1da /src/org/traccar/protocol/VtfmsProtocolDecoder.java
parent67c2a69c1ea041f5f42f863396cad0927be9d82b (diff)
downloadtrackermap-server-2f6967e7e53b70bfb0f8e20df2b6b351b8b817cb.tar.gz
trackermap-server-2f6967e7e53b70bfb0f8e20df2b6b351b8b817cb.tar.bz2
trackermap-server-2f6967e7e53b70bfb0f8e20df2b6b351b8b817cb.zip
Add VTFMS protocol test case
Diffstat (limited to 'src/org/traccar/protocol/VtfmsProtocolDecoder.java')
-rw-r--r--src/org/traccar/protocol/VtfmsProtocolDecoder.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/org/traccar/protocol/VtfmsProtocolDecoder.java b/src/org/traccar/protocol/VtfmsProtocolDecoder.java
index 9f8cea04f..f4ff941d0 100644
--- a/src/org/traccar/protocol/VtfmsProtocolDecoder.java
+++ b/src/org/traccar/protocol/VtfmsProtocolDecoder.java
@@ -35,12 +35,12 @@ public class VtfmsProtocolDecoder extends BaseProtocolDecoder {
private static final Pattern PATTERN = new PatternBuilder()
.text("(")
.number("(d{15}),") // imei
- .number("[0-9A-Z]{3}dd,") // packet count
+ .number("[0-9A-Z]{3}dd,") // packet count
.number("(dd),") // packet id
.number("[^,]*,") // reserved
- .number("(d+),") // rssi
- .number("d+,") // fix status
- .number("(d+),") // satellites
+ .number("(d+)?,") // rssi
+ .number("(?:d+)?,") // fix status
+ .number("(d+)?,") // satellites
.number("[^,]*,") // reserved
.expression("([AV]),") // validity
.number("(dd)(dd)(dd),") // time (hhmmss)