aboutsummaryrefslogtreecommitdiff
path: root/src/org
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2017-12-20 19:51:19 +1300
committerAnton Tananaev <anton.tananaev@gmail.com>2017-12-20 19:51:41 +1300
commit4fb9b7e1467baf57f54e47ab962c6af1769680c0 (patch)
tree22648b0d6b717072912a1af3aaccab51beb7dc8d /src/org
parentfbba97c6ded44f3a433ca2e3bf18b620752aca1a (diff)
downloadtraccar-server-4fb9b7e1467baf57f54e47ab962c6af1769680c0.tar.gz
traccar-server-4fb9b7e1467baf57f54e47ab962c6af1769680c0.tar.bz2
traccar-server-4fb9b7e1467baf57f54e47ab962c6af1769680c0.zip
Decode odometer and RFID for TK228
Diffstat (limited to 'src/org')
-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 bc7a0b71a..435e2ab14 100644
--- a/src/org/traccar/protocol/MeiligaoProtocolDecoder.java
+++ b/src/org/traccar/protocol/MeiligaoProtocolDecoder.java
@@ -73,7 +73,7 @@ public class MeiligaoProtocolDecoder extends BaseProtocolDecoder {
.expression("(.*)") // driver
.groupEnd("?")
.or()
- .number("|(x{9})") // odometer
+ .number("|(d{1,9})") // odometer
.groupBegin()
.number("|(x{5,})") // rfid
.groupEnd("?")
@@ -262,7 +262,7 @@ public class MeiligaoProtocolDecoder extends BaseProtocolDecoder {
position.set(Position.KEY_ODOMETER, parser.nextHexLong());
position.set(Position.KEY_SATELLITES, parser.nextHexInt());
position.set("driverLicense", parser.next());
- position.set(Position.KEY_ODOMETER, parser.nextHexLong());
+ position.set(Position.KEY_ODOMETER, parser.nextLong());
position.set(Position.KEY_DRIVER_UNIQUE_ID, parser.next());
return position;