Support additional eeLink parameters

1 files changed, 41 insertions, 0 deletions

diff --git a/src/org/traccar/protocol/EelinkProtocolDecoder.java b/src/org/traccar/protocol/EelinkProtocolDecoder.java
index 2526282b1..8d0f8016a 100644
--- a/src/org/traccar/protocol/EelinkProtocolDecoder.java
+++ b/src/org/traccar/protocol/EelinkProtocolDecoder.java
@@ -217,6 +217,45 @@ public class EelinkProtocolDecoder extends BaseProtocolDecoder {
             buf.skipBytes(7); // bss2
         }
 
+        if (buf.readableBytes() >= 2) {
+            int status = buf.readUnsignedShort();
+            position.setValid(BitUtil.check(status, 0));
+            if (BitUtil.check(status, 1)) {
+                position.set(Position.KEY_IGNITION, BitUtil.check(status, 2));
+            }
+            position.set(Position.KEY_STATUS, status);
+        }
+
+        if (buf.readableBytes() >= 2) {
+            position.set(Position.KEY_BATTERY, buf.readUnsignedShort() * 0.001);
+        }
+
+        if (buf.readableBytes() >= 4) {
+            position.set(Position.PREFIX_ADC + 0, buf.readUnsignedShort());
+            position.set(Position.PREFIX_ADC + 1, buf.readUnsignedShort());
+        }
+
+        if (buf.readableBytes() >= 4) {
+            position.set(Position.KEY_ODOMETER, buf.readUnsignedInt());
+        }
+
+        if (buf.readableBytes() >= 4) {
+            buf.readUnsignedShort(); // gsm counter
+            buf.readUnsignedShort(); // gps counter
+        }
+
+        if (buf.readableBytes() >= 4) {
+            position.set(Position.KEY_STEPS, buf.readUnsignedShort());
+            buf.readUnsignedShort(); // walking time
+        }
+
+        if (buf.readableBytes() >= 12) {
+            position.set(Position.PREFIX_TEMP + 1, buf.readUnsignedShort() / 256.0);
+            position.set("humidity", buf.readUnsignedShort() * 0.1);
+            position.set("illuminance", buf.readUnsignedInt() / 256.0);
+            position.set("co2", buf.readUnsignedInt());
+        }
+
         return position;
     }
 
@@ -240,6 +279,7 @@ public class EelinkProtocolDecoder extends BaseProtocolDecoder {
             getDeviceSession(channel, remoteAddress, ChannelBuffers.hexDump(buf.readBytes(8)).substring(1));
 
         } else {
+
             DeviceSession deviceSession = getDeviceSession(channel, remoteAddress);
             if (deviceSession == null) {
                 return null;
@@ -262,6 +302,7 @@ public class EelinkProtocolDecoder extends BaseProtocolDecoder {
                 return position;
 
             }
+
         }
 
         return null;