From 1c70f6cad768f47ec8c49444e03691727699322b Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Sun, 1 Dec 2013 20:20:23 +1300 Subject: Improve intellitrack decoder --- src/org/traccar/protocol/IntellitracProtocolDecoder.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/org/traccar/protocol/IntellitracProtocolDecoder.java') diff --git a/src/org/traccar/protocol/IntellitracProtocolDecoder.java b/src/org/traccar/protocol/IntellitracProtocolDecoder.java index b71237e7f..e45c84ba9 100644 --- a/src/org/traccar/protocol/IntellitracProtocolDecoder.java +++ b/src/org/traccar/protocol/IntellitracProtocolDecoder.java @@ -33,7 +33,7 @@ public class IntellitracProtocolDecoder extends BaseProtocolDecoder { super(serverManager); } - static private Pattern pattern = Pattern.compile( + private static final Pattern pattern = Pattern.compile( "(?:.+,)?(\\d+)," + // Device Identifier "(\\d{4})(\\d{2})(\\d{2})" + // Date (YYYYMMDD) "(\\d{2})(\\d{2})(\\d{2})," + // Time (HHMMSS) @@ -47,7 +47,8 @@ public class IntellitracProtocolDecoder extends BaseProtocolDecoder { "(\\d+)," + // Input "(\\d+),?" + // Output "(\\d+\\.\\d+)?,?" + // ADC1 - "(\\d+\\.\\d+)?"); // ADC2 + "(\\d+\\.\\d+)?" + // ADC2 + ".*"); @Override protected Object decode( -- cgit v1.2.3