From bbcfef7775798244b141441208063646d19474ba Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Sun, 15 Sep 2019 10:20:17 -0700
Subject: Update modular decoding

---
 src/main/java/org/traccar/protocol/Gt06ProtocolDecoder.java     | 4 +++-
 src/test/java/org/traccar/protocol/Gt06ProtocolDecoderTest.java | 4 ++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/traccar/protocol/Gt06ProtocolDecoder.java b/src/main/java/org/traccar/protocol/Gt06ProtocolDecoder.java
index dc7a95955..6229e748e 100644
--- a/src/main/java/org/traccar/protocol/Gt06ProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/Gt06ProtocolDecoder.java
@@ -988,7 +988,9 @@ public class Gt06ProtocolDecoder extends BaseProtocolDecoder {
                     position.set(Position.KEY_INDEX, buf.readUnsignedInt());
                     break;
                 case 0x2a:
-                    position.set(Position.KEY_INPUT, buf.readUnsignedByte());
+                    int input = buf.readUnsignedByte();
+                    position.set(Position.KEY_DOOR, BitUtil.to(input, 4));
+                    position.set("tamper", BitUtil.from(input, 4));
                     break;
                 case 0x2b:
                     int event = buf.readUnsignedByte();
diff --git a/src/test/java/org/traccar/protocol/Gt06ProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/Gt06ProtocolDecoderTest.java
index caa354e54..39b4d58e4 100644
--- a/src/test/java/org/traccar/protocol/Gt06ProtocolDecoderTest.java
+++ b/src/test/java/org/traccar/protocol/Gt06ProtocolDecoderTest.java
@@ -17,6 +17,10 @@ public class Gt06ProtocolDecoderTest extends ProtocolTest {
         verifyNull(decoder, binary(
                 "78780D01086471700328358100093F040D0A"));
 
+        verifyAttribute(decoder, binary(
+                "797900a87000000001020035000101003300125d7e3a180600d504b598f708814b3a001d1500340006125d7e39dc000011000a012e02620000000000000001000803537601000129800002000803102608593397620003000a89012608522933976266001800020172002b000114002c00045d7df3c70009000106000a000109002800010d002e00040000f25d002a000111002900040000017e0030000a000100b4000a00b402d0000591250d0a"),
+                Position.KEY_ALARM, Position.ALARM_REMOVING);
+
         verifyPosition(decoder, binary(
                 "797900a87000000001020035000100003300125d62bf3a0800e804b5994308814a87001d5d00340006115d62bf29000011000a012e02620000000000000001000803537601000129800002000803102608593397620003000a8901260852293397626600180002017d002b000116002c00045d6278ea0009000108000a00010b002800010b002e00040000f0c1002a00010000290004000000be0030000a000100b4000a00b402d00006c5490d0a"));
 
-- 
cgit v1.2.3