From 9e902a42c36a8fb5791cf619fd68c6af96e12aab Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Sat, 7 Sep 2013 12:40:37 +1200
Subject: Fix megastek decoder (fix #382)

---
 src/org/traccar/protocol/MegastekProtocolDecoder.java | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src')

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) {
         
-- 
cgit v1.2.3