6 files changed, 7 insertions, 8 deletions
diff --git a/setup/unix/traccar.xml b/setup/unix/traccar.xml
index da09d74d6..b602e6321 100644
--- a/setup/unix/traccar.xml
+++ b/setup/unix/traccar.xml
@@ -34,7 +34,7 @@
     <entry key='database.ignoreUnknown'>true</entry>
 
     <entry key='database.changelog'>/opt/traccar/schema/changelog-master.xml</entry>
-    
+
     <entry key='database.selectServers'>
         SELECT * FROM server;
     </entry>
@@ -390,5 +390,7 @@
     <entry key='l100.port'>5112</entry>
     <entry key='granit.port'>5113</entry>
     <entry key='carcell.port'>5114</entry>
+    <entry key='obddongle.port'>5115</entry>
+    <entry key='hunterpro.port'>5116</entry>
 
 </properties>
diff --git a/setup/windows/traccar.xml b/setup/windows/traccar.xml
index a3971e4f8..053e2ca5a 100644
--- a/setup/windows/traccar.xml
+++ b/setup/windows/traccar.xml
@@ -390,5 +390,7 @@
     <entry key='l100.port'>5112</entry>
     <entry key='granit.port'>5113</entry>
     <entry key='carcell.port'>5114</entry>
+    <entry key='obddongle.port'>5115</entry>
+    <entry key='hunterpro.port'>5116</entry>
 
 </properties>
diff --git a/src/org/traccar/model/Position.java b/src/org/traccar/model/Position.java
index a259e773a..f592ee4b9 100644
--- a/src/org/traccar/model/Position.java
+++ b/src/org/traccar/model/Position.java
@@ -78,7 +78,6 @@ public class Position extends Message {
     public static final String ALARM_OVERSPEED = "overspeed";
     public static final String ALARM_FALL_DOWN = "fallDown";
     public static final String ALARM_LOW_BATTERY = "lowBattery";
-    public static final String ALARM_MOTION = "motion";
     public static final String ALARM_FAULT = "fault";
     public static final String ALARM_POWER_OFF = "powerOff";
     public static final String ALARM_GEOFENCE = "geofence";
diff --git a/src/org/traccar/protocol/MiniFinderProtocolDecoder.java b/src/org/traccar/protocol/MiniFinderProtocolDecoder.java
index 3eb559cc4..348476c6b 100644
--- a/src/org/traccar/protocol/MiniFinderProtocolDecoder.java
+++ b/src/org/traccar/protocol/MiniFinderProtocolDecoder.java
@@ -114,10 +114,7 @@ public class MiniFinderProtocolDecoder extends BaseProtocolDecoder {
                 if (BitUtil.check(flags, 12)) {
                     position.set(Position.KEY_ALARM, Position.ALARM_LOW_BATTERY);
                 }
-                if (BitUtil.check(flags, 14)) {
-                    position.set(Position.KEY_ALARM, Position.ALARM_MOTION);
-                }
-                if (BitUtil.check(flags, 15)) {
+                if (BitUtil.check(flags, 15) || BitUtil.check(flags, 14)) {
                     position.set(Position.KEY_ALARM, Position.ALARM_MOVEMENT);
                 }
 
diff --git a/src/org/traccar/protocol/UlbotechProtocolDecoder.java b/src/org/traccar/protocol/UlbotechProtocolDecoder.java
index d97e8b339..9a951f770 100644
--- a/src/org/traccar/protocol/UlbotechProtocolDecoder.java
+++ b/src/org/traccar/protocol/UlbotechProtocolDecoder.java
@@ -120,7 +120,7 @@ public class UlbotechProtocolDecoder extends BaseProtocolDecoder {
             return Position.ALARM_POWER_OFF;
         }
         if (BitUtil.check(alarm, 1)) {
-            return Position.ALARM_MOTION;
+            return Position.ALARM_MOVEMENT;
         }
         if (BitUtil.check(alarm, 2)) {
             return Position.ALARM_OVERSPEED;
diff --git a/web/l10n/en.json b/web/l10n/en.json
index e51c5445c..c662cd47c 100644
--- a/web/l10n/en.json
+++ b/web/l10n/en.json
@@ -137,7 +137,6 @@
     "alarmOverspeed": "Overspeed Alarm",
     "alarmFallDown": "FallDown Alarm",
     "alarmLowBattery": "LowBattery Alarm",
-    "alarmMotion": "Motion Alarm",
     "alarmFault": "Fault Alarm",
     "notificationType": "Type of Notification",
     "notificationWeb": "Send via Web",