1 files changed, 4 insertions, 9 deletions
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);