aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/protocol/ProgressProtocolDecoder.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/ProgressProtocolDecoder.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/ProgressProtocolDecoder.java')
-rw-r--r--src/org/traccar/protocol/ProgressProtocolDecoder.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/org/traccar/protocol/ProgressProtocolDecoder.java b/src/org/traccar/protocol/ProgressProtocolDecoder.java
index e524626fa..0032a9a1b 100644
--- a/src/org/traccar/protocol/ProgressProtocolDecoder.java
+++ b/src/org/traccar/protocol/ProgressProtocolDecoder.java
@@ -104,7 +104,7 @@ public class ProgressProtocolDecoder extends BaseProtocolDecoder {
position.set(Position.KEY_ARCHIVE, true);
int subtype = buf.readUnsignedShort();
if (subtype == MSG_ALARM) {
- position.set(Position.KEY_ALARM, true);
+ position.set(Position.KEY_ALARM, Position.ALARM_GENERAL);
}
if (buf.readUnsignedShort() > buf.readableBytes()) {
lastIndex += 1;