From b52c3afd0d05f668592a252e41177f444f681e59 Mon Sep 17 00:00:00 2001
From: 31neKl31n3N4chtmu51k <31neKl31n3N4chtmu51k@gmail.com>
Date: Sat, 31 May 2014 20:58:35 -0300
Subject: changed required block of information "&Y" to optional since my
 CarTrack clone doesn't have this field. It is actually a GT60 clone that
 sends message in the CarTrack format.

---
 src/org/traccar/protocol/CarTrackProtocolDecoder.java      | 2 +-
 test/org/traccar/protocol/CarTrackProtocolDecoderTest.java | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/org/traccar/protocol/CarTrackProtocolDecoder.java b/src/org/traccar/protocol/CarTrackProtocolDecoder.java
index 3ab026dd8..559a5ccc1 100644
--- a/src/org/traccar/protocol/CarTrackProtocolDecoder.java
+++ b/src/org/traccar/protocol/CarTrackProtocolDecoder.java
@@ -53,7 +53,7 @@ public class CarTrackProtocolDecoder extends BaseProtocolDecoder {
             "\\&C(.*)" +                                    // IO Port Data
             "\\&D(.*)" +                                    // Mile Meter Data
             "\\&E(.*)" +                                    // Alarm Data
-            "\\&Y(.*)");                                    // AD Input Data
+            "(?:\\&Y)?(.*)");                               // AD Input Data
 
     @Override
     protected Object decode(
diff --git a/test/org/traccar/protocol/CarTrackProtocolDecoderTest.java b/test/org/traccar/protocol/CarTrackProtocolDecoderTest.java
index f40b45e01..96a8e4b74 100644
--- a/test/org/traccar/protocol/CarTrackProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/CarTrackProtocolDecoderTest.java
@@ -14,6 +14,10 @@ public class CarTrackProtocolDecoderTest {
 
         verify(decoder.decode(null, null,
                 "$$2222234???????&A9955&B102904.000,A,2233.0655,N,11404.9440,E,0.00,,030109,,*17|6.3|&C0100000100&D000024?>&E10000000&Y00100020"));
+        
+        verify(decoder.decode(null, null,
+                "$$2222234???????&A9955&B102904.000,A,2233.0655,N,11404.9440,E,0.00,,030109,,*17|6.3|&C0100000100&D000024?>&E10000000"));
+
 
     }
 
-- 
cgit v1.2.3