aboutsummaryrefslogtreecommitdiff
path: root/src/org
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2015-09-05 11:38:53 +1200
committerAnton Tananaev <anton.tananaev@gmail.com>2015-09-05 11:38:53 +1200
commit2415c0228487df2f2b0583c15859ef8cf8f012e1 (patch)
treea3e27f76b6a469f687119618eb224bfe522e1427 /src/org
parent380bdd08e8fbe35b3f197b13363e0d6c17996c8a (diff)
downloadtraccar-server-2415c0228487df2f2b0583c15859ef8cf8f012e1.tar.gz
traccar-server-2415c0228487df2f2b0583c15859ef8cf8f012e1.tar.bz2
traccar-server-2415c0228487df2f2b0583c15859ef8cf8f012e1.zip
Support alarm signal for SunTech
Diffstat (limited to 'src/org')
-rw-r--r--src/org/traccar/protocol/SuntechProtocolDecoder.java7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/org/traccar/protocol/SuntechProtocolDecoder.java b/src/org/traccar/protocol/SuntechProtocolDecoder.java
index 7ba6020f5..3de785f9d 100644
--- a/src/org/traccar/protocol/SuntechProtocolDecoder.java
+++ b/src/org/traccar/protocol/SuntechProtocolDecoder.java
@@ -34,7 +34,7 @@ public class SuntechProtocolDecoder extends BaseProtocolDecoder {
private static final Pattern pattern = Pattern.compile(
"S.\\d{3}(?:\\w{3})?;" + // Header
- "(?:[^;]+;)?" +
+ "(?:([^;]+);)?" + // Type
"(\\d{6,});" + // Device ID
"(?:\\d+;)?" +
"(\\d+);" + // Version
@@ -66,6 +66,11 @@ public class SuntechProtocolDecoder extends BaseProtocolDecoder {
Position position = new Position();
position.setProtocol(getProtocolName());
int index = 1;
+
+ String type = parser.group(index++);
+ if (type != null && (type.equals("Alert") || type.equals("Emergency"))) {
+ position.set(Event.KEY_ALARM, true);
+ }
// Identifier
if (!identify(parser.group(index++), channel)) {