Decode additional GT06 data

2 files changed, 26 insertions, 3 deletions

diff --git a/src/org/traccar/protocol/Gt06ProtocolDecoder.java b/src/org/traccar/protocol/Gt06ProtocolDecoder.java
index 6388455b5..0e56c9949 100644
--- a/src/org/traccar/protocol/Gt06ProtocolDecoder.java
+++ b/src/org/traccar/protocol/Gt06ProtocolDecoder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 - 2018 Anton Tananaev (anton@traccar.org)
+ * Copyright 2012 - 2019 Anton Tananaev (anton@traccar.org)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -677,11 +677,31 @@ public class Gt06ProtocolDecoder extends BaseProtocolDecoder {
                 decodeStatus(position, buf);
             }
 
-            if (type == MSG_GPS_LBS_1 && buf.readableBytes() >= 4 + 6) {
+            if (type == MSG_GPS_LBS_1 && buf.readableBytes() == 2 + 6) {
+                int mask = buf.readUnsignedShort();
+                position.set(Position.KEY_IGNITION, BitUtil.check(mask, 8 + 7));
+                position.set(Position.PREFIX_IN + 2, BitUtil.check(mask, 8 + 6));
+                if (BitUtil.check(mask, 8 + 4)) {
+                    int value = BitUtil.to(mask, 8 + 1);
+                    if (BitUtil.check(mask, 8 + 1)) {
+                        value = -value;
+                    }
+                    position.set(Position.PREFIX_TEMP + 1, value);
+                } else {
+                    int value = BitUtil.to(mask, 8 + 2);
+                    if (BitUtil.check(mask, 8 + 5)) {
+                        position.set(Position.PREFIX_ADC + 1, value);
+                    } else {
+                        position.set(Position.PREFIX_ADC + 1, value * 0.1);
+                    }
+                }
+            }
+
+            if (type == MSG_GPS_LBS_1 && buf.readableBytes() == 4 + 6) {
                 position.set(Position.KEY_ODOMETER, buf.readUnsignedInt());
             }
 
-            if (type == MSG_GPS_LBS_2 && buf.readableBytes() >= 3 + 6) {
+            if (type == MSG_GPS_LBS_2 && buf.readableBytes() == 3 + 6) {
                 position.set(Position.KEY_IGNITION, buf.readUnsignedByte() > 0);
                 position.set(Position.KEY_EVENT, buf.readUnsignedByte()); // reason
                 position.set(Position.KEY_ARCHIVE, buf.readUnsignedByte() > 0);
diff --git a/test/org/traccar/protocol/Gt06ProtocolDecoderTest.java b/test/org/traccar/protocol/Gt06ProtocolDecoderTest.java
index 570cd7506..56bb58921 100644
--- a/test/org/traccar/protocol/Gt06ProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/Gt06ProtocolDecoderTest.java
@@ -16,6 +16,9 @@ public class Gt06ProtocolDecoderTest extends ProtocolTest {
         verifyNull(decoder, binary(
                 "78780D01086471700328358100093F040D0A"));
 
+        verifyPosition(decoder, binary(
+                "787821121303120b2524c70138e363085b549003d43301940057d200cd52c000006aa1ca0d0a"));
+
         verifyNotNull(decoder, binary(
                 "7878006919012105090303028f01007549e05a00bc9c5c5a007a8d1a5a0d0a"));