From e5549d271325639bae97dc3591ff09bf271cf43c Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Mon, 19 May 2014 18:54:05 +1200 Subject: Support Single LED device --- src/org/traccar/protocol/Tk103ProtocolDecoder.java | 4 ++-- test/org/traccar/protocol/Tk103ProtocolDecoderTest.java | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/org/traccar/protocol/Tk103ProtocolDecoder.java b/src/org/traccar/protocol/Tk103ProtocolDecoder.java index fbcc702b8..200a1855c 100644 --- a/src/org/traccar/protocol/Tk103ProtocolDecoder.java +++ b/src/org/traccar/protocol/Tk103ProtocolDecoder.java @@ -45,8 +45,8 @@ public class Tk103ProtocolDecoder extends BaseProtocolDecoder { "([EW]),?" + "(\\d+\\.\\d)(?:\\d*,)?" + // Speed "(\\d{2})(\\d{2})(\\d{2}),?" + // Time (HHMMSS) - "(\\d+\\.?\\d+)" + // Course - "([0-9a-fA-F]{8})?" + // State + "(\\d+\\.?\\d+),?" + // Course + "([0-9a-fA-F]{8})?,?" + // State "(?:L([0-9a-fA-F]+))?"); // Milage @Override diff --git a/test/org/traccar/protocol/Tk103ProtocolDecoderTest.java b/test/org/traccar/protocol/Tk103ProtocolDecoderTest.java index d9c71c9b6..21066bdb2 100644 --- a/test/org/traccar/protocol/Tk103ProtocolDecoderTest.java +++ b/test/org/traccar/protocol/Tk103ProtocolDecoderTest.java @@ -47,6 +47,9 @@ public class Tk103ProtocolDecoderTest { verify(decoder.decode(null, null, "(352606090042050,BP05,240414,A,4527.3513N,00909.9758E,4.80,112825,155.49")); + + verify(decoder.decode(null, null, + "(013632782450,BP05,101201,A,2234.0297N,11405.9101E,000.0,040137,178.48,00000000,L00000000")); } -- cgit v1.2.3