diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2018-03-28 07:41:47 +1300 |
|---|---|---|
| committer | Anton Tananaev <anton.tananaev@gmail.com> | 2018-03-28 07:41:47 +1300 |
| commit | 75375cdc48055ba3a6f4dce1b3a6536e0a32419f (patch) | |
| tree | c12dccff1dc448fdf7a8546ea5499469d2fbdb54 /src/org/traccar/protocol/MegastekProtocolDecoder.java | |
| parent | b98b3370bf975501857f6300a4f140e05cd82d5f (diff) | |
| download | trackermap-server-75375cdc48055ba3a6f4dce1b3a6536e0a32419f.tar.gz trackermap-server-75375cdc48055ba3a6f4dce1b3a6536e0a32419f.tar.bz2 trackermap-server-75375cdc48055ba3a6f4dce1b3a6536e0a32419f.zip | |
Fix MT-200X decoding issue
Diffstat (limited to 'src/org/traccar/protocol/MegastekProtocolDecoder.java')
| -rw-r--r-- | src/org/traccar/protocol/MegastekProtocolDecoder.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/org/traccar/protocol/MegastekProtocolDecoder.java b/src/org/traccar/protocol/MegastekProtocolDecoder.java index 91618b534..14d39e0cc 100644 --- a/src/org/traccar/protocol/MegastekProtocolDecoder.java +++ b/src/org/traccar/protocol/MegastekProtocolDecoder.java @@ -1,5 +1,5 @@ /* - * Copyright 2013 - 2016 Anton Tananaev (anton@traccar.org) + * Copyright 2013 - 2018 Anton Tananaev (anton@traccar.org) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -250,7 +250,7 @@ public class MegastekProtocolDecoder extends BaseProtocolDecoder { .number("(d+),") // mcc .number("(d+),") // mnc .number("(xxxx),") // lac - .number("(xxxx),") // cid + .number("(x+),") // cid .number("(d+)?,") // gsm .expression("([01]+)?,") // input .expression("([01]+)?,") // output @@ -268,7 +268,7 @@ public class MegastekProtocolDecoder extends BaseProtocolDecoder { .number("(d+)?,") // rfid .expression("[^,]*,") .number("(d+)?,") // battery - .expression("([^,]*);") // alert + .expression("([^,]*)") // alert .any() .compile(); |