aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2015-03-13 12:08:16 +1300
committerAnton Tananaev <anton.tananaev@gmail.com>2015-03-13 12:08:16 +1300
commitcee735f6934c18b44b5529787224344aa3412ffa (patch)
treeb1d847d6f7488094726e5344e2f009bc0f1fbf53 /src
parentef05289a39c6ffedd123e1a50bbac7857719ea95 (diff)
downloadtraccar-server-cee735f6934c18b44b5529787224344aa3412ffa.tar.gz
traccar-server-cee735f6934c18b44b5529787224344aa3412ffa.tar.bz2
traccar-server-cee735f6934c18b44b5529787224344aa3412ffa.zip
Add Wialon extended info (fix #1113)
Diffstat (limited to 'src')
-rw-r--r--src/org/traccar/protocol/WialonProtocolDecoder.java42
1 files changed, 39 insertions, 3 deletions
diff --git a/src/org/traccar/protocol/WialonProtocolDecoder.java b/src/org/traccar/protocol/WialonProtocolDecoder.java
index 5b8d9a24e..6c4c0e8db 100644
--- a/src/org/traccar/protocol/WialonProtocolDecoder.java
+++ b/src/org/traccar/protocol/WialonProtocolDecoder.java
@@ -49,9 +49,16 @@ public class WialonProtocolDecoder extends BaseProtocolDecoder {
"([EW]);" +
"(\\d+\\.?\\d*)?;" + // Speed
"(\\d+\\.?\\d*)?;" + // Course
- "(?:(\\d+\\.?\\d*)|NA);" + // Altitude
- "(?:(\\d+)|NA)" + // Satellites
- ".*"); // Full format
+ "(?:NA|(\\d+\\.?\\d*));" + // Altitude
+ "(?:NA|(\\d+))" + // Satellites
+ "(?:;" +
+ "(?:NA|(\\d+\\.?\\d*));" + // hdop
+ "(?:NA|(\\d+));" + // inputs
+ "(?:NA|(\\d+));" + // outputs
+ "(?:NA|([^;]*));" + // adc
+ "(?:NA|([^;]*));" + // ibutton
+ "(?:NA|(.*))" + // params
+ ")?");
private void sendResponse(Channel channel, String prefix, Integer number) {
if (channel != null) {
@@ -135,6 +142,35 @@ public class WialonProtocolDecoder extends BaseProtocolDecoder {
position.setValid(false);
}
+ // Other
+ extendedInfo.set("hdop", parser.group(index++));
+ extendedInfo.set("inputs", parser.group(index++));
+ extendedInfo.set("outputs", parser.group(index++));
+
+ // ADC
+ String adc = parser.group(index++);
+ if (adc != null) {
+ String[] values = adc.split(",");
+ for (int i = 0; i < values.length; i++) {
+ extendedInfo.set("adc" + (i + 1), values[i]);
+ }
+ }
+
+ // iButton
+ extendedInfo.set("ibutton", parser.group(index++));
+
+ // Params
+ String params = parser.group(index);
+ if (params != null) {
+ String[] values = params.split(",");
+ for (String param : values) {
+ Matcher paramParser = Pattern.compile( "(.*):[1-3]:(.*)").matcher(param);
+ if (paramParser.matches()) {
+ extendedInfo.set(paramParser.group(1).toLowerCase(), paramParser.group(2));
+ }
+ }
+ }
+
// Extended info
position.setExtendedInfo(extendedInfo.toString());