aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/protocol/HaicomProtocolDecoder.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/org/traccar/protocol/HaicomProtocolDecoder.java')
-rw-r--r--src/org/traccar/protocol/HaicomProtocolDecoder.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/org/traccar/protocol/HaicomProtocolDecoder.java b/src/org/traccar/protocol/HaicomProtocolDecoder.java
index 3531ce0d0..078ee9ae6 100644
--- a/src/org/traccar/protocol/HaicomProtocolDecoder.java
+++ b/src/org/traccar/protocol/HaicomProtocolDecoder.java
@@ -48,12 +48,12 @@ 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]{0,2}" + // Power status
- "\\#V(\\d+)"); // Battery
+ "(?:[LH]{2})?" + // Power status
+ "\\#V(\\d+).*"); // Battery
@Override
protected Object decode(