Merge branch 'master' into suntech-fixes

1 files changed, 2 insertions, 7 deletions

diff --git a/src/main/java/org/traccar/protocol/Gps103ProtocolDecoder.java b/src/main/java/org/traccar/protocol/Gps103ProtocolDecoder.java
index 2ca71a1ae..d74f19179 100644
--- a/src/main/java/org/traccar/protocol/Gps103ProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/Gps103ProtocolDecoder.java
@@ -140,8 +140,6 @@ public class Gps103ProtocolDecoder extends BaseProtocolDecoder {
             return Position.ALARM_FUEL_LEAK;
         }
         switch (value) {
-            case "tracker":
-                return null;
             case "help me":
                 return Position.ALARM_SOS;
             case "low battery":
@@ -152,10 +150,6 @@ public class Gps103ProtocolDecoder extends BaseProtocolDecoder {
                 return Position.ALARM_MOVEMENT;
             case "speed":
                 return Position.ALARM_OVERSPEED;
-            case "acc on":
-                return Position.ALARM_POWER_ON;
-            case "acc off":
-                return Position.ALARM_POWER_OFF;
             case "door alarm":
                 return Position.ALARM_DOOR;
             case "ac alarm":
@@ -163,13 +157,14 @@ public class Gps103ProtocolDecoder extends BaseProtocolDecoder {
             case "accident alarm":
                 return Position.ALARM_ACCIDENT;
             case "sensor alarm":
-                return Position.ALARM_SHOCK;
+                return Position.ALARM_VIBRATION;
             case "bonnet alarm":
                 return Position.ALARM_BONNET;
             case "footbrake alarm":
                 return Position.ALARM_FOOT_BRAKE;
             case "DTC":
                 return Position.ALARM_FAULT;
+            case "tracker":
             default:
                 return null;
         }