aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/protocol
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2013-02-26 19:42:00 +1300
committerAnton Tananaev <anton.tananaev@gmail.com>2013-02-26 19:42:00 +1300
commit1ad3beb4c64cabe866a9ad9bcd60d1c2b49b99f3 (patch)
treeb669fcbe0b72853f657caf7c6627821b9e4949a3 /src/org/traccar/protocol
parent4fced732754e221871d52bef179d8962661f1835 (diff)
parent63c453b07baad3c8e6c671fd0cc05a53b4faacd6 (diff)
downloadtraccar-server-1ad3beb4c64cabe866a9ad9bcd60d1c2b49b99f3.tar.gz
traccar-server-1ad3beb4c64cabe866a9ad9bcd60d1c2b49b99f3.tar.bz2
traccar-server-1ad3beb4c64cabe866a9ad9bcd60d1c2b49b99f3.zip
Merge branch 'master' of github.com:tananaev/traccar
Diffstat (limited to 'src/org/traccar/protocol')
-rw-r--r--src/org/traccar/protocol/MeiligaoProtocolDecoder.java4
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