aboutsummaryrefslogtreecommitdiff
path: root/src/org
diff options
context:
space:
mode:
authorKevin Goos <kevingoos@telenet.be>2018-03-19 16:04:38 +0100
committerKevin Goos <kevingoos@telenet.be>2018-03-19 16:04:38 +0100
commit694b5ce8dd817e3f1c9bb94a43e9f52cdc4f6845 (patch)
tree9226e3b54076ac3c0352f810c6df53cd974a3434 /src/org
parent7297c042cc1df171b4ca8959b46001d898c2373c (diff)
downloadtraccar-server-694b5ce8dd817e3f1c9bb94a43e9f52cdc4f6845.tar.gz
traccar-server-694b5ce8dd817e3f1c9bb94a43e9f52cdc4f6845.tar.bz2
traccar-server-694b5ce8dd817e3f1c9bb94a43e9f52cdc4f6845.zip
Merged laipac and laipac kamel protocol to one
Diffstat (limited to 'src/org')
-rw-r--r--src/org/traccar/helper/DataConverter.java2
-rw-r--r--src/org/traccar/protocol/LaipacProtocolDecoder.java116
-rw-r--r--src/org/traccar/protocol/LaipacSFKamelProtocol.java47
-rw-r--r--src/org/traccar/protocol/LaipacSFKamelProtocolDecoder.java168
4 files changed, 92 insertions, 241 deletions
diff --git a/src/org/traccar/helper/DataConverter.java b/src/org/traccar/helper/DataConverter.java
index 7abd4ae93..0df0219ad 100644
--- a/src/org/traccar/helper/DataConverter.java
+++ b/src/org/traccar/helper/DataConverter.java
@@ -26,7 +26,7 @@ public final class DataConverter {
public static byte[] parseHex(String string) {
try {
- return Hex.decodeHex(string);
+ return Hex.decodeHex(string.toCharArray());
} catch (DecoderException e) {
throw new RuntimeException(e);
}
diff --git a/src/org/traccar/protocol/LaipacProtocolDecoder.java b/src/org/traccar/protocol/LaipacProtocolDecoder.java
index 99189d012..dc7c394e4 100644
--- a/src/org/traccar/protocol/LaipacProtocolDecoder.java
+++ b/src/org/traccar/protocol/LaipacProtocolDecoder.java
@@ -35,25 +35,34 @@ public class LaipacProtocolDecoder extends BaseProtocolDecoder {
private static final Pattern PATTERN = new PatternBuilder()
.text("$AVRMC,")
- .expression("([^,]+),") // identifier
- .number("(dd)(dd)(dd),") // time (hhmmss)
- .expression("([AVRPavrp]),") // validity
- .number("(dd)(dd.d+),") // latitude
+ .expression("([^,]+),") // identifier
+ .number("(dd)(dd)(dd),") // time (hhmmss)
+ .expression("([AVRPavrp]),") // validity
+ .number("(dd)(dd.d+),") // latitude
.expression("([NS]),")
- .number("(ddd)(dd.d+),") // longitude
+ .number("(ddd)(dd.d+),") // longitude
.number("([EW]),")
- .number("(d+.d+),") // speed
- .number("(d+.d+),") // course
- .number("(dd)(dd)(dd),") // date (ddmmyy)
- .expression("(.),") // type
- .expression("[^*]+").text("*")
- .number("(xx)") // checksum
+ .number("(d+.d+),") // speed
+ .number("(d+.d+),") // course
+ .number("(dd)(dd)(dd),") // date (ddmmyy)
+ .expression("([abZXTSMHFE86430]),") // event code
+ .number("(d+)").expression("(\\.?)").number("(d*),") // battery voltage
+ .number("(d+),") // current mileage
+ .number("(d),") // GPS on/off (1 = on, 0 = off)
+ .number("(d+),") // Analog port 1
+ .number("(d+)") // Analog port 2
+ .expression(",([0-9a-fA-F]{4})") // Cell 1 - Cell Net Code
+ .expression("([0-9a-fA-F]{4}),") // Cell 1 - Cell ID Code
+ .number("(d{3})") // Cell 2 - Country Code
+ .number("(d{3})") // Cell 2 - Operator Code
+ .optional(4)
+ .text("*")
+ .number("(xx)") // checksum
.compile();
@Override
protected Object decode(
Channel channel, SocketAddress remoteAddress, Object msg) throws Exception {
-
String sentence = (String) msg;
if (sentence.startsWith("$ECHK") && channel != null) {
@@ -79,6 +88,7 @@ public class LaipacProtocolDecoder extends BaseProtocolDecoder {
String status = parser.next();
position.setValid(status.toUpperCase().equals("A"));
+ position.set(Position.KEY_STATUS, status);
position.setLatitude(parser.nextCoordinate());
position.setLongitude(parser.nextCoordinate());
@@ -88,28 +98,84 @@ public class LaipacProtocolDecoder extends BaseProtocolDecoder {
dateBuilder.setDateReverse(parser.nextInt(0), parser.nextInt(0), parser.nextInt(0));
position.setTime(dateBuilder.getDate());
- String type = parser.next();
+ String eventCode = parser.next();
+ String decodedAlarm = decodeAlarm(eventCode);
+ if (decodedAlarm != null) {
+ position.set(Position.KEY_ALARM, decodeAlarm(eventCode));
+ }
+ position.set(Position.KEY_EVENT, eventCode);
+
+ double batteryVoltage = parser.nextDouble();
+ if (parser.next().isEmpty()) {
+ parser.next();
+ batteryVoltage *= 0.001;
+ } else {
+ batteryVoltage += parser.nextDouble() * 0.001;
+ }
+ position.set(Position.KEY_BATTERY, batteryVoltage);
+
+ position.set(Position.KEY_TOTAL_DISTANCE, parser.nextDouble());
+ position.set(Position.KEY_GPS, parser.nextInt());
+ position.set(Position.PREFIX_ADC + 1, parser.nextDouble() * 0.001);
+ position.set(Position.PREFIX_ADC + 2, parser.nextDouble() * 0.001);
+
+ setNextValue(parser, position, Position.KEY_CELL_NET_CODE);
+ setNextValue(parser, position, Position.KEY_CELL_ID_CODE);
+ setNextValue(parser, position, Position.KEY_COUNTRY_CODE);
+ setNextValue(parser, position, Position.KEY_OPERATOR);
+
String checksum = parser.next();
+ String result = sentence.replaceAll("^\\$(.*)\\*[0-9a-fA-F]{2}$", "$1");
+ if (checksum == null || Integer.parseInt(checksum, 16) != Checksum.xor(result)) {
+ return null;
+ }
if (channel != null) {
-
- if (Character.isLowerCase(status.charAt(0))) {
- String response = "$EAVACK," + type + "," + checksum;
+ if (eventCode.equals("3")) {
+ channel.write("$AVCFG,00000000,d*31\r\n");
+ } else if (eventCode.equals("X") || eventCode.equals("4")) {
+ channel.write("$AVCFG,00000000,x*2D\r\n");
+ } else if (eventCode.equals("Z")) {
+ channel.write("$AVCFG,00000000,z*2F\r\n");
+ } else if (Character.isLowerCase(status.charAt(0))) {
+ String response = "$EAVACK," + eventCode + "," + checksum;
response += Checksum.nmea(response);
+ response += "\r\n";
channel.write(response);
}
-
- if (type.equals("S") || type.equals("T")) {
- channel.write("$AVCFG,00000000,t*21");
- } else if (type.equals("3")) {
- channel.write("$AVCFG,00000000,d*31");
- } else if (type.equals("X") || type.equals("4")) {
- channel.write("$AVCFG,00000000,x*2D");
- }
-
}
return position;
}
+ private void setNextValue(Parser parser, Position position, String key)
+ {
+ String value = parser.next();
+ if (value != null) {
+ position.set(key, value);
+ }
+ }
+
+ private String decodeAlarm(String event) {
+ if (event.equals('Z')) {
+ return Position.ALARM_LOW_BATTERY;
+ } else if (event.equals('X')) {
+ return Position.ALARM_GEOFENCE_ENTER;
+ } else if (event.equals('T')) {
+ return Position.ALARM_TAMPERING;
+ } else if (event.equals("H")) {
+ return Position.ALARM_POWER_OFF;
+ } else if (event.equals('X')) {
+ return Position.ALARM_GEOFENCE_ENTER;
+ } else if (event.equals('8')) {
+ return Position.ALARM_SHOCK;
+ } else if (event.equals('7') && event.equals('4')) {
+ return Position.ALARM_GEOFENCE_EXIT;
+ } else if (event.equals('6')) {
+ return Position.ALARM_OVERSPEED;
+ } else if (event.equals('3')) {
+ return Position.ALARM_SOS;
+ }
+ return null;
+ }
}
diff --git a/src/org/traccar/protocol/LaipacSFKamelProtocol.java b/src/org/traccar/protocol/LaipacSFKamelProtocol.java
deleted file mode 100644
index 5e1beabbd..000000000
--- a/src/org/traccar/protocol/LaipacSFKamelProtocol.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright 2015 Anton Tananaev (anton@traccar.org)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.traccar.protocol;
-
-import org.jboss.netty.bootstrap.ServerBootstrap;
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.handler.codec.frame.LineBasedFrameDecoder;
-import org.jboss.netty.handler.codec.string.StringDecoder;
-import org.jboss.netty.handler.codec.string.StringEncoder;
-import org.traccar.BaseProtocol;
-import org.traccar.TrackerServer;
-
-import java.util.List;
-
-public class LaipacSFKamelProtocol extends BaseProtocol {
-
- public LaipacSFKamelProtocol() {
- super("laipacsfkamel");
- }
-
- @Override
- public void initTrackerServers(List<TrackerServer> serverList) {
- serverList.add(new TrackerServer(new ServerBootstrap(), getName()) {
- @Override
- protected void addSpecificHandlers(ChannelPipeline pipeline) {
- pipeline.addLast("frameDecoder", new LineBasedFrameDecoder(1024));
- pipeline.addLast("stringEncoder", new StringEncoder());
- pipeline.addLast("stringDecoder", new StringDecoder());
- pipeline.addLast("objectDecoder", new LaipacSFKamelProtocolDecoder(LaipacSFKamelProtocol.this));
- }
- });
- }
-
-}
diff --git a/src/org/traccar/protocol/LaipacSFKamelProtocolDecoder.java b/src/org/traccar/protocol/LaipacSFKamelProtocolDecoder.java
deleted file mode 100644
index 925b032a9..000000000
--- a/src/org/traccar/protocol/LaipacSFKamelProtocolDecoder.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
- * Copyright 2013 - 2017 Anton Tananaev (anton@traccar.org)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.traccar.protocol;
-
-import org.jboss.netty.channel.Channel;
-import org.traccar.BaseProtocolDecoder;
-import org.traccar.DeviceSession;
-import org.traccar.helper.Checksum;
-import org.traccar.helper.DateBuilder;
-import org.traccar.helper.Parser;
-import org.traccar.helper.PatternBuilder;
-import org.traccar.model.Position;
-
-import java.net.SocketAddress;
-import java.util.regex.Pattern;
-
-public class LaipacSFKamelProtocolDecoder extends BaseProtocolDecoder {
-
- public LaipacSFKamelProtocolDecoder(LaipacSFKamelProtocol protocol) {
- super(protocol);
- }
-
- private static final Pattern PATTERN = new PatternBuilder()
- .text("$AVRMC,")
- .expression("([^,]+),") // identifier
- .number("(dd)(dd)(dd),") // time (hhmmss)
- .expression("([AVRPavrp]),") // validity
- .number("(dd)(dd.d+),") // latitude
- .expression("([NS]),")
- .number("(ddd)(dd.d+),") // longitude
- .number("([EW]),")
- .number("(d+.d+),") // speed
- .number("(d+.d+),") // course
- .number("(dd)(dd)(dd),") // date (ddmmyy)
- .expression("([abZXMHE86430]),") // event code
- .number("(d+),") // battery voltage
- .number("(d+),") // current mileage
- .number("(d),") // GPS on/off (1 = on, 0 = off)
- .number("(d+),") // Analog port 1
- .number("(d+)") // Analog port 2
- .expression(",([0-9a-fA-F]{4})") // Cell 1 - Cell Net Code
- .expression("([0-9a-fA-F]{4}),") // Cell 1 - Cell ID Code
- .number("(d{3})") // Cell 2 - Country Code
- .number("(d{3})") // Cell 2 - Operator Code
- .optional(4)
- .text("*")
- .number("(xx)") // checksum
- .compile();
-
- @Override
- protected Object decode(
- Channel channel, SocketAddress remoteAddress, Object msg) throws Exception {
- String sentence = (String) msg;
-
- if (sentence.startsWith("$ECHK") && channel != null) {
- channel.write(sentence + "\r\n"); // heartbeat
- return null;
- }
-
- Parser parser = new Parser(PATTERN, sentence);
- if (!parser.matches()) {
- return null;
- }
-
- DeviceSession deviceSession = getDeviceSession(channel, remoteAddress, parser.next());
- if (deviceSession == null) {
- return null;
- }
-
- Position position = new Position(getProtocolName());
- position.setDeviceId(deviceSession.getDeviceId());
-
- DateBuilder dateBuilder = new DateBuilder()
- .setTime(parser.nextInt(0), parser.nextInt(0), parser.nextInt(0));
-
- String status = parser.next();
- position.setValid(status.toUpperCase().equals("A"));
- position.set(Position.KEY_STATUS, status);
-
- position.setLatitude(parser.nextCoordinate());
- position.setLongitude(parser.nextCoordinate());
- position.setSpeed(parser.nextDouble(0));
- position.setCourse(parser.nextDouble(0));
-
- dateBuilder.setDateReverse(parser.nextInt(0), parser.nextInt(0), parser.nextInt(0));
- position.setTime(dateBuilder.getDate());
-
- String eventCode = parser.next();
- String decodedAlarm = decodeAlarm(eventCode);
- if (decodedAlarm != null) {
- position.set(Position.KEY_ALARM, decodeAlarm(eventCode));
- }
- position.set(Position.KEY_EVENT, eventCode);
- position.set(Position.KEY_BATTERY, parser.nextDouble() * 0.001);
- position.set(Position.KEY_TOTAL_DISTANCE, parser.nextDouble());
- position.set(Position.KEY_GPS, parser.nextInt());
- position.set(Position.PREFIX_ADC + 1, parser.nextDouble() * 0.001);
- position.set(Position.PREFIX_ADC + 2, parser.nextDouble() * 0.001);
-
- String checksum = parser.next();
- if (parser.hasNext()) {
- position.set(Position.KEY_CELL_NET_CODE, checksum);
- position.set(Position.KEY_CELL_ID_CODE, parser.next());
- position.set(Position.KEY_COUNTRY_CODE, parser.next());
- position.set(Position.KEY_OPERATOR, parser.next());
- checksum = parser.next();
- }
-
-
- String result = sentence.replaceAll("^\\$(.*)\\*[0-9a-fA-F]{2}$", "$1");
- if (checksum == null || Integer.parseInt(checksum, 16) != Checksum.xor(result)) {
- return null;
- }
-
- if (channel != null) {
- if (eventCode.equals("3")) {
- channel.write("$AVCFG,00000000,d*31\r\n");
- } else if (eventCode.equals("X") || eventCode.equals("4")) {
- channel.write("$AVCFG,00000000,x*2D\r\n");
- } else if (eventCode.equals("Z")) {
- channel.write("$AVCFG,00000000,z*2F\r\n");
- } else if (Character.isLowerCase(status.charAt(0))) {
- String response = "$EAVACK," + eventCode + "," + checksum;
- response += Checksum.nmea(response);
- response += "\r\n";
- channel.write(response);
- }
- }
-
- return position;
- }
-
- private String decodeAlarm(String event) {
- if (event.equals('Z')) {
- return Position.ALARM_LOW_BATTERY;
- } else if (event.equals('X')) {
- return Position.ALARM_GEOFENCE_ENTER;
- } else if (event.equals('T')) {
- return Position.ALARM_TAMPERING;
- } else if (event.equals("H")) {
- return Position.ALARM_POWER_OFF;
- } else if (event.equals('X')) {
- return Position.ALARM_GEOFENCE_ENTER;
- } else if (event.equals('8')) {
- return Position.ALARM_SHOCK;
- } else if (event.equals('7') && event.equals('4')) {
- return Position.ALARM_GEOFENCE_EXIT;
- } else if (event.equals('6')) {
- return Position.ALARM_OVERSPEED;
- } else if (event.equals('3')) {
- return Position.ALARM_SOS;
- }
- return null;
- }
-}