aboutsummaryrefslogtreecommitdiff
path: root/src/org
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2015-03-08 11:17:50 +1300
committerAnton Tananaev <anton.tananaev@gmail.com>2015-03-08 11:17:50 +1300
commit1d3a0b49ead6f0836583cf5e97948c6a86bb8663 (patch)
treefbb983064bfdc9b80afee30acecac8969e2b6f28 /src/org
parentb8d2578c5448bc760a91c80793ff4141a974324f (diff)
downloadtraccar-server-1d3a0b49ead6f0836583cf5e97948c6a86bb8663.tar.gz
traccar-server-1d3a0b49ead6f0836583cf5e97948c6a86bb8663.tar.bz2
traccar-server-1d3a0b49ead6f0836583cf5e97948c6a86bb8663.zip
Fix Meitrack regex pattern
Diffstat (limited to 'src/org')
-rw-r--r--src/org/traccar/protocol/MeitrackProtocolDecoder.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/org/traccar/protocol/MeitrackProtocolDecoder.java b/src/org/traccar/protocol/MeitrackProtocolDecoder.java
index 62bd21a4b..2d8fa9511 100644
--- a/src/org/traccar/protocol/MeitrackProtocolDecoder.java
+++ b/src/org/traccar/protocol/MeitrackProtocolDecoder.java
@@ -56,7 +56,7 @@ public class MeitrackProtocolDecoder extends BaseProtocolDecoder {
"([AV])," + // Validity
"(\\d+)," + // Satellites
"(\\d+)," + // GSM Signal
- "(\\d+)," + // Speed
+ "(\\d+\\.?\\d*)," + // Speed
"(\\d+)," + // Course
"(\\d+\\.?\\d*)," + // HDOP
"(-?\\d+)," + // Altitude
@@ -68,7 +68,7 @@ public class MeitrackProtocolDecoder extends BaseProtocolDecoder {
"(\\p{XDigit}+)?\\|" + // ADC2
"(\\p{XDigit}+)?\\|" + // ADC3
"(\\p{XDigit}+)\\|" + // Battery
- "(\\p{XDigit}+)," + // Power*/
+ "(\\p{XDigit}+)," + // Power
".*(\r\n)?");
private Position decodeRegularMessage(Channel channel, ChannelBuffer buf) {