aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2016-03-05 11:02:28 +1300
committerAnton Tananaev <anton.tananaev@gmail.com>2016-03-05 11:02:28 +1300
commit507cc9154d8a40d96fd52447380120c9c3a5b98c (patch)
treeaeeefa8d450d2e7bfbb6518b4833d5fd355db5cf /src
parenta284dd6053c17c0decac2c8e30772b0c7107aef3 (diff)
downloadtrackermap-server-507cc9154d8a40d96fd52447380120c9c3a5b98c.tar.gz
trackermap-server-507cc9154d8a40d96fd52447380120c9c3a5b98c.tar.bz2
trackermap-server-507cc9154d8a40d96fd52447380120c9c3a5b98c.zip
Further improve GL200 decoder class
Diffstat (limited to 'src')
-rw-r--r--src/org/traccar/protocol/Gl200ProtocolDecoder.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/org/traccar/protocol/Gl200ProtocolDecoder.java b/src/org/traccar/protocol/Gl200ProtocolDecoder.java
index 8605d8295..605add0d5 100644
--- a/src/org/traccar/protocol/Gl200ProtocolDecoder.java
+++ b/src/org/traccar/protocol/Gl200ProtocolDecoder.java
@@ -144,11 +144,11 @@ public class Gl200ProtocolDecoder extends BaseProtocolDecoder {
.number("(d{1,3})?,") // battery
.or()
.number("(d{1,7}.d)?,") // odometer
- .number("(d{5}:dd:dd),") // hour meter
+ .number("(d{5}:dd:dd)?,") // hour meter
.number("(x+)?,") // adc 1
.number("(x+)?,") // adc 2
.number("(d{1,3})?,") // battery
- .number("(d{6})?,,,,") // device status
+ .number("(x{6})?,,,,") // device status
.groupEnd()
.number("(dddd)(dd)(dd)") // date
.number("(dd)(dd)(dd)").optional(2) // time