3 files changed, 92 insertions, 71 deletions

diff --git a/src/net/sourceforge/opentracking/protocol/t55/T55ProtocolDecoder.java b/src/net/sourceforge/opentracking/protocol/t55/T55ProtocolDecoder.java
index 967165bcb..01954b474 100644
--- a/src/net/sourceforge/opentracking/protocol/t55/T55ProtocolDecoder.java
+++ b/src/net/sourceforge/opentracking/protocol/t55/T55ProtocolDecoder.java
@@ -45,6 +45,11 @@ public class T55ProtocolDecoder extends OneToOneDecoder {
      * Reset connection delay
      */
     private Integer resetDelay;
+    
+    /**
+     * Device ID
+     */
+    private Long deviceId;
 
     /**
      * Init device table
@@ -58,21 +63,17 @@ public class T55ProtocolDecoder extends OneToOneDecoder {
      * Regular expressions pattern
      */
     static private Pattern pattern = Pattern.compile(
-            "\\(" +
-            "(\\d+)" +                   // Device ID
-            "(.{4})" +                   // Command
-            "(\\d{15})" +                // IMEI (?)
-            "(\\d{2})(\\d{2})(\\d{2})" + // Date (YYMMDD)
-            "([AV])" +                   // Validity
-            "(\\d{2})(\\d{2}.\\d{4})" +  // Latitude (DDMM.MMMM)
-            "([NS])" +
-            "(\\d{3})(\\d{2}.\\d{4})" +  // Longitude (DDDMM.MMMM)
-            "([EW])" +
-            "(\\d+.\\d)" +               // Speed
-            "(\\d{2})(\\d{2})(\\d{2})" + // Time (HHMMSS)
-            "(\\d+.\\d{2})" +            // Course
-            "(\\d+)" +                   // State
-            ".+");                       // Mileage (?)
+            "\\$GPRMC," +
+            "(\\d{2})(\\d{2})(\\d{2}).(\\d{3})," + // Time (HHMMSS.SSS)
+            "([AV])," +                  // Validity
+            "(\\d{2})(\\d{2}.\\d{4})," + // Latitude (DDMM.MMMM)
+            "([NS])," +
+            "(\\d{3})(\\d{2}.\\d{4})," + // Longitude (DDDMM.MMMM)
+            "([EW])," +
+            "(\\d+.\\d{2})?," +           // Speed
+            "(\\d+.\\d{2})?," +           // Course
+            "(\\d{2})(\\d{2})(\\d{2})" + // Date (DDMMYY)
+            ".+");                     // Other (Checksumm)
 
     /**
      * Decode message
@@ -82,65 +83,87 @@ public class T55ProtocolDecoder extends OneToOneDecoder {
             throws Exception {
 
         String sentence = (String) msg;
+        
+        //System.out.println(sentence);
 
-        System.out.println(sentence); // DELME
-
-        // TODO: Send response (?)
-
-        // Parse message
-        Matcher parser = pattern.matcher(sentence);
-        if (!parser.matches()) {
-            return null;
+        // Detect device ID
+        if (sentence.contains("$PGID")) {
+            String imei = sentence.substring(6, 6 + 15);
+            deviceId = dataManager.getDeviceByImei(imei).getId();
         }
 
-        // Create new position
-        Position position = new Position();
-
-        Integer index = 1;
-        index += 2; // Skip Device ID and command
-
-        // Get device by IMEI
-        String imei = parser.group(index++);
-        position.setDeviceId(dataManager.getDeviceByImei(imei).getId());
-
-        // Date
-        Calendar time = new GregorianCalendar(TimeZone.getTimeZone("UTC"));
-        time.clear();
-        time.set(Calendar.YEAR, 2000 + Integer.valueOf(parser.group(index++)));
-        time.set(Calendar.MONTH, Integer.valueOf(parser.group(index++)) - 1);
-        time.set(Calendar.DAY_OF_MONTH, Integer.valueOf(parser.group(index++)));
-
-        // Validity
-        position.setValid(parser.group(index++).compareTo("A") == 0 ? true : false);
-
-        // Latitude
-        Double latitude = Double.valueOf(parser.group(index++));
-        latitude += Double.valueOf(parser.group(index++)) / 60;
-        if (parser.group(index++).compareTo("S") == 0) latitude = -latitude;
-        position.setLatitude(latitude);
-
-        // Longitude
-        Double lonlitude = Double.valueOf(parser.group(index++));
-        lonlitude += Double.valueOf(parser.group(index++)) / 60;
-        if (parser.group(index++).compareTo("W") == 0) lonlitude = -lonlitude;
-        position.setLongitude(lonlitude);
-
-        // Altitude
-        position.setAltitude(0.0);
+        // Parse message
+        else if (sentence.contains("$GPRMC") && deviceId != null) {
 
-        // Speed
-        position.setSpeed(Double.valueOf(parser.group(index++)));
+            // Send response
+            if (channel != null) {
+                channel.write("OK1\r\n");
+            }
 
-        // Time
-        time.set(Calendar.HOUR, Integer.valueOf(parser.group(index++)));
-        time.set(Calendar.MINUTE, Integer.valueOf(parser.group(index++)));
-        time.set(Calendar.SECOND, Integer.valueOf(parser.group(index++)));
-        position.setTime(time.getTime());
+            // Parse message
+            Matcher parser = pattern.matcher(sentence);
+            if (!parser.matches()) {
+                return null;
+            }
+            
+            // Create new position
+            Position position = new Position();
+            position.setDeviceId(deviceId);
+            
+            Integer index = 1;
+
+            // Time
+            Calendar time = new GregorianCalendar(TimeZone.getTimeZone("UTC"));
+            time.clear();
+            time.set(Calendar.HOUR, Integer.valueOf(parser.group(index++)));
+            time.set(Calendar.MINUTE, Integer.valueOf(parser.group(index++)));
+            time.set(Calendar.SECOND, Integer.valueOf(parser.group(index++)));
+            index += 1; // Skip milliseconds
+            position.setTime(time.getTime());
+        
+            // Validity
+            position.setValid(parser.group(index++).compareTo("A") == 0 ? true : false);
+            
+            // Latitude
+            Double latitude = Double.valueOf(parser.group(index++));
+            latitude += Double.valueOf(parser.group(index++)) / 60;
+            if (parser.group(index++).compareTo("S") == 0) latitude = -latitude;
+            position.setLatitude(latitude);
+
+            // Longitude
+            Double lonlitude = Double.valueOf(parser.group(index++));
+            lonlitude += Double.valueOf(parser.group(index++)) / 60;
+            if (parser.group(index++).compareTo("W") == 0) lonlitude = -lonlitude;
+            position.setLongitude(lonlitude);
+
+            // Speed
+            String speed = parser.group(index++);
+            if (speed != null) {
+                position.setSpeed(Double.valueOf(speed));
+            } else {
+                position.setSpeed(0.0);
+            }
 
-        // Course
-        position.setCourse(Double.valueOf(parser.group(index++)));
+            // Course
+            String course = parser.group(index++);
+            if (course != null) {
+                position.setCourse(Double.valueOf(course));
+            } else {
+                position.setCourse(0.0);
+            }
+            
+            // Date
+            time.set(Calendar.DAY_OF_MONTH, Integer.valueOf(parser.group(index++)));
+            time.set(Calendar.MONTH, Integer.valueOf(parser.group(index++)) - 1);
+            time.set(Calendar.YEAR, 2000 + Integer.valueOf(parser.group(index++)));
+            
+            // Altitude
+            position.setAltitude(0.0);
+            
+            return position;
+        }
 
-        return position;
+        return null;
     }
 
     /**
diff --git a/src/net/sourceforge/opentracking/protocol/tk103/Tk103ProtocolDecoder.java b/src/net/sourceforge/opentracking/protocol/tk103/Tk103ProtocolDecoder.java
index ff7c41fb2..12108b121 100644
--- a/src/net/sourceforge/opentracking/protocol/tk103/Tk103ProtocolDecoder.java
+++ b/src/net/sourceforge/opentracking/protocol/tk103/Tk103ProtocolDecoder.java
@@ -83,8 +83,6 @@ public class Tk103ProtocolDecoder extends OneToOneDecoder {
 
         String sentence = (String) msg;
 
-        System.out.println(sentence); // DELME
-
         // TODO: Send response (?)
 
         // Parse message
diff --git a/src/net/sourceforge/opentracking/protocol/xexun/XexunProtocolDecoder.java b/src/net/sourceforge/opentracking/protocol/xexun/XexunProtocolDecoder.java
index 73b7cef11..872569e1a 100644
--- a/src/net/sourceforge/opentracking/protocol/xexun/XexunProtocolDecoder.java
+++ b/src/net/sourceforge/opentracking/protocol/xexun/XexunProtocolDecoder.java
@@ -66,8 +66,8 @@ public class XexunProtocolDecoder extends OneToOneDecoder {
             "([NS])," +
             "([\\d]{3})([\\d]{2}.[\\d]{4})," +  // Longitude (DDDMM.MMMM)
             "([EW])," +
-            "([\\d]+.[\\d]+)," +              // Speed
-            "([\\d]+.[\\d]+)?," +              // Course
+            "([\\d]+.[\\d]+)," +                // Speed
+            "([\\d]+.[\\d]+)?," +               // Course
             "([\\d]{2})([\\d]{2})([\\d]{2})," + // Date (DDMMYY)
             ".*imei:" +
             "([\\d]+),");                       // IMEI