From 95fdfd770130b774e6201ddc88bba9241c95e3cc Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Thu, 3 Aug 2023 21:17:52 -0700 Subject: Fix GT06 protocol conflict --- src/main/java/org/traccar/protocol/Gt06ProtocolDecoder.java | 7 ------- 1 file changed, 7 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/org/traccar/protocol/Gt06ProtocolDecoder.java b/src/main/java/org/traccar/protocol/Gt06ProtocolDecoder.java index d6d988423..4762fc884 100644 --- a/src/main/java/org/traccar/protocol/Gt06ProtocolDecoder.java +++ b/src/main/java/org/traccar/protocol/Gt06ProtocolDecoder.java @@ -836,11 +836,6 @@ public class Gt06ProtocolDecoder extends BaseProtocolDecoder { } } - if (type == MSG_STATUS && variant == Variant.VXT01) { - position.set(Position.KEY_POWER, buf.readUnsignedShort() * 0.01); - position.set(Position.KEY_RSSI, buf.readUnsignedByte()); - } - if (type == MSG_GPS_LBS_1) { if (variant == Variant.GT06E_CARD) { position.set(Position.KEY_ODOMETER, buf.readUnsignedInt()); @@ -1421,8 +1416,6 @@ public class Gt06ProtocolDecoder extends BaseProtocolDecoder { variant = Variant.VXT01; } else if (header == 0x7878 && type == MSG_GPS_LBS_STATUS_1 && length == 0x24) { variant = Variant.VXT01; - } else if (header == 0x7878 && type == MSG_STATUS && length == 0x0a) { - variant = Variant.VXT01; } else if (header == 0x7878 && type == MSG_LBS_MULTIPLE_3 && length == 0x31) { variant = Variant.WANWAY_S20; } else if (header == 0x7878 && type == MSG_LBS_MULTIPLE_3 && length == 0x2e) { -- cgit v1.2.3