From 956e0c36b779ebe5b4cd753d6eca2d47caae9670 Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Tue, 7 Apr 2015 18:30:23 +1200 Subject: Fix GL200 frame decoding (fix #880) --- src/org/traccar/protocol/Gl200ProtocolDecoder.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/org/traccar/protocol/Gl200ProtocolDecoder.java b/src/org/traccar/protocol/Gl200ProtocolDecoder.java index 38ecdf4f3..1c20c5cc1 100644 --- a/src/org/traccar/protocol/Gl200ProtocolDecoder.java +++ b/src/org/traccar/protocol/Gl200ProtocolDecoder.java @@ -1,5 +1,5 @@ /* - * Copyright 2012 - 2013 Anton Tananaev (anton.tananaev@gmail.com) + * Copyright 2012 - 2015 Anton Tananaev (anton.tananaev@gmail.com) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -38,7 +38,7 @@ public class Gl200ProtocolDecoder extends BaseProtocolDecoder { private static final Pattern pattern = Pattern.compile( "(?:(?:\\+(?:RESP|BUFF):)|" + - "(?:\\x00\\x04,\\p{XDigit}{4},[01],))" + + "(?:\\x00?\\x04,\\p{XDigit}{4},[01],))" + "GT...," + "(?:[0-9a-fA-F]{6})?," + // Protocol version "(\\d{15}),.*," + // IMEI -- cgit v1.2.3