diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2015-03-15 18:34:22 +1300 |
|---|---|---|
| committer | Anton Tananaev <anton.tananaev@gmail.com> | 2015-03-15 18:34:22 +1300 |
| commit | b01e047c94413facd3bf67d2357bf6ddc2b76297 (patch) | |
| tree | 145e493cede780b5cfc14ae33fd1c6d0bb51691c | |
| parent | b5eb588704b76a4535e656253f3d50df1b046c68 (diff) | |
| download | trackermap-server-b01e047c94413facd3bf67d2357bf6ddc2b76297.tar.gz trackermap-server-b01e047c94413facd3bf67d2357bf6ddc2b76297.tar.bz2 trackermap-server-b01e047c94413facd3bf67d2357bf6ddc2b76297.zip | |
Add AVL201 format support
| -rw-r--r-- | src/org/traccar/protocol/TotemProtocolDecoder.java | 2 | ||||
| -rw-r--r-- | test/org/traccar/protocol/TotemProtocolDecoderTest.java | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/org/traccar/protocol/TotemProtocolDecoder.java b/src/org/traccar/protocol/TotemProtocolDecoder.java index 5e49141b7..5c0cc9bec 100644 --- a/src/org/traccar/protocol/TotemProtocolDecoder.java +++ b/src/org/traccar/protocol/TotemProtocolDecoder.java @@ -60,7 +60,7 @@ public class TotemProtocolDecoder extends BaseProtocolDecoder { "\\d" + // Charged "(\\d{3})" + // Battery "(\\d{4})\\|" + // External Power - "(\\d+)\\|" + // ADC + "(?:(\\d+)\\|)?" + // ADC "(\\p{XDigit}{8})\\|" + // Location Code "(\\d+)\\|" + // Temperature "(\\d+.\\d+)\\|" + // Milage diff --git a/test/org/traccar/protocol/TotemProtocolDecoderTest.java b/test/org/traccar/protocol/TotemProtocolDecoderTest.java index 7b4f95a77..35d30d9ae 100644 --- a/test/org/traccar/protocol/TotemProtocolDecoderTest.java +++ b/test/org/traccar/protocol/TotemProtocolDecoderTest.java @@ -11,6 +11,9 @@ public class TotemProtocolDecoderTest { public void testDecode() throws Exception { TotemProtocolDecoder decoder = new TotemProtocolDecoder(new TestDataManager(), null, null); + + verify(decoder.decode(null, null, + "$$AE860990002922822|AA$GPRMC,051002.00,A,0439.26245,N,10108.94448,E,0.023,,140315,,,A*71|02.98|01.95|02.26|000000000000|20150314051003|13841157|105A3B1C|0000|0.0000|0005|5324")); assertNull(decoder.decode(null, null, "$$BB862170017856731|AA$GPRMC,000000.00,V,0000.0000,N,00000.0000,E,000.0,000.0,000000,,,A*73|00.0|00.0|00.0|000000001000|20000000000000|13790000|00000000|00000000|00000000|0.0000|0007|8C23")); |