diff options
author | Abyss777 <abyss@fox5.ru> | 2016-08-05 10:07:35 +0500 |
---|---|---|
committer | Abyss777 <abyss@fox5.ru> | 2016-08-05 10:07:35 +0500 |
commit | 791a010e5a449a27e8243b9bc98c918ffa054eac (patch) | |
tree | 7883f58150598323fdae0f8578f607a18958f843 /src/org/traccar/protocol/NavisProtocolDecoder.java | |
parent | 4ebce65e3d6db55d427f504bd62972370fab2eec (diff) | |
download | trackermap-server-791a010e5a449a27e8243b9bc98c918ffa054eac.tar.gz trackermap-server-791a010e5a449a27e8243b9bc98c918ffa054eac.tar.bz2 trackermap-server-791a010e5a449a27e8243b9bc98c918ffa054eac.zip |
- Removed OIL_CUT
- Renamed guard to armed
- Style fixes and optimizations
Diffstat (limited to 'src/org/traccar/protocol/NavisProtocolDecoder.java')
-rw-r--r-- | src/org/traccar/protocol/NavisProtocolDecoder.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/org/traccar/protocol/NavisProtocolDecoder.java b/src/org/traccar/protocol/NavisProtocolDecoder.java index 046068c5d..72c5f53c3 100644 --- a/src/org/traccar/protocol/NavisProtocolDecoder.java +++ b/src/org/traccar/protocol/NavisProtocolDecoder.java @@ -95,9 +95,9 @@ public class NavisProtocolDecoder extends BaseProtocolDecoder { buf.skipBytes(6); // event time - short guardStatus = buf.readUnsignedByte(); - position.set(Position.KEY_GUARD, guardStatus & 0x7F); - if (BitUtil.check(guardStatus, 7)) { + short armedStatus = buf.readUnsignedByte(); + position.set(Position.KEY_ARMED, armedStatus & 0x7F); + if (BitUtil.check(armedStatus, 7)) { position.set(Position.KEY_ALARM, Position.ALARM_GENERAL); } position.set(Position.KEY_STATUS, buf.readUnsignedByte()); |