diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2013-12-01 20:20:23 +1300 |
|---|---|---|
| committer | Anton Tananaev <anton.tananaev@gmail.com> | 2013-12-01 20:20:23 +1300 |
| commit | 1c70f6cad768f47ec8c49444e03691727699322b (patch) | |
| tree | af4e43d41c8642ce531db77ef4d2051666533f8c /src/org/traccar/protocol/IntellitracProtocolDecoder.java | |
| parent | 1644fb040d087a570afab3030dba5260075d64a6 (diff) | |
| download | trackermap-server-1c70f6cad768f47ec8c49444e03691727699322b.tar.gz trackermap-server-1c70f6cad768f47ec8c49444e03691727699322b.tar.bz2 trackermap-server-1c70f6cad768f47ec8c49444e03691727699322b.zip | |
Improve intellitrack decoder
Diffstat (limited to 'src/org/traccar/protocol/IntellitracProtocolDecoder.java')
| -rw-r--r-- | src/org/traccar/protocol/IntellitracProtocolDecoder.java | 5 |
1 files changed, 3 insertions, 2 deletions
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( |