diff options
| author | jon-stumpf <jon.stumpf@gmail.com> | 2017-02-20 10:54:34 -0500 |
|---|---|---|
| committer | jon-stumpf <jon.stumpf@gmail.com> | 2017-02-20 10:54:34 -0500 |
| commit | 888c392af40187f3a0ecc3395495db9acd85b827 (patch) | |
| tree | beb74dff8b8052ffb4a7d3c894b2b4e5a4434973 /src/org/traccar/model/Position.java | |
| parent | 38249673287b908c0ca55847a35ca16a7b6a0c50 (diff) | |
| parent | 2449895139fa658d082c1085185003a001225bc3 (diff) | |
| download | trackermap-server-888c392af40187f3a0ecc3395495db9acd85b827.tar.gz trackermap-server-888c392af40187f3a0ecc3395495db9acd85b827.tar.bz2 trackermap-server-888c392af40187f3a0ecc3395495db9acd85b827.zip | |
Resolved conflict with master;
Diffstat (limited to 'src/org/traccar/model/Position.java')
| -rw-r--r-- | src/org/traccar/model/Position.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/org/traccar/model/Position.java b/src/org/traccar/model/Position.java index 288901430..350524f32 100644 --- a/src/org/traccar/model/Position.java +++ b/src/org/traccar/model/Position.java @@ -76,6 +76,7 @@ public class Position extends Message { public static final String ALARM_LOW_SPEED = "lowspeed"; public static final String ALARM_OVERSPEED = "overspeed"; public static final String ALARM_FALL_DOWN = "fallDown"; + public static final String ALARM_LOW_POWER = "lowPower"; public static final String ALARM_LOW_BATTERY = "lowBattery"; public static final String ALARM_FAULT = "fault"; public static final String ALARM_POWER_OFF = "powerOff"; @@ -98,6 +99,7 @@ public class Position extends Message { public static final String ALARM_BONNET = "bonnet"; public static final String ALARM_FOOT_BRAKE = "footBrake"; public static final String ALARM_OIL_LEAK = "oilLeak"; + public static final String ALARM_TAMPERING = "tampering"; private String protocol; |