1 files changed, 28 insertions, 6 deletions
diff --git a/src/org/traccar/protocol/TmgProtocolDecoder.java b/src/org/traccar/protocol/TmgProtocolDecoder.java
index beb2b0b78..40ce04c5b 100644
--- a/src/org/traccar/protocol/TmgProtocolDecoder.java
+++ b/src/org/traccar/protocol/TmgProtocolDecoder.java
@@ -18,6 +18,7 @@ package org.traccar.protocol;
 import org.jboss.netty.channel.Channel;
 import org.traccar.BaseProtocolDecoder;
 import org.traccar.DeviceSession;
+import org.traccar.helper.BitUtil;
 import org.traccar.helper.DateBuilder;
 import org.traccar.helper.Parser;
 import org.traccar.helper.PatternBuilder;
@@ -50,16 +51,21 @@ public class TmgProtocolDecoder extends BaseProtocolDecoder {
             .number("(-?d+.?d*),")               // altitude
             .number("(d+.d+),")                  // hdop
             .number("(d+),")                     // satellites
-            .number("d+,")                       // visible satellites
-            .number("[^,]*,")                    // operator
-            .number("d+,")                       // rssi
-            .number("[^,]*,")                       // cid
+            .number("(d+),")                     // visible satellites
+            .number("([^,]*),")                  // operator
+            .number("(d+),")                     // rssi
+            .number("[^,]*,")                    // cid
             .expression("([01]),")               // ignition
             .number("(d+.?d*),")                 // battery
             .number("(d+.?d*),")                 // power
             .expression("([01]+),")              // input
             .expression("([01]+),")              // output
             .expression("[01]+,")                // temper status
+            .number("(d+.?d*)[^,]*,")            // adc1
+            .number("(d+.?d*)[^,]*,")            // adc2
+            .number("d+.?d*,")                   // trip meter
+            .expression("([^,]*),")              // software version
+            .expression("([^,]*),").optional()   // rfid
             .any()
             .compile();
 
@@ -122,11 +128,27 @@ public class TmgProtocolDecoder extends BaseProtocolDecoder {
 
         position.set(Position.KEY_HDOP, parser.nextDouble());
         position.set(Position.KEY_SATELLITES, parser.nextInt());
+        position.set(Position.KEY_SATELLITES_VISIBLE, parser.nextInt());
+        position.set("operator", parser.next());
+        position.set(Position.KEY_RSSI, parser.nextInt());
         position.set(Position.KEY_IGNITION, parser.nextInt() == 1);
         position.set(Position.KEY_BATTERY, parser.nextDouble());
         position.set(Position.KEY_POWER, parser.nextDouble());
-        position.set(Position.KEY_INPUT, parser.nextInt(2));
-        position.set(Position.KEY_OUTPUT, parser.nextInt(2));
+
+        int input = parser.nextInt(2);
+        int output = parser.nextInt(2);
+
+        if (!BitUtil.check(input, 0)) {
+            position.set(Position.KEY_ALARM, Position.ALARM_SOS);
+        }
+
+        position.set(Position.KEY_INPUT, input);
+        position.set(Position.KEY_OUTPUT, output);
+
+        position.set(Position.PREFIX_ADC + 1, parser.nextDouble());
+        position.set(Position.PREFIX_ADC + 2, parser.nextDouble());
+        position.set(Position.KEY_VERSION_FW, parser.next());
+        position.set(Position.KEY_RFID, parser.next());
 
         return position;
     }