diff options
| author | ninioe <ninioe@gmail.com> | 2016-08-07 09:56:04 +0300 |
|---|---|---|
| committer | ninioe <ninioe@gmail.com> | 2016-08-07 09:56:04 +0300 |
| commit | c1c5a5fd34402a4e9b0840a7b960c38371dd9748 (patch) | |
| tree | 1c04413e2f2cc450c4be23ef459597b2b4e9f776 /src/org/traccar/protocol/MxtProtocolDecoder.java | |
| parent | e26d81c7430d8668b3af1bbf15672f06a855d6d0 (diff) | |
| parent | dea7617218de2cbc7ebd930b4342aa35ffedcd8b (diff) | |
| download | trackermap-server-c1c5a5fd34402a4e9b0840a7b960c38371dd9748.tar.gz trackermap-server-c1c5a5fd34402a4e9b0840a7b960c38371dd9748.tar.bz2 trackermap-server-c1c5a5fd34402a4e9b0840a7b960c38371dd9748.zip | |
Merge remote-tracking branch 'refs/remotes/tananaev/master'
# Conflicts:
# web/app/view/LoginController.js
Diffstat (limited to 'src/org/traccar/protocol/MxtProtocolDecoder.java')
| -rw-r--r-- | src/org/traccar/protocol/MxtProtocolDecoder.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/org/traccar/protocol/MxtProtocolDecoder.java b/src/org/traccar/protocol/MxtProtocolDecoder.java index 56024057e..1dbfc3696 100644 --- a/src/org/traccar/protocol/MxtProtocolDecoder.java +++ b/src/org/traccar/protocol/MxtProtocolDecoder.java @@ -82,7 +82,9 @@ public class MxtProtocolDecoder extends BaseProtocolDecoder { long flags = buf.readUnsignedInt(); position.set(Position.KEY_IGNITION, BitUtil.check(flags, 0)); - position.set(Position.KEY_ALARM, BitUtil.check(flags, 1)); + if (BitUtil.check(flags, 1)) { + position.set(Position.KEY_ALARM, Position.ALARM_GENERAL); + } position.set(Position.KEY_INPUT, BitUtil.between(flags, 2, 7)); position.set(Position.KEY_OUTPUT, BitUtil.between(flags, 7, 10)); position.setCourse(BitUtil.between(flags, 10, 13) * 45); |