Merge pull request #2979 from jon-stumpf/jss-add-info

Additional Protocol Information

1 files changed, 8 insertions, 8 deletions

diff --git a/src/org/traccar/protocol/TrakMateProtocolDecoder.java b/src/org/traccar/protocol/TrakMateProtocolDecoder.java
index d1bd1398b..95eef67c8 100644
--- a/src/org/traccar/protocol/TrakMateProtocolDecoder.java
+++ b/src/org/traccar/protocol/TrakMateProtocolDecoder.java
@@ -126,7 +126,7 @@ public class TrakMateProtocolDecoder extends BaseProtocolDecoder {
         position.setTime(dateBuilder.getDate());
 
         position.set(Position.KEY_VERSION_FW, parser.next());
-        parser.next(); // hardware version
+        position.set(Position.KEY_VERSION_HW, parser.next());
 
         return position;
     }
@@ -195,13 +195,13 @@ public class TrakMateProtocolDecoder extends BaseProtocolDecoder {
         position.setCourse(parser.nextDouble());
 
         position.set(Position.KEY_IGNITION, parser.nextInt() == 1);
-        parser.next(); // dop1
-        parser.next(); // dop2
-        parser.next(); // analog input
-        position.set(Position.KEY_BATTERY, parser.nextDouble()); // device battery voltage
-        parser.next(); // vehicle internal voltage
-        position.set(Position.KEY_ODOMETER, parser.nextDouble()); // gps odometer
-        parser.next(); // pulse odometer
+        position.set("dop1", parser.next());
+        position.set("dop2", parser.next());
+        position.set(Position.KEY_INPUT, parser.next());
+        position.set(Position.KEY_BATTERY, parser.nextDouble());
+        position.set(Position.KEY_POWER, parser.next());
+        position.set(Position.KEY_ODOMETER, parser.nextDouble());
+        position.set("pulseOdometer", parser.next());
         position.set(Position.KEY_STATUS, parser.nextInt());
 
         position.setValid(parser.nextInt() != 0);