aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/model/Position.java
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2018-06-12 13:49:59 +1200
committerAnton Tananaev <anton.tananaev@gmail.com>2018-06-12 13:49:59 +1200
commit69a4af1c2b419fd7cc6356bcc2bf760969a73f95 (patch)
tree4192ef221be88b024d96422e274836f4c6b33922 /src/org/traccar/model/Position.java
parent1dc1e06cfd4b7b23775984a254723b2d06b4f1dd (diff)
parent86ad45c63c9a9e9bee59a8cc621416e1396f9c89 (diff)
downloadtraccar-server-69a4af1c2b419fd7cc6356bcc2bf760969a73f95.tar.gz
traccar-server-69a4af1c2b419fd7cc6356bcc2bf760969a73f95.tar.bz2
traccar-server-69a4af1c2b419fd7cc6356bcc2bf760969a73f95.zip
Merge branch 'master' into netty4
# Conflicts: # src/org/traccar/protocol/AquilaProtocolDecoder.java # src/org/traccar/protocol/L100FrameDecoder.java
Diffstat (limited to 'src/org/traccar/model/Position.java')
-rw-r--r--src/org/traccar/model/Position.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/org/traccar/model/Position.java b/src/org/traccar/model/Position.java
index b0fe7a79b..4b327cbd2 100644
--- a/src/org/traccar/model/Position.java
+++ b/src/org/traccar/model/Position.java
@@ -112,6 +112,8 @@ public class Position extends Message {
public static final String ALARM_POWER_OFF = "powerOff";
public static final String ALARM_POWER_ON = "powerOn";
public static final String ALARM_DOOR = "door";
+ public static final String ALARM_LOCK = "lock";
+ public static final String ALARM_UNLOCK = "unlock";
public static final String ALARM_GEOFENCE = "geofence";
public static final String ALARM_GEOFENCE_ENTER = "geofenceEnter";
public static final String ALARM_GEOFENCE_EXIT = "geofenceExit";