aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/protocol/GranitProtocolDecoder.java
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2016-08-05 08:50:20 +0300
committerGitHub <noreply@github.com>2016-08-05 08:50:20 +0300
commite15f80a0eb5c57a90a98773e8d21ae20e98a8910 (patch)
tree3d81f8c60ef3fe8adcd0064c01ab0695122baa8f /src/org/traccar/protocol/GranitProtocolDecoder.java
parent132fbb9bd658490ea77aae50e20257b680c3cceb (diff)
parent791a010e5a449a27e8243b9bc98c918ffa054eac (diff)
downloadtrackermap-server-e15f80a0eb5c57a90a98773e8d21ae20e98a8910.tar.gz
trackermap-server-e15f80a0eb5c57a90a98773e8d21ae20e98a8910.tar.bz2
trackermap-server-e15f80a0eb5c57a90a98773e8d21ae20e98a8910.zip
Merge pull request #2166 from Abyss777/alarms
Organized alarms in the first part of protocols
Diffstat (limited to 'src/org/traccar/protocol/GranitProtocolDecoder.java')
-rw-r--r--src/org/traccar/protocol/GranitProtocolDecoder.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/org/traccar/protocol/GranitProtocolDecoder.java b/src/org/traccar/protocol/GranitProtocolDecoder.java
index 0c7ea4d1d..3a2d24fa2 100644
--- a/src/org/traccar/protocol/GranitProtocolDecoder.java
+++ b/src/org/traccar/protocol/GranitProtocolDecoder.java
@@ -71,7 +71,9 @@ public class GranitProtocolDecoder extends BaseProtocolDecoder {
private static void decodeStructure(ChannelBuffer buf, Position position) {
short flags = buf.readUnsignedByte();
position.setValid(BitUtil.check(flags, 7));
- position.set(Position.KEY_ALARM, BitUtil.check(flags, 1));
+ if (BitUtil.check(flags, 1)) {
+ position.set(Position.KEY_ALARM, Position.ALARM_GENERAL);
+ }
short satDel = buf.readUnsignedByte();
position.set(Position.KEY_SATELLITES, BitUtil.from(satDel, 4));