From 513e94358c48a070eea947e6123c3affc59b4e5e Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Tue, 30 Jun 2020 22:34:12 -0700 Subject: Improve Topin decoder --- .../java/org/traccar/protocol/TopinProtocolDecoder.java | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'src/main/java/org/traccar/protocol/TopinProtocolDecoder.java') diff --git a/src/main/java/org/traccar/protocol/TopinProtocolDecoder.java b/src/main/java/org/traccar/protocol/TopinProtocolDecoder.java index df325bc69..c817f500a 100644 --- a/src/main/java/org/traccar/protocol/TopinProtocolDecoder.java +++ b/src/main/java/org/traccar/protocol/TopinProtocolDecoder.java @@ -134,19 +134,14 @@ public class TopinProtocolDecoder extends BaseProtocolDecoder { getLastLocation(position, null); - int battery = buf.readUnsignedByte(); - int firmware = buf.readUnsignedByte(); - int timezone = buf.readUnsignedByte(); + position.set(Position.KEY_BATTERY_LEVEL, buf.readUnsignedByte()); + position.set(Position.KEY_VERSION_FW, buf.readUnsignedByte()); + buf.readUnsignedByte(); // timezone int interval = buf.readUnsignedByte(); - int signal = 0; if (length >= 7) { - signal = buf.readUnsignedByte(); - position.set(Position.KEY_RSSI, signal); + position.set(Position.KEY_RSSI, buf.readUnsignedByte()); } - position.set(Position.KEY_BATTERY_LEVEL, battery); - position.set(Position.KEY_VERSION_FW, firmware); - ByteBuf content = Unpooled.buffer(); content.writeByte(interval); sendResponse(channel, length, type, content); -- cgit v1.2.3