From b2e05a3552da93ad667c10406c5e9aa0ec702469 Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Tue, 14 Feb 2017 07:45:17 +1300
Subject: Fix H02 status decoding

---
 src/org/traccar/protocol/H02ProtocolDecoder.java | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

(limited to 'src/org/traccar')

diff --git a/src/org/traccar/protocol/H02ProtocolDecoder.java b/src/org/traccar/protocol/H02ProtocolDecoder.java
index 37f6294be..d2d274eeb 100644
--- a/src/org/traccar/protocol/H02ProtocolDecoder.java
+++ b/src/org/traccar/protocol/H02ProtocolDecoder.java
@@ -165,16 +165,10 @@ public class H02ProtocolDecoder extends BaseProtocolDecoder {
             .expression("([EW]),")
             .number("(d+.?d*),")                 // speed
             .number("(d+.?d*)?,")                // course
-            .number("(?:(dd)(dd)(dd))?,")        // date (ddmmyy)
-            .any()
-            .number("(x{8})")                    // status
-            .groupBegin()
-            .number(", *(x+),")                  // mcc
-            .number(" *(x+),")                   // mnc
-            .number(" *(x+),")                   // lac
-            .number(" *(x+)")                    // cid
-            .groupEnd("?")
+            .number("(?:(dd)(dd)(dd))?")         // date (ddmmyy)
             .any()
+            .number(",(x{8})")                   // status
+            .expression("(?:#|,.*)")
             .compile();
 
     private static final Pattern PATTERN_NBR = new PatternBuilder()
-- 
cgit v1.2.3