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

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

1 files changed, 3 insertions, 1 deletions

diff --git a/src/org/traccar/protocol/CarcellProtocolDecoder.java b/src/org/traccar/protocol/CarcellProtocolDecoder.java
index 7aacfa4d0..e9b6cdf28 100644
--- a/src/org/traccar/protocol/CarcellProtocolDecoder.java
+++ b/src/org/traccar/protocol/CarcellProtocolDecoder.java
@@ -143,7 +143,9 @@ public class CarcellProtocolDecoder extends BaseProtocolDecoder {
             parser.next(); // panic button status
 
             String painelStatus = parser.next();
-            position.set(Position.KEY_ALARM, painelStatus.equals("1"));
+            if (painelStatus.equals("1")) {
+                position.set(Position.KEY_ALARM, Position.ALARM_GENERAL);
+            }
             position.set("painel", painelStatus.equals("2"));
 
             Double mainVoltage = parser.nextDouble() / 100d;