diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2016-11-10 11:35:05 +1300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-10 11:35:05 +1300 |
| commit | 96fc52072ba760d46520f7b7235bf9ac76c9869f (patch) | |
| tree | f6105cbff0463c4a36787e32f241672eb2ab8603 | |
| parent | 9d9dbcdd3229c6f852031d2e458aca194bcee8b9 (diff) | |
| parent | 096259c2fe6311bde08b993b18631053b7652c99 (diff) | |
| download | trackermap-server-96fc52072ba760d46520f7b7235bf9ac76c9869f.tar.gz trackermap-server-96fc52072ba760d46520f7b7235bf9ac76c9869f.tar.bz2 trackermap-server-96fc52072ba760d46520f7b7235bf9ac76c9869f.zip | |
Merge pull request #2520 from vipien/master
Add acc on, acc off and door alarm to events from coban gps
| -rw-r--r-- | src/org/traccar/model/Position.java | 2 | ||||
| -rw-r--r-- | src/org/traccar/protocol/Gps103ProtocolDecoder.java | 6 |
2 files changed, 8 insertions, 0 deletions
diff --git a/src/org/traccar/model/Position.java b/src/org/traccar/model/Position.java index 183fab72f..b2965c89c 100644 --- a/src/org/traccar/model/Position.java +++ b/src/org/traccar/model/Position.java @@ -83,6 +83,8 @@ public class Position extends Message { public static final String ALARM_LOW_BATTERY = "lowBattery"; public static final String ALARM_FAULT = "fault"; 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_GEOFENCE = "geofence"; public static final String ALARM_GEOFENCE_ENTER = "geofenceEnter"; public static final String ALARM_GEOFENCE_EXIT = "geofenceExit"; diff --git a/src/org/traccar/protocol/Gps103ProtocolDecoder.java b/src/org/traccar/protocol/Gps103ProtocolDecoder.java index 7754bd831..57dc784d3 100644 --- a/src/org/traccar/protocol/Gps103ProtocolDecoder.java +++ b/src/org/traccar/protocol/Gps103ProtocolDecoder.java @@ -113,6 +113,12 @@ public class Gps103ProtocolDecoder extends BaseProtocolDecoder { return Position.ALARM_MOVEMENT; case "speed": return Position.ALARM_OVERSPEED; + case "acc on": + return Position.ALARM_POWER_ON; + case "acc off": + return Position.ALARM_POWER_OFF; + case "door alarm": + return Position.ALARM_DOOR; default: return null; } |