aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/protocol/NavisProtocolDecoder.java
diff options
context:
space:
mode:
authorAbyss777 <abyss@fox5.ru>2016-07-29 15:50:59 +0500
committerAbyss777 <abyss@fox5.ru>2016-07-29 15:50:59 +0500
commit20c2456a9df46eaef04c787ea5471bf31a71f93c (patch)
treef8e76fb8f6cf27b0d1b2a9476dcb8436f4e88feb /src/org/traccar/protocol/NavisProtocolDecoder.java
parentcd0c04a03b359dfc5b1ea3f61b93aaae8f6fec3e (diff)
downloadtrackermap-server-20c2456a9df46eaef04c787ea5471bf31a71f93c.tar.gz
trackermap-server-20c2456a9df46eaef04c787ea5471bf31a71f93c.tar.bz2
trackermap-server-20c2456a9df46eaef04c787ea5471bf31a71f93c.zip
Organized alarms in the first part of protocols
Diffstat (limited to 'src/org/traccar/protocol/NavisProtocolDecoder.java')
-rw-r--r--src/org/traccar/protocol/NavisProtocolDecoder.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/org/traccar/protocol/NavisProtocolDecoder.java b/src/org/traccar/protocol/NavisProtocolDecoder.java
index fad24301c..046068c5d 100644
--- a/src/org/traccar/protocol/NavisProtocolDecoder.java
+++ b/src/org/traccar/protocol/NavisProtocolDecoder.java
@@ -95,7 +95,11 @@ public class NavisProtocolDecoder extends BaseProtocolDecoder {
buf.skipBytes(6); // event time
- position.set(Position.KEY_ALARM, buf.readUnsignedByte());
+ short guardStatus = buf.readUnsignedByte();
+ position.set(Position.KEY_GUARD, guardStatus & 0x7F);
+ if (BitUtil.check(guardStatus, 7)) {
+ position.set(Position.KEY_ALARM, Position.ALARM_GENERAL);
+ }
position.set(Position.KEY_STATUS, buf.readUnsignedByte());
position.set(Position.KEY_GSM, buf.readUnsignedByte());