diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2013-02-26 19:42:00 +1300 |
|---|---|---|
| committer | Anton Tananaev <anton.tananaev@gmail.com> | 2013-02-26 19:42:00 +1300 |
| commit | 1ad3beb4c64cabe866a9ad9bcd60d1c2b49b99f3 (patch) | |
| tree | b669fcbe0b72853f657caf7c6627821b9e4949a3 /src/org | |
| parent | 4fced732754e221871d52bef179d8962661f1835 (diff) | |
| parent | 63c453b07baad3c8e6c671fd0cc05a53b4faacd6 (diff) | |
| download | trackermap-server-1ad3beb4c64cabe866a9ad9bcd60d1c2b49b99f3.tar.gz trackermap-server-1ad3beb4c64cabe866a9ad9bcd60d1c2b49b99f3.tar.bz2 trackermap-server-1ad3beb4c64cabe866a9ad9bcd60d1c2b49b99f3.zip | |
Merge branch 'master' of github.com:tananaev/traccar
Diffstat (limited to 'src/org')
| -rw-r--r-- | src/org/traccar/protocol/MeiligaoProtocolDecoder.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/org/traccar/protocol/MeiligaoProtocolDecoder.java b/src/org/traccar/protocol/MeiligaoProtocolDecoder.java index f40d64b26..9be8a8555 100644 --- a/src/org/traccar/protocol/MeiligaoProtocolDecoder.java +++ b/src/org/traccar/protocol/MeiligaoProtocolDecoder.java @@ -49,8 +49,8 @@ public class MeiligaoProtocolDecoder extends BaseProtocolDecoder { "([EW])," + "(\\d+.\\d+)," + // Speed "(\\d+\\.?\\d*)?," + // Course - "(\\d{2})(\\d{2})(\\d{2})," + // Date (DDMMYY) - "[^\\|]+\\|(\\d+\\.\\d)\\|" + // Dilution of precision + "(\\d{2})(\\d{2})(\\d{2})" + // Date (DDMMYY) + "[^\\|]*\\|(\\d+\\.\\d)\\|" + // Dilution of precision "(\\d+\\.?\\d*)\\|" + // Altitude "([0-9a-fA-F]+)?" + // State "(?:\\|([0-9a-fA-F]+),([0-9a-fA-F]+))?" + // ADC |