diff options
| author | Oliver Schramm <oliver.schramm97@gmail.com> | 2021-06-24 19:39:18 +0200 |
|---|---|---|
| committer | Oliver Schramm <oliver.schramm97@gmail.com> | 2021-06-24 19:39:18 +0200 |
| commit | c10c4b985002d9b39213f6a4e33466212705f66d (patch) | |
| tree | 14a9c21c2c5674a8cd0c5d89cfc2e6d1c6614aed /src/test/java/org | |
| parent | 48670633fd49e3ec2bd781f858b11ccd2083878d (diff) | |
| download | traccar-server-c10c4b985002d9b39213f6a4e33466212705f66d.tar.gz traccar-server-c10c4b985002d9b39213f6a4e33466212705f66d.tar.bz2 traccar-server-c10c4b985002d9b39213f6a4e33466212705f66d.zip | |
Improve compatibility with megastek devices
Megastek devices send some data which either is not
fully compliant with the megastek protocol (by omitting
some data) or which is (for our purposes) garbage data,
which is only delimited with a single LF (0x0A).
Diffstat (limited to 'src/test/java/org')
| -rw-r--r-- | src/test/java/org/traccar/protocol/MegastekFrameDecoderTest.java | 4 | ||||
| -rw-r--r-- | src/test/java/org/traccar/protocol/MegastekProtocolDecoderTest.java | 6 |
2 files changed, 10 insertions, 0 deletions
diff --git a/src/test/java/org/traccar/protocol/MegastekFrameDecoderTest.java b/src/test/java/org/traccar/protocol/MegastekFrameDecoderTest.java index f1650b1b2..19e5cb0ab 100644 --- a/src/test/java/org/traccar/protocol/MegastekFrameDecoderTest.java +++ b/src/test/java/org/traccar/protocol/MegastekFrameDecoderTest.java @@ -22,6 +22,10 @@ public class MegastekFrameDecoderTest extends ProtocolTest { binary("53545832363034373520202020202020202020024f244750524d432c3133313131302e30302c562c2c2c2c2c2c2c3036303931332c2c2c4e2a37362c3232322c30312c383135412c443435352c31312c39372c303030302c303030312c302c54696d65723b3735"), decoder.decode(null, null, binary("53545832363034373520202020202020202020024f244750524d432c3133313131302e30302c562c2c2c2c2c2c2c3036303931332c2c2c4e2a37362c3232322c30312c383135412c443435352c31312c39372c303030302c303030312c302c54696d65723b37350d0a"))); + verifyFrame( + binary("636d643d6169643b757365723d2a2a2a3b7077643d2a2a2a3b6c61743d33382e35353239353338333b6c6f6e3d32312e30353337343530303b706163633d31303030"), + decoder.decode(null, null, binary("636d643d6169643b757365723d2a2a2a3b7077643d2a2a2a3b6c61743d33382e35353239353338333b6c6f6e3d32312e30353337343530303b706163633d313030300a"))); + } } diff --git a/src/test/java/org/traccar/protocol/MegastekProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/MegastekProtocolDecoderTest.java index 3c8377b51..83d62e766 100644 --- a/src/test/java/org/traccar/protocol/MegastekProtocolDecoderTest.java +++ b/src/test/java/org/traccar/protocol/MegastekProtocolDecoderTest.java @@ -10,6 +10,12 @@ public class MegastekProtocolDecoderTest extends ProtocolTest { public void testDecode() throws Exception { var decoder = new MegastekProtocolDecoder(null); + + verifyPosition(decoder, text( + "$MGV002,860719020193193,,S,070521,160748,V,2255.09165,N,11404.01322,E,00,00,00,,,,,,,,,,,,,,,,,,,10,015,Restart;!")); + + verifyPosition(decoder, text( + "$MGV002,860719020193193,,R,070621,115717,V,2255.09165,N,11404.01322,E,00,00,00,99.9,,,,,460,07,262C,0F54,20,,,,,,,,,10,039,Timer;!")); verifyPosition(decoder, text( "0132$MGV002,869152024261561,,S,310818,133945,V,3814.35442,N,02144.50662,E,00,00,00,99.9,,,44.2,,202,10,,,13,0,0,0,0,90,,,,11,100,Timer;!")); |