From 36f04b88fc965a2f31e5d98f95cb37af15e8dc05 Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Thu, 23 Jun 2016 11:54:24 +1200 Subject: Fix Telic power decoding (fix #1735) --- src/org/traccar/protocol/TelicProtocolDecoder.java | 1 + test/org/traccar/protocol/TelicProtocolDecoderTest.java | 3 +++ 2 files changed, 4 insertions(+) diff --git a/src/org/traccar/protocol/TelicProtocolDecoder.java b/src/org/traccar/protocol/TelicProtocolDecoder.java index b8929fae5..be4c80b84 100644 --- a/src/org/traccar/protocol/TelicProtocolDecoder.java +++ b/src/org/traccar/protocol/TelicProtocolDecoder.java @@ -52,6 +52,7 @@ public class TelicProtocolDecoder extends BaseProtocolDecoder { .number("(d+),") // satellites .expression("(?:[^,]*,){7}") .number("(d+),") // battery + .expression("[^,]*,") .number("(d+),") // external .any() .compile(); diff --git a/test/org/traccar/protocol/TelicProtocolDecoderTest.java b/test/org/traccar/protocol/TelicProtocolDecoderTest.java index 79ec0aa68..07a7da1f8 100644 --- a/test/org/traccar/protocol/TelicProtocolDecoderTest.java +++ b/test/org/traccar/protocol/TelicProtocolDecoderTest.java @@ -10,6 +10,9 @@ public class TelicProtocolDecoderTest extends ProtocolTest { TelicProtocolDecoder decoder = new TelicProtocolDecoder(new TelicProtocol()); + verifyPosition(decoder, text( + "003097061325,220616044200,0,220616044200,247169,593911,3,48,248,8,,,50,1024846,,1111,00,48,0,51,0406")); + verifyPosition(decoder, text( "003097061325,210216112630,0,210216001405,246985,594078,3,0,283,12,,,23,4418669,,0010,00,117,0,0,0108")); -- cgit v1.2.3