aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2017-08-28 02:58:43 +1200
committerAnton Tananaev <anton.tananaev@gmail.com>2017-08-28 02:58:43 +1200
commit1756cad4ad66f1b5e932c51a8c0891e27d705ec6 (patch)
treeae8ba8e92c3f313e2dcc42808740c91bc2adb778 /src/org/traccar
parent2e6c2fd5a6ed500f3d169131295fc8c5923e81b2 (diff)
downloadtraccar-server-1756cad4ad66f1b5e932c51a8c0891e27d705ec6.tar.gz
traccar-server-1756cad4ad66f1b5e932c51a8c0891e27d705ec6.tar.bz2
traccar-server-1756cad4ad66f1b5e932c51a8c0891e27d705ec6.zip
Save Watch movement alert as motion
Diffstat (limited to 'src/org/traccar')
-rw-r--r--src/org/traccar/protocol/WatchProtocolDecoder.java8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/org/traccar/protocol/WatchProtocolDecoder.java b/src/org/traccar/protocol/WatchProtocolDecoder.java
index 57f5d7e78..adab65245 100644
--- a/src/org/traccar/protocol/WatchProtocolDecoder.java
+++ b/src/org/traccar/protocol/WatchProtocolDecoder.java
@@ -76,8 +76,6 @@ public class WatchProtocolDecoder extends BaseProtocolDecoder {
return Position.ALARM_GEOFENCE_ENTER;
} else if (BitUtil.check(status, 3)) {
return Position.ALARM_OVERSPEED;
- } else if (BitUtil.check(status, 4)) {
- return Position.ALARM_MOVEMENT;
} else if (BitUtil.check(status, 16)) {
return Position.ALARM_SOS;
} else if (BitUtil.check(status, 17)) {
@@ -209,7 +207,11 @@ public class WatchProtocolDecoder extends BaseProtocolDecoder {
position.set("steps", parser.nextInt(0));
- position.set(Position.KEY_ALARM, decodeAlarm(parser.nextHexInt(0)));
+ int status = parser.nextHexInt(0);
+ position.set(Position.KEY_ALARM, decodeAlarm(status));
+ if (BitUtil.check(status, 4)) {
+ position.set(Position.KEY_MOTION, true);
+ }
decodeTail(position, parser.next());