diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2021-03-13 19:22:02 -0800 |
|---|---|---|
| committer | Anton Tananaev <anton.tananaev@gmail.com> | 2021-03-13 19:22:02 -0800 |
| commit | 3f790f5b10448d7993f9df6c4550afed4893c6a0 (patch) | |
| tree | aaf92ae6bd75260469ea75dbd13fac52f79fef57 /src/main/java/org/traccar | |
| parent | b747bc81526ef877c34d3eeca6fcd8d997b6fba8 (diff) | |
| download | traccar-server-3f790f5b10448d7993f9df6c4550afed4893c6a0.tar.gz traccar-server-3f790f5b10448d7993f9df6c4550afed4893c6a0.tar.bz2 traccar-server-3f790f5b10448d7993f9df6c4550afed4893c6a0.zip | |
Support GV600MG format
Diffstat (limited to 'src/main/java/org/traccar')
| -rw-r--r-- | src/main/java/org/traccar/protocol/Gl200TextProtocolDecoder.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/main/java/org/traccar/protocol/Gl200TextProtocolDecoder.java b/src/main/java/org/traccar/protocol/Gl200TextProtocolDecoder.java index a95c90616..126656361 100644 --- a/src/main/java/org/traccar/protocol/Gl200TextProtocolDecoder.java +++ b/src/main/java/org/traccar/protocol/Gl200TextProtocolDecoder.java @@ -75,7 +75,7 @@ public class Gl200TextProtocolDecoder extends BaseProtocolDecoder { .expression("(?:[0-9Ff]{20})?,") // iccid .number("(d{1,2}),") // rssi .number("d{1,2},") - .expression("[01],") // external power + .expression("[01]{1,2},") // external power .number("([d.]+)?,") // odometer or external power .number("d*,") // backup battery or lightness .number("(d+.d+),") // battery @@ -97,6 +97,8 @@ public class Gl200TextProtocolDecoder extends BaseProtocolDecoder { .number("(xx)?,") // digital output .number("[-+]dddd,") // timezone .expression("[01],") // daylight saving + .or() + .any() .groupEnd() .number("(dddd)(dd)(dd)") // date (yyyymmdd) .number("(dd)(dd)(dd),") // time (hhmmss) |