From 7bc95811ab36d2e7205a0ae0efcb8484f057398a Mon Sep 17 00:00:00 2001
From: ManicoW <ManicoW@users.noreply.github.com>
Date: Wed, 12 Nov 2014 10:55:28 +0100
Subject: Update HaicomProtocolDecoder.java

Modified Regex according to a HI-602X device message, keeping it compatible with the test message
---
 src/org/traccar/protocol/HaicomProtocolDecoder.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/org/traccar/protocol/HaicomProtocolDecoder.java b/src/org/traccar/protocol/HaicomProtocolDecoder.java
index ff7445451..3531ce0d0 100644
--- a/src/org/traccar/protocol/HaicomProtocolDecoder.java
+++ b/src/org/traccar/protocol/HaicomProtocolDecoder.java
@@ -48,11 +48,11 @@ public class HaicomProtocolDecoder extends BaseProtocolDecoder {
             "(\\d+)," +                   // Speed
             "(\\d+)," +                   // Course
             "(\\d+)," +                   // Status
-            "(\\d+)," +                   // GPRS counting value
-            "(\\d+)," +                   // GPS power saving counting value
+            "(\\d*)," +                   // GPRS counting value
+            "(\\d*)," +                   // GPS power saving counting value
             "(\\d+)," +                   // Switch status
             "(\\d+)" +                    // Relay status
-            "[LH]{2}" +                   // Power status
+            "[LH]{0,2}" +                   // Power status
             "\\#V(\\d+)");                // Battery
 
     @Override
-- 
cgit v1.2.3