diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2018-03-28 07:31:15 +1300 |
|---|---|---|
| committer | Anton Tananaev <anton.tananaev@gmail.com> | 2018-03-28 07:31:15 +1300 |
| commit | b98b3370bf975501857f6300a4f140e05cd82d5f (patch) | |
| tree | b135324bf22a7462b135ef6e3b4978adbc0f382e | |
| parent | 85c43a28405deab09a15ffbc8fcaa38570b69cf8 (diff) | |
| download | trackermap-server-b98b3370bf975501857f6300a4f140e05cd82d5f.tar.gz trackermap-server-b98b3370bf975501857f6300a4f140e05cd82d5f.tar.bz2 trackermap-server-b98b3370bf975501857f6300a4f140e05cd82d5f.zip | |
Fix GoSafe G6S and G3S decoding
| -rw-r--r-- | src/org/traccar/protocol/GoSafeProtocolDecoder.java | 4 | ||||
| -rw-r--r-- | test/org/traccar/protocol/GoSafeProtocolDecoderTest.java | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/src/org/traccar/protocol/GoSafeProtocolDecoder.java b/src/org/traccar/protocol/GoSafeProtocolDecoder.java index 13ce839ea..44dfb08a2 100644 --- a/src/org/traccar/protocol/GoSafeProtocolDecoder.java +++ b/src/org/traccar/protocol/GoSafeProtocolDecoder.java @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2017 Anton Tananaev (anton@traccar.org) + * Copyright 2015 - 2018 Anton Tananaev (anton@traccar.org) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -81,7 +81,7 @@ public class GoSafeProtocolDecoder extends BaseProtocolDecoder { .groupBegin() .text("COT:") .number("(d+)") // odometer - .number("(?:;d+:d+:d+)?") // engine hours + .number("(?:;d+-d+-d+)?") // engine hours .expression(",?") .groupEnd("?") .groupBegin() diff --git a/test/org/traccar/protocol/GoSafeProtocolDecoderTest.java b/test/org/traccar/protocol/GoSafeProtocolDecoderTest.java index 42293f7ec..3e4e8f413 100644 --- a/test/org/traccar/protocol/GoSafeProtocolDecoderTest.java +++ b/test/org/traccar/protocol/GoSafeProtocolDecoderTest.java @@ -11,6 +11,12 @@ public class GoSafeProtocolDecoderTest extends ProtocolTest { GoSafeProtocolDecoder decoder = new GoSafeProtocolDecoder(new GoSafeProtocol()); verifyPositions(decoder, text( + "*GS06,860078024213915,032544190318,,SYS:G3SC;V3.32;V1.1.8,GPS:A;7;N3.052417;E101.787112;0;0;94;1.38,COT:686;0-0-0,ADC:16.25;4.09,DTT:4000;E0;0;0;0;1#")); + + verifyPositions(decoder, text( + "*GS06,351535058659335,062728190318,,SYS:G6S;V3.32;V1.0.5,GPS:A;10;N23.169806;E113.450760;0;0;81;0.77,COT:0,ADC:0.00;0.16,DTT:80;E0;0;0;0;1#")); + + verifyPositions(decoder, text( "*GS26,356449061046586,082522030117,,SYS:G737IC;V1.13;V1.0.5,GPS:V;5;N42.594136;W70.723832;0;0;8;2.06,GSM:;;310;260;C76D;9F1D;-85,ADC:3.86,DTT:3918C;;0;0;0;1,#")); verifyPositions(decoder, text( |