diff options
| author | Anton Tananaev <anton@traccar.org> | 2023-08-03 21:17:52 -0700 |
|---|---|---|
| committer | Anton Tananaev <anton@traccar.org> | 2023-08-03 21:17:52 -0700 |
| commit | 95fdfd770130b774e6201ddc88bba9241c95e3cc (patch) | |
| tree | 06b2619d841342b7c6ebca5de6d50a14de9cf041 /src/main | |
| parent | 230f629c3dce039aa8856fe2fb4c447a086d72e4 (diff) | |
| download | trackermap-server-95fdfd770130b774e6201ddc88bba9241c95e3cc.tar.gz trackermap-server-95fdfd770130b774e6201ddc88bba9241c95e3cc.tar.bz2 trackermap-server-95fdfd770130b774e6201ddc88bba9241c95e3cc.zip | |
Fix GT06 protocol conflict
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/java/org/traccar/protocol/Gt06ProtocolDecoder.java | 7 |
1 files changed, 0 insertions, 7 deletions
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) { |