diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2016-08-24 13:40:01 +1200 |
|---|---|---|
| committer | Anton Tananaev <anton.tananaev@gmail.com> | 2016-08-24 13:40:29 +1200 |
| commit | 6e606df6e6686a40bffda5b872b0825599909cd2 (patch) | |
| tree | 05f95c113eb18c935787bb5264e39e6395593021 | |
| parent | 5536fbe00c022c151007ad077d911b5162201cd4 (diff) | |
| download | trackermap-server-6e606df6e6686a40bffda5b872b0825599909cd2.tar.gz trackermap-server-6e606df6e6686a40bffda5b872b0825599909cd2.tar.bz2 trackermap-server-6e606df6e6686a40bffda5b872b0825599909cd2.zip | |
Remove motion alarm type
| -rw-r--r-- | src/org/traccar/model/Position.java | 1 | ||||
| -rw-r--r-- | src/org/traccar/protocol/MiniFinderProtocolDecoder.java | 5 | ||||
| -rw-r--r-- | web/l10n/en.json | 1 |
3 files changed, 1 insertions, 6 deletions
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/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", |