1 files changed, 19 insertions, 5 deletions

diff --git a/src/org/traccar/protocol/ContinentalProtocolDecoder.java b/src/org/traccar/protocol/ContinentalProtocolDecoder.java
index 2138eb39e..20134fc1f 100644
--- a/src/org/traccar/protocol/ContinentalProtocolDecoder.java
+++ b/src/org/traccar/protocol/ContinentalProtocolDecoder.java
@@ -15,10 +15,11 @@
  */
 package org.traccar.protocol;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.channel.Channel;
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.Channel;
 import org.traccar.BaseProtocolDecoder;
 import org.traccar.DeviceSession;
+import org.traccar.helper.BitUtil;
 import org.traccar.helper.UnitsConverter;
 import org.traccar.model.Position;
 
@@ -40,13 +41,14 @@ public class ContinentalProtocolDecoder extends BaseProtocolDecoder {
     protected Object decode(
             Channel channel, SocketAddress remoteAddress, Object msg) throws Exception {
 
-        ChannelBuffer buf = (ChannelBuffer) msg;
+        ByteBuf buf = (ByteBuf) msg;
 
         buf.skipBytes(2); // header
         buf.readUnsignedShort(); // length
         buf.readUnsignedByte(); // software version
 
-        DeviceSession deviceSession = getDeviceSession(channel, remoteAddress, String.valueOf(buf.readUnsignedInt()));
+        long serialNumber = buf.readUnsignedInt();
+        DeviceSession deviceSession = getDeviceSession(channel, remoteAddress, String.valueOf(serialNumber));
         if (deviceSession == null) {
             return null;
         }
@@ -76,13 +78,25 @@ public class ContinentalProtocolDecoder extends BaseProtocolDecoder {
             position.setDeviceTime(new Date(buf.readUnsignedInt() * 1000L));
 
             position.set(Position.KEY_EVENT, buf.readUnsignedShort());
-            position.set(Position.KEY_INPUT, buf.readUnsignedShort());
+
+            int input = buf.readUnsignedShort();
+            position.set(Position.KEY_IGNITION, BitUtil.check(input, 0));
+            position.set(Position.KEY_INPUT, input);
+
             position.set(Position.KEY_OUTPUT, buf.readUnsignedShort());
             position.set(Position.KEY_BATTERY, buf.readUnsignedByte());
             position.set(Position.KEY_DEVICE_TEMP, buf.readByte());
 
             buf.readUnsignedShort(); // reserved
 
+            if (buf.readableBytes() > 4) {
+                position.set(Position.KEY_ODOMETER, buf.readUnsignedInt());
+            }
+
+            if (buf.readableBytes() > 4) {
+                position.set(Position.KEY_HOURS, UnitsConverter.msFromHours(buf.readUnsignedInt()));
+            }
+
             return position;
 
         }