aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/protocol/NoranProtocolDecoder.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/NoranProtocolDecoder.java
parent132fbb9bd658490ea77aae50e20257b680c3cceb (diff)
parent791a010e5a449a27e8243b9bc98c918ffa054eac (diff)
downloadtraccar-server-e15f80a0eb5c57a90a98773e8d21ae20e98a8910.tar.gz
traccar-server-e15f80a0eb5c57a90a98773e8d21ae20e98a8910.tar.bz2
traccar-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/NoranProtocolDecoder.java')
-rw-r--r--src/org/traccar/protocol/NoranProtocolDecoder.java18
1 files changed, 17 insertions, 1 deletions
diff --git a/src/org/traccar/protocol/NoranProtocolDecoder.java b/src/org/traccar/protocol/NoranProtocolDecoder.java
index c2161d9c9..aaecfc1db 100644
--- a/src/org/traccar/protocol/NoranProtocolDecoder.java
+++ b/src/org/traccar/protocol/NoranProtocolDecoder.java
@@ -90,7 +90,23 @@ public class NoranProtocolDecoder extends BaseProtocolDecoder {
position.setValid(BitUtil.check(buf.readUnsignedByte(), 0));
- position.set(Position.KEY_ALARM, buf.readUnsignedByte());
+ short alarm = buf.readUnsignedByte();
+ switch (alarm) {
+ case 1:
+ position.set(Position.KEY_ALARM, Position.ALARM_SOS);
+ break;
+ case 2:
+ position.set(Position.KEY_ALARM, Position.ALARM_OVERSPEED);
+ break;
+ case 3:
+ position.set(Position.KEY_ALARM, Position.ALARM_GEOFENCE_EXIT);
+ break;
+ case 9:
+ position.set(Position.KEY_ALARM, Position.ALARM_POWER_OFF);
+ break;
+ default:
+ break;
+ }
if (newFormat) {
position.setSpeed(UnitsConverter.knotsFromKph(buf.readUnsignedInt()));