Merge remote-tracking branch 'refs/remotes/tananaev/master'

# Conflicts:
#	web/app/view/LoginController.js

1 files changed, 22 insertions, 1 deletions

diff --git a/src/org/traccar/protocol/MeiligaoProtocolDecoder.java b/src/org/traccar/protocol/MeiligaoProtocolDecoder.java
index 9c7e9ea23..41e248791 100644
--- a/src/org/traccar/protocol/MeiligaoProtocolDecoder.java
+++ b/src/org/traccar/protocol/MeiligaoProtocolDecoder.java
@@ -151,6 +151,27 @@ public class MeiligaoProtocolDecoder extends BaseProtocolDecoder {
         return server;
     }
 
+    private String decodeAlarm(short value) {
+        switch (value) {
+        case 0x01:
+            return Position.ALARM_SOS;
+        case 0x10:
+            return Position.ALARM_LOW_BATTERY;
+        case 0x11:
+            return Position.ALARM_OVERSPEED;
+        case 0x12:
+            return Position.ALARM_MOVEMENT;
+        case 0x13:
+            return Position.ALARM_GEOFENCE_ENTER;
+        case 0x50:
+            return Position.ALARM_POWER_OFF;
+        case 0x53:
+            return Position.ALARM_GPS_ANTENNA_CUT;
+        default:
+            return null;
+        }
+    }
+
     @Override
     protected Object decode(
             Channel channel, SocketAddress remoteAddress, Object msg) throws Exception {
@@ -196,7 +217,7 @@ public class MeiligaoProtocolDecoder extends BaseProtocolDecoder {
 
         // Custom data
         if (command == MSG_ALARM) {
-            position.set(Position.KEY_ALARM, buf.readUnsignedByte());
+            position.set(Position.KEY_ALARM, decodeAlarm(buf.readUnsignedByte()));
         } else if (command == MSG_POSITION_LOGGED) {
             buf.skipBytes(6);
         }