From 595221ee506b59386694da5f4f892d04cd865e63 Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Wed, 25 Feb 2015 14:18:03 +1300
Subject: Support new Xexun format (fix #1096)

---
 src/org/traccar/protocol/Xexun2ProtocolDecoder.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/org/traccar/protocol/Xexun2ProtocolDecoder.java')

diff --git a/src/org/traccar/protocol/Xexun2ProtocolDecoder.java b/src/org/traccar/protocol/Xexun2ProtocolDecoder.java
index ea2197b31..d60e48750 100644
--- a/src/org/traccar/protocol/Xexun2ProtocolDecoder.java
+++ b/src/org/traccar/protocol/Xexun2ProtocolDecoder.java
@@ -50,14 +50,14 @@ public class Xexun2ProtocolDecoder extends BaseProtocolDecoder {
             "(\\d+\\.\\d+)," +                  // Speed
             "(\\d+\\.\\d+)?," +                 // Course
             "(\\d{2})(\\d{2})(\\d{2})," +       // Date (DDMMYY)
-            "[^,]*,[^,]*,.\\*..," +             // Checksum
+            "[^\\*]*\\*..,"       +             // Checksum
             "([FL])," +                         // Signal
             "(?:([^,]*),)?" +                   // Alarm
             ".*imei:" +
             "(\\d+)," +                         // IMEI
             "(\\d+)," +                         // Satellites
             "(-?\\d+\\.\\d+)?," +               // Altitude
-            "[FL]:(\\d+\\.\\d+)V," +            // Power
+            "[FL]:(\\d+\\.\\d+)V" +             // Power
             ".*" +
             "[\r\n]*");
 
-- 
cgit v1.2.3