diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2016-08-05 08:50:20 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-05 08:50:20 +0300 |
| commit | e15f80a0eb5c57a90a98773e8d21ae20e98a8910 (patch) | |
| tree | 3d81f8c60ef3fe8adcd0064c01ab0695122baa8f /src/org/traccar/protocol/H02ProtocolDecoder.java | |
| parent | 132fbb9bd658490ea77aae50e20257b680c3cceb (diff) | |
| parent | 791a010e5a449a27e8243b9bc98c918ffa054eac (diff) | |
| download | trackermap-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/H02ProtocolDecoder.java')
| -rw-r--r-- | src/org/traccar/protocol/H02ProtocolDecoder.java | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/src/org/traccar/protocol/H02ProtocolDecoder.java b/src/org/traccar/protocol/H02ProtocolDecoder.java index bb18a68e2..fc6c9f17c 100644 --- a/src/org/traccar/protocol/H02ProtocolDecoder.java +++ b/src/org/traccar/protocol/H02ProtocolDecoder.java @@ -65,20 +65,15 @@ public class H02ProtocolDecoder extends BaseProtocolDecoder { private void processStatus(Position position, long status) { if (!BitUtil.check(status, 0) || !BitUtil.check(status, 1) - || !BitUtil.check(status, 3) || !BitUtil.check(status, 4) || !BitUtil.check(status, 7)) { + || !BitUtil.check(status, 2)) { if (!BitUtil.check(status, 0)) { position.set(Position.KEY_ALARM, Position.ALARM_VIBRATION); } else if (!BitUtil.check(status, 1)) { - position.set(Position.KEY_ALARM, "robbery"); - } else if (!BitUtil.check(status, 3)) { - position.set(Position.KEY_ALARM, "illegal ignition"); - } else if (!BitUtil.check(status, 4)) { - position.set(Position.KEY_ALARM, "entering"); - } else if (!BitUtil.check(status, 7)) { - position.set(Position.KEY_ALARM, "out"); + position.set(Position.KEY_ALARM, Position.ALARM_SOS); + } else if (!BitUtil.check(status, 2)) { + position.set(Position.KEY_ALARM, Position.ALARM_OVERSPEED); } - } position.set(Position.KEY_IGNITION, BitUtil.check(status, 10)); position.set(Position.KEY_STATUS, status); |