From 2415c0228487df2f2b0583c15859ef8cf8f012e1 Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Sat, 5 Sep 2015 11:38:53 +1200 Subject: Support alarm signal for SunTech --- src/org/traccar/protocol/SuntechProtocolDecoder.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src/org/traccar/protocol/SuntechProtocolDecoder.java') 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)) { -- cgit v1.2.3