diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2013-09-07 12:40:37 +1200 |
|---|---|---|
| committer | Anton Tananaev <anton.tananaev@gmail.com> | 2013-09-07 12:40:37 +1200 |
| commit | 9e902a42c36a8fb5791cf619fd68c6af96e12aab (patch) | |
| tree | 7bad4dc89af43cd3a7cd7c35143f51f57df2de4f /src/org/traccar/protocol/MegastekProtocolDecoder.java | |
| parent | 36b23f0fe4ec1334102fa5d0a21d3692e9ce6da9 (diff) | |
| download | trackermap-server-9e902a42c36a8fb5791cf619fd68c6af96e12aab.tar.gz trackermap-server-9e902a42c36a8fb5791cf619fd68c6af96e12aab.tar.bz2 trackermap-server-9e902a42c36a8fb5791cf619fd68c6af96e12aab.zip | |
Fix megastek decoder (fix #382)
Diffstat (limited to 'src/org/traccar/protocol/MegastekProtocolDecoder.java')
| -rw-r--r-- | src/org/traccar/protocol/MegastekProtocolDecoder.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/org/traccar/protocol/MegastekProtocolDecoder.java b/src/org/traccar/protocol/MegastekProtocolDecoder.java index d014869d8..ee7c5df2c 100644 --- a/src/org/traccar/protocol/MegastekProtocolDecoder.java +++ b/src/org/traccar/protocol/MegastekProtocolDecoder.java @@ -67,12 +67,12 @@ public class MegastekProtocolDecoder extends BaseProtocolDecoder { "(\\d+)," + // Battery "(\\d+)," + // Flags "(\\d+)," + // Inputs - "(\\d+)," + // Outputs - "(\\d\\.\\d{2})," + // ADC 1 - "(\\d\\.\\d{2})," + // ADC 2 - "(\\d\\.\\d{2})," + // ADC 3 + "(?:(\\d+),)?" + // Outputs + "(\\d\\.?\\d*)," + // ADC 1 + "(?:(\\d\\.\\d{2})," + // ADC 2 + "(\\d\\.\\d{2}),)?" + // ADC 3 "([^;]+);" + // Alarm - ".+"); // Checksum + ".*"); // Checksum private boolean parseGPRMC(String gprmc, Position position) { |