diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2017-07-08 15:37:30 +1200 |
|---|---|---|
| committer | Anton Tananaev <anton.tananaev@gmail.com> | 2017-07-08 15:37:30 +1200 |
| commit | b368eda2a2673fceb304efd4a64f36ca7e5b7b9e (patch) | |
| tree | e2c3ff76409bf4bb63f23a4de1e24fe92b162b48 /src/org/traccar/protocol/CarcellProtocolDecoder.java | |
| parent | 731020440991a53034dd2e980add2a08cb9a19de (diff) | |
| download | trackermap-server-b368eda2a2673fceb304efd4a64f36ca7e5b7b9e.tar.gz trackermap-server-b368eda2a2673fceb304efd4a64f36ca7e5b7b9e.tar.bz2 trackermap-server-b368eda2a2673fceb304efd4a64f36ca7e5b7b9e.zip | |
Add more integration tests
Diffstat (limited to 'src/org/traccar/protocol/CarcellProtocolDecoder.java')
| -rw-r--r-- | src/org/traccar/protocol/CarcellProtocolDecoder.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/org/traccar/protocol/CarcellProtocolDecoder.java b/src/org/traccar/protocol/CarcellProtocolDecoder.java index fedc65168..fc5710f09 100644 --- a/src/org/traccar/protocol/CarcellProtocolDecoder.java +++ b/src/org/traccar/protocol/CarcellProtocolDecoder.java @@ -47,7 +47,7 @@ public class CarcellProtocolDecoder extends BaseProtocolDecoder { .number("(d+),") // speed .number("(d+),") // course .groupBegin() - .number("([-+]ddd)([-+]ddd)([-+]ddd),") // x,y,z + .number("([-+]ddd)([-+]ddd)([-+]ddd),") // x,y,z .or() .number("(d+),") // accel .groupEnd() @@ -55,7 +55,7 @@ public class CarcellProtocolDecoder extends BaseProtocolDecoder { .number("(d+),") // csq .number("(d),") // jamming .number("(d+),") // hdop - .expression("([CG]),?") // clock type + .expression("([CG]),?") // clock type .number("(dd)(dd)(dd),") // date (ddmmyy) .number("(dd)(dd)(dd),") // time (hhmmss) .number("(d),") // block @@ -81,7 +81,6 @@ public class CarcellProtocolDecoder extends BaseProtocolDecoder { Channel channel, SocketAddress remoteAddress, Object msg) throws Exception { Parser parser = new Parser(PATTERN, (String) msg); - if (!parser.matches()) { return null; } |