aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2014-11-13 16:34:23 +1300
committerAnton Tananaev <anton.tananaev@gmail.com>2014-11-13 16:34:23 +1300
commitedc4c0bee03a9f170eafc3a14503203aab39c527 (patch)
treeffaa89ca91bf8286ca5eab7e3a5d6ac28a35ab74 /src/org/traccar
parent19036fd6e89f9ee6676e759359da611e782b85c7 (diff)
parent7bc95811ab36d2e7205a0ae0efcb8484f057398a (diff)
downloadtrackermap-server-edc4c0bee03a9f170eafc3a14503203aab39c527.tar.gz
trackermap-server-edc4c0bee03a9f170eafc3a14503203aab39c527.tar.bz2
trackermap-server-edc4c0bee03a9f170eafc3a14503203aab39c527.zip
Merge pull request #969 from ManicoW/master
Update Haicom protocol decoder
Diffstat (limited to 'src/org/traccar')
-rw-r--r--src/org/traccar/protocol/HaicomProtocolDecoder.java6
1 files changed, 3 insertions, 3 deletions
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