Merge pull request #2219 from Abyss777/alarms_2

Alarm decoding for next protocols

1 files changed, 31 insertions, 1 deletions

diff --git a/src/org/traccar/protocol/EelinkProtocolDecoder.java b/src/org/traccar/protocol/EelinkProtocolDecoder.java
index 85f231a17..24cd6b570 100644
--- a/src/org/traccar/protocol/EelinkProtocolDecoder.java
+++ b/src/org/traccar/protocol/EelinkProtocolDecoder.java
@@ -64,6 +64,36 @@ public class EelinkProtocolDecoder extends BaseProtocolDecoder {
         }
     }
 
+    private String decodeAlarm(Short value) {
+        switch (value) {
+        case 0x01:
+            return Position.ALARM_POWER_OFF;
+        case 0x02:
+            return Position.ALARM_SOS;
+        case 0x03:
+            return Position.ALARM_LOW_BATTERY;
+        case 0x04:
+            return Position.ALARM_VIBRATION;
+        case 0x08:
+        case 0x09:
+            return Position.ALARM_GPS_ANTENNA_CUT;
+        case 0x81:
+            return Position.ALARM_LOW_SPEED;
+        case 0x82:
+            return Position.ALARM_OVERSPEED;
+        case 0x83:
+            return Position.ALARM_GEOFENCE_ENTER;
+        case 0x84:
+            return Position.ALARM_GEOFENCE_EXIT;
+        case 0x85:
+            return Position.ALARM_ACCIDENT;
+        case 0x86:
+            return Position.ALARM_FALL_DOWN;
+        default:
+            return null;
+        }
+    }
+
     private Position decodeOld(DeviceSession deviceSession, ChannelBuffer buf, int type, int index) {
 
         Position position = new Position();
@@ -90,7 +120,7 @@ public class EelinkProtocolDecoder extends BaseProtocolDecoder {
         }
 
         if (type == MSG_STATE) {
-            position.set(Position.KEY_STATUS, buf.readUnsignedByte());
+            position.set(Position.KEY_STATUS, decodeAlarm(buf.readUnsignedByte()));
         }
 
         return position;