aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/protocol/Jt600ProtocolDecoder.java
diff options
context:
space:
mode:
authorninioe <ninioe@gmail.com>2016-08-07 09:56:04 +0300
committerninioe <ninioe@gmail.com>2016-08-07 09:56:04 +0300
commitc1c5a5fd34402a4e9b0840a7b960c38371dd9748 (patch)
tree1c04413e2f2cc450c4be23ef459597b2b4e9f776 /src/org/traccar/protocol/Jt600ProtocolDecoder.java
parente26d81c7430d8668b3af1bbf15672f06a855d6d0 (diff)
parentdea7617218de2cbc7ebd930b4342aa35ffedcd8b (diff)
downloadtrackermap-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/Jt600ProtocolDecoder.java')
-rw-r--r--src/org/traccar/protocol/Jt600ProtocolDecoder.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/org/traccar/protocol/Jt600ProtocolDecoder.java b/src/org/traccar/protocol/Jt600ProtocolDecoder.java
index 7e0b54456..372b4cac1 100644
--- a/src/org/traccar/protocol/Jt600ProtocolDecoder.java
+++ b/src/org/traccar/protocol/Jt600ProtocolDecoder.java
@@ -151,7 +151,7 @@ public class Jt600ProtocolDecoder extends BaseProtocolDecoder {
Position position = new Position();
position.setProtocol(getProtocolName());
- position.set(Position.KEY_ALARM, true);
+ position.set(Position.KEY_ALARM, Position.ALARM_GENERAL);
DeviceSession deviceSession = getDeviceSession(channel, remoteAddress, parser.next());
if (deviceSession == null) {