diff options
| author | Parveen Kumar Yadav <parveenkumardeeva@gmail.com> | 2018-04-13 10:47:42 +0530 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-13 10:47:42 +0530 |
| commit | d448823edd0e8a7833c79b980cfe9778b849843a (patch) | |
| tree | 50ad1ab51b93915cff422a1834baa5a2c579fce8 /src/org/traccar/protocol/MegastekProtocolDecoder.java | |
| parent | 2c8392a0e16044905d983da56ab0919eadbb3858 (diff) | |
| parent | 617393cf9f052298f7fb35f0c58138c87a6dd5c3 (diff) | |
| download | trackermap-server-d448823edd0e8a7833c79b980cfe9778b849843a.tar.gz trackermap-server-d448823edd0e8a7833c79b980cfe9778b849843a.tar.bz2 trackermap-server-d448823edd0e8a7833c79b980cfe9778b849843a.zip | |
Merge pull request #1 from traccar/master
Bringing Fork Up to Date
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(); |