diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2015-06-09 23:22:52 +1200 |
|---|---|---|
| committer | Anton Tananaev <anton.tananaev@gmail.com> | 2015-06-09 23:22:52 +1200 |
| commit | ee4c07115d3bc3e58b92310f54bee7bd616ec669 (patch) | |
| tree | b5a96052b9d32eb19924047eac434058a5812ad3 /src/org/traccar | |
| parent | 1a91db44d43fe0aac0dbd56818f0b779900fa70a (diff) | |
| download | trackermap-server-ee4c07115d3bc3e58b92310f54bee7bd616ec669.tar.gz trackermap-server-ee4c07115d3bc3e58b92310f54bee7bd616ec669.tar.bz2 trackermap-server-ee4c07115d3bc3e58b92310f54bee7bd616ec669.zip | |
Fix new STL060 regex pattern
Diffstat (limited to 'src/org/traccar')
| -rw-r--r-- | src/org/traccar/protocol/Stl060ProtocolDecoder.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/org/traccar/protocol/Stl060ProtocolDecoder.java b/src/org/traccar/protocol/Stl060ProtocolDecoder.java index f23b7be73..30dc4ab5c 100644 --- a/src/org/traccar/protocol/Stl060ProtocolDecoder.java +++ b/src/org/traccar/protocol/Stl060ProtocolDecoder.java @@ -19,10 +19,8 @@ import java.util.Calendar; import java.util.TimeZone; import java.util.regex.Matcher; import java.util.regex.Pattern; - import org.jboss.netty.channel.Channel; import org.jboss.netty.channel.ChannelHandlerContext; - import org.traccar.BaseProtocolDecoder; import org.traccar.model.Event; import org.traccar.model.Position; @@ -33,6 +31,9 @@ public class Stl060ProtocolDecoder extends BaseProtocolDecoder { super(protocol); } + //$1,357804047969310,D001,AP29AW0963,01/01/13,13:24:47,1723.9582N,07834.0945E + //,00100,010,0,0,0,0, + //0,0008478660,1450,40,34,0,0,0,A private static final Pattern pattern = Pattern.compile( ".*\\$1," + "(\\d+)," + // IMEI @@ -55,7 +56,7 @@ public class Stl060ProtocolDecoder extends BaseProtocolDecoder { "([01])," + // Ignition "0,0," + // Reserved "(\\d+)," + // DI - "([^,])," + // RFID + "([^,]+)," + // RFID "(\\d+)," + // Odometer "(\\d+)," + // Temperature "(\\d+)," + // Fuel |