aboutsummaryrefslogtreecommitdiff
path: root/src/org
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2016-08-17 16:37:31 +0300
committerGitHub <noreply@github.com>2016-08-17 16:37:31 +0300
commitbfacd794c443f0f54a27d5d52b33de4628a36009 (patch)
tree65a57a0d8f173493ef13cd9cd7736b22808d218c /src/org
parent376bd7a7342ed46f20b7c0c94d7c9b0074ae99f3 (diff)
parent54a64d8c0186e71ce557b5e9764d478084e9443c (diff)
downloadtrackermap-server-bfacd794c443f0f54a27d5d52b33de4628a36009.tar.gz
trackermap-server-bfacd794c443f0f54a27d5d52b33de4628a36009.tar.bz2
trackermap-server-bfacd794c443f0f54a27d5d52b33de4628a36009.zip
Merge pull request #2222 from Abyss777/alarms_3
Alarm decoding for few more protocols
Diffstat (limited to 'src/org')
-rw-r--r--src/org/traccar/protocol/Gt06ProtocolDecoder.java2
-rwxr-xr-xsrc/org/traccar/protocol/KenjiProtocolDecoder.java20
-rw-r--r--src/org/traccar/protocol/T800xProtocolDecoder.java21
-rw-r--r--src/org/traccar/protocol/TytanProtocolDecoder.java2
-rw-r--r--src/org/traccar/protocol/XexunProtocolDecoder.java19
5 files changed, 59 insertions, 5 deletions
diff --git a/src/org/traccar/protocol/Gt06ProtocolDecoder.java b/src/org/traccar/protocol/Gt06ProtocolDecoder.java
index c0b475b1e..3df8a4686 100644
--- a/src/org/traccar/protocol/Gt06ProtocolDecoder.java
+++ b/src/org/traccar/protocol/Gt06ProtocolDecoder.java
@@ -180,7 +180,7 @@ public class Gt06ProtocolDecoder extends BaseProtocolDecoder {
case 0x0F:
return Position.ALARM_LOW_BATTERY;
case 0x11:
- return Position.ALARM_LOW_BATTERY;
+ return Position.ALARM_POWER_OFF;
default:
break;
}
diff --git a/src/org/traccar/protocol/KenjiProtocolDecoder.java b/src/org/traccar/protocol/KenjiProtocolDecoder.java
index 2a95717ee..e13c91e3a 100755
--- a/src/org/traccar/protocol/KenjiProtocolDecoder.java
+++ b/src/org/traccar/protocol/KenjiProtocolDecoder.java
@@ -18,6 +18,7 @@ package org.traccar.protocol;
import org.jboss.netty.channel.Channel;
import org.traccar.BaseProtocolDecoder;
import org.traccar.DeviceSession;
+import org.traccar.helper.BitUtil;
import org.traccar.helper.DateBuilder;
import org.traccar.helper.Parser;
import org.traccar.helper.PatternBuilder;
@@ -49,6 +50,23 @@ public class KenjiProtocolDecoder extends BaseProtocolDecoder {
.any()
.compile();
+ private String decodeAlarm(int value) {
+ if (BitUtil.check(value, 2)) {
+ return Position.ALARM_SOS;
+ }
+ if (BitUtil.check(value, 4)) {
+ return Position.ALARM_LOW_BATTERY;
+ }
+ if (BitUtil.check(value, 6)) {
+ return Position.ALARM_MOVEMENT;
+ }
+ if (BitUtil.check(value, 1) || BitUtil.check(value, 10) || BitUtil.check(value, 11)) {
+ return Position.ALARM_VIBRATION;
+ }
+
+ return null;
+ }
+
@Override
protected Object decode(
Channel channel, SocketAddress remoteAddress, Object msg) throws Exception {
@@ -67,7 +85,7 @@ public class KenjiProtocolDecoder extends BaseProtocolDecoder {
}
position.setDeviceId(deviceSession.getDeviceId());
- position.set(Position.KEY_ALARM, parser.nextInt(16));
+ position.set(Position.KEY_ALARM, decodeAlarm(parser.nextInt(16)));
position.set(Position.KEY_OUTPUT, parser.nextInt(16));
position.set(Position.KEY_INPUT, parser.nextInt(16));
diff --git a/src/org/traccar/protocol/T800xProtocolDecoder.java b/src/org/traccar/protocol/T800xProtocolDecoder.java
index de966f901..8301450d5 100644
--- a/src/org/traccar/protocol/T800xProtocolDecoder.java
+++ b/src/org/traccar/protocol/T800xProtocolDecoder.java
@@ -60,6 +60,25 @@ public class T800xProtocolDecoder extends BaseProtocolDecoder {
}
}
+ private String decodeAlarm(short value) {
+ switch (value) {
+ case 3:
+ return Position.ALARM_SOS;
+ case 4:
+ return Position.ALARM_OVERSPEED;
+ case 5:
+ return Position.ALARM_GEOFENCE_ENTER;
+ case 6:
+ return Position.ALARM_GEOFENCE_EXIT;
+ case 8:
+ case 10:
+ return Position.ALARM_VIBRATION;
+ default:
+ break;
+ }
+ return null;
+ }
+
@Override
protected Object decode(
Channel channel, SocketAddress remoteAddress, Object msg) throws Exception {
@@ -111,7 +130,7 @@ public class T800xProtocolDecoder extends BaseProtocolDecoder {
position.set(Position.PREFIX_ADC + 1, buf.readUnsignedShort());
position.set(Position.PREFIX_ADC + 2, buf.readUnsignedShort());
- position.set(Position.KEY_ALARM, buf.readUnsignedByte());
+ position.set(Position.KEY_ALARM, decodeAlarm(buf.readUnsignedByte()));
buf.readUnsignedByte(); // reserved
diff --git a/src/org/traccar/protocol/TytanProtocolDecoder.java b/src/org/traccar/protocol/TytanProtocolDecoder.java
index 092ba431a..2733a568b 100644
--- a/src/org/traccar/protocol/TytanProtocolDecoder.java
+++ b/src/org/traccar/protocol/TytanProtocolDecoder.java
@@ -66,7 +66,7 @@ public class TytanProtocolDecoder extends BaseProtocolDecoder {
int alarm = buf.readUnsignedByte();
buf.readUnsignedByte();
if (BitUtil.check(alarm, 5)) {
- position.set(Position.KEY_ALARM, BitUtil.to(alarm, 4));
+ position.set(Position.KEY_ALARM, Position.ALARM_GENERAL);
}
break;
case 8:
diff --git a/src/org/traccar/protocol/XexunProtocolDecoder.java b/src/org/traccar/protocol/XexunProtocolDecoder.java
index 7b6a84f1f..69100f54b 100644
--- a/src/org/traccar/protocol/XexunProtocolDecoder.java
+++ b/src/org/traccar/protocol/XexunProtocolDecoder.java
@@ -64,6 +64,23 @@ public class XexunProtocolDecoder extends BaseProtocolDecoder {
.any()
.compile();
+ private String decodeAlarm(String value) {
+ if (value != null) {
+ switch (value) {
+ case "help me!":
+ return Position.ALARM_SOS;
+ case "low battery":
+ return Position.ALARM_LOW_BATTERY;
+ case "move!":
+ case "moved!":
+ return Position.ALARM_MOVEMENT;
+ default:
+ break;
+ }
+ }
+ return null;
+ }
+
@Override
protected Object decode(
Channel channel, SocketAddress remoteAddress, Object msg) throws Exception {
@@ -99,7 +116,7 @@ public class XexunProtocolDecoder extends BaseProtocolDecoder {
position.setTime(dateBuilder.getDate());
position.set("signal", parser.next());
- position.set(Position.KEY_ALARM, parser.next());
+ position.set(Position.KEY_ALARM, decodeAlarm(parser.next()));
DeviceSession deviceSession = getDeviceSession(channel, remoteAddress, parser.next());
if (deviceSession == null) {