aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2016-07-18 16:14:18 +1200
committerAnton Tananaev <anton.tananaev@gmail.com>2016-07-18 16:14:18 +1200
commitd3e063cf9de8a45bed4dfe87b73aadfd8d2edeab (patch)
treea8de0435d01e2379c1c43fdc2be2b6d00e552f40 /src/org/traccar
parent24fa824e20cf68d36f760e4b921edb1fb25525b3 (diff)
downloadtrackermap-server-d3e063cf9de8a45bed4dfe87b73aadfd8d2edeab.tar.gz
trackermap-server-d3e063cf9de8a45bed4dfe87b73aadfd8d2edeab.tar.bz2
trackermap-server-d3e063cf9de8a45bed4dfe87b73aadfd8d2edeab.zip
Decode MiniFinder status flags
Diffstat (limited to 'src/org/traccar')
-rw-r--r--src/org/traccar/model/Position.java9
-rw-r--r--src/org/traccar/protocol/MiniFinderProtocolDecoder.java26
2 files changed, 34 insertions, 1 deletions
diff --git a/src/org/traccar/model/Position.java b/src/org/traccar/model/Position.java
index 4e03b2097..e667f097d 100644
--- a/src/org/traccar/model/Position.java
+++ b/src/org/traccar/model/Position.java
@@ -66,6 +66,15 @@ public class Position extends Message {
public static final String PREFIX_IO = "io";
public static final String PREFIX_COUNT = "count";
+ public static final String ALARM_SOS = "sos";
+ public static final String ALARM_VIBRATION = "vibration";
+ public static final String ALARM_MOVEMENT = "movement";
+ 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";
+
private String protocol;
public String getProtocol() {
diff --git a/src/org/traccar/protocol/MiniFinderProtocolDecoder.java b/src/org/traccar/protocol/MiniFinderProtocolDecoder.java
index 089b491d2..96eaaf0fa 100644
--- a/src/org/traccar/protocol/MiniFinderProtocolDecoder.java
+++ b/src/org/traccar/protocol/MiniFinderProtocolDecoder.java
@@ -90,9 +90,33 @@ public class MiniFinderProtocolDecoder extends BaseProtocolDecoder {
if (parser.hasNext(5)) {
int flags = parser.nextInt(16);
- position.set(Position.KEY_FLAGS, flags);
+
position.setValid(BitUtil.check(flags, 0));
+ if (BitUtil.check(flags, 2)) {
+ position.set(Position.KEY_ALARM, Position.ALARM_FAULT);
+ }
+ if (BitUtil.check(flags, 6)) {
+ position.set(Position.KEY_ALARM, Position.ALARM_SOS);
+ }
+ if (BitUtil.check(flags, 7)) {
+ position.set(Position.KEY_ALARM, Position.ALARM_OVERSPEED);
+ }
+ if (BitUtil.check(flags, 8)) {
+ position.set(Position.KEY_ALARM, Position.ALARM_FALL_DOWN);
+ }
+ 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)) {
+ position.set(Position.KEY_ALARM, Position.ALARM_MOVEMENT);
+ }
+
+ position.set(Position.KEY_GSM, BitUtil.between(flags, 16, 20));
+
position.setAltitude(parser.nextDouble());
position.set(Position.KEY_BATTERY, parser.next());