aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2015-11-03 10:09:05 +1300
committerAnton Tananaev <anton.tananaev@gmail.com>2015-11-03 10:09:05 +1300
commit1268417e9052e36b899bd3f024aa99c01644c3f4 (patch)
tree20b71ca9a6e42b7dd727abea85f09c67a40fc015 /src/org/traccar
parent2a8c9bd543d22adf86d8fa807f346fec804fc767 (diff)
downloadtraccar-server-1268417e9052e36b899bd3f024aa99c01644c3f4.tar.gz
traccar-server-1268417e9052e36b899bd3f024aa99c01644c3f4.tar.bz2
traccar-server-1268417e9052e36b899bd3f024aa99c01644c3f4.zip
Big improvements to Atrack decoder
Diffstat (limited to 'src/org/traccar')
-rw-r--r--src/org/traccar/model/Event.java1
-rw-r--r--src/org/traccar/protocol/AtrackProtocolDecoder.java189
-rw-r--r--src/org/traccar/protocol/UlbotechProtocolDecoder.java2
3 files changed, 148 insertions, 44 deletions
diff --git a/src/org/traccar/model/Event.java b/src/org/traccar/model/Event.java
index 172203a86..832e0e7c5 100644
--- a/src/org/traccar/model/Event.java
+++ b/src/org/traccar/model/Event.java
@@ -50,6 +50,7 @@ public abstract class Event extends Extensible {
public static final String KEY_DOOR = "door";
public static final String KEY_RPM = "rpm";
public static final String KEY_HOURS = "hours";
+ public static final String KEY_VIN = "vin";
public static final String KEY_OBD_SPEED = "obd-speed";
public static final String KEY_OBD_ODOMETER = "obd-odometer";
diff --git a/src/org/traccar/protocol/AtrackProtocolDecoder.java b/src/org/traccar/protocol/AtrackProtocolDecoder.java
index 792f22c07..e939cb88d 100644
--- a/src/org/traccar/protocol/AtrackProtocolDecoder.java
+++ b/src/org/traccar/protocol/AtrackProtocolDecoder.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2013 - 2014 Anton Tananaev (anton.tananaev@gmail.com)
+ * Copyright 2013 - 2015 Anton Tananaev (anton.tananaev@gmail.com)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -24,17 +24,39 @@ import org.jboss.netty.buffer.ChannelBuffer;
import org.jboss.netty.buffer.ChannelBuffers;
import org.jboss.netty.channel.Channel;
import org.traccar.BaseProtocolDecoder;
+import org.traccar.Context;
+import org.traccar.helper.DateBuilder;
import org.traccar.helper.UnitsConverter;
import org.traccar.model.Event;
import org.traccar.model.Position;
public class AtrackProtocolDecoder extends BaseProtocolDecoder {
+ private static final int MIN_DATA_LENGTH = 40;
+
+ private boolean longDate;
+ private boolean custom;
+ private String form;
+
public AtrackProtocolDecoder(AtrackProtocol protocol) {
super(protocol);
+
+ longDate = Context.getConfig().getBoolean(getProtocolName() + ".longDate");
+
+ custom = Context.getConfig().getBoolean(getProtocolName() + ".custom");
+ form = Context.getConfig().getString(getProtocolName() + ".form");
+ if (form != null) {
+ custom = true;
+ }
}
- private static final int MIN_DATA_LENGTH = 40;
+ public void setLongDate(boolean longDate) {
+ this.longDate = longDate;
+ }
+
+ public void setCustom(boolean custom) {
+ this.custom = custom;
+ }
private static void sendResponse(Channel channel, SocketAddress remoteAddress, long rawId, int index) {
if (channel != null) {
@@ -47,32 +69,115 @@ public class AtrackProtocolDecoder extends BaseProtocolDecoder {
}
private static String readString(ChannelBuffer buf) {
-
String result = null;
- int length = 0;
- while (buf.getByte(buf.readerIndex() + length) != 0) {
- length += 1;
- }
- if (length != 0) {
- result = buf.toString(buf.readerIndex(), length, Charset.defaultCharset());
- buf.skipBytes(length);
+ int index = buf.indexOf(buf.readerIndex(), buf.writerIndex(), (byte) 0);
+ if (index > buf.readerIndex()) {
+ result = buf.readBytes(index - buf.readerIndex()).toString(Charset.defaultCharset());
}
buf.readByte();
-
return result;
}
+ private void readCustomData(Position position, ChannelBuffer buf, String form) {
+ String[] keys = form.substring(1).split("%");
+ for (String key : keys) {
+ switch (key) {
+ case "SA":
+ position.set(Event.KEY_SATELLITES, buf.readUnsignedByte());
+ break;
+ case "MV":
+ position.set(Event.KEY_POWER, buf.readUnsignedShort());
+ break;
+ case "BV":
+ position.set(Event.KEY_BATTERY, buf.readUnsignedShort());
+ break;
+ case "GQ":
+ position.set(Event.KEY_GSM, buf.readUnsignedByte());
+ break;
+ case "CE":
+ position.set(Event.KEY_CELL, buf.readUnsignedInt());
+ break;
+ case "LC":
+ position.set(Event.KEY_LAC, buf.readUnsignedShort());
+ break;
+ case "CN":
+ buf.readUnsignedInt(); // mcc + mnc
+ break;
+ case "RL":
+ buf.readUnsignedByte(); // rxlev
+ break;
+ case "PC":
+ buf.readUnsignedInt(); // pulse count
+ break;
+ case "AT":
+ position.setAltitude(buf.readUnsignedInt());
+ break;
+ case "RP":
+ position.set(Event.KEY_RPM, buf.readUnsignedShort());
+ break;
+ case "GS":
+ buf.readUnsignedByte(); // gsm status
+ break;
+ case "DT":
+ position.set(Event.KEY_ARCHIVE, buf.readUnsignedByte() == 1);
+ break;
+ case "VN":
+ position.set(Event.KEY_VIN, readString(buf));
+ break;
+ case "MF":
+ buf.readUnsignedShort(); // mass air flow rate
+ break;
+ case "EL":
+ buf.readUnsignedByte(); // engine load
+ break;
+ case "TR":
+ buf.readUnsignedByte(); // throttle position
+ break;
+ case "ET":
+ buf.readUnsignedShort(); // engine coolant temp
+ break;
+ case "FL":
+ position.set(Event.KEY_FUEL, buf.readUnsignedByte());
+ break;
+ case "ML":
+ buf.readUnsignedByte(); // mil status
+ break;
+ case "FC":
+ buf.readUnsignedInt(); // fuel used
+ break;
+ case "CI":
+ readString(buf); // format string
+ break;
+ case "AV1":
+ position.set(Event.PREFIX_ADC + 1, buf.readUnsignedShort());
+ break;
+ case "NC":
+ readString(buf); // gsm neighbor cell info
+ break;
+ case "SM":
+ buf.readUnsignedShort(); // max speed between reports
+ break;
+ case "GL":
+ readString(buf); // google link
+ break;
+ case "MA":
+ readString(buf); // mac address
+ break;
+ default:
+ break;
+ }
+ }
+ }
+
@Override
protected Object decode(
- Channel channel, SocketAddress remoteAddress, Object msg)
- throws Exception {
+ Channel channel, SocketAddress remoteAddress, Object msg) throws Exception {
ChannelBuffer buf = (ChannelBuffer) msg;
- // Keep alive message
if (buf.getUnsignedShort(buf.readerIndex()) == 0xfe02) {
if (channel != null) {
- channel.write(buf, remoteAddress);
+ channel.write(buf, remoteAddress); // keep-alive message
}
return null;
}
@@ -82,72 +187,70 @@ public class AtrackProtocolDecoder extends BaseProtocolDecoder {
buf.readUnsignedShort(); // length
int index = buf.readUnsignedShort();
- // Get device id
long id = buf.readLong();
if (!identify(String.valueOf(id), channel, remoteAddress)) {
return null;
}
- // Send acknowledgement
sendResponse(channel, remoteAddress, id, index);
List<Position> positions = new LinkedList<>();
while (buf.readableBytes() >= MIN_DATA_LENGTH) {
- // Create new position
Position position = new Position();
- position.setDeviceId(getDeviceId());
position.setProtocol(getProtocolName());
+ position.setDeviceId(getDeviceId());
+
+ if (longDate) {
+
+ DateBuilder dateBuilder = new DateBuilder()
+ .setDate(buf.readUnsignedShort(), buf.readUnsignedByte(), buf.readUnsignedByte())
+ .setTime(buf.readUnsignedByte(), buf.readUnsignedByte(), buf.readUnsignedByte());
+ position.setTime(dateBuilder.getDate());
- // Date and time
- position.setTime(new Date(buf.readUnsignedInt() * 1000)); // gps time
- buf.readUnsignedInt(); // rtc time
- buf.readUnsignedInt(); // send time
+ buf.skipBytes(7 + 7);
+
+
+ } else {
+
+ position.setFixTime(new Date(buf.readUnsignedInt() * 1000));
+ position.setDeviceTime(new Date(buf.readUnsignedInt() * 1000));
+ buf.readUnsignedInt(); // send time
+ }
- // Coordinates
position.setValid(true);
position.setLongitude(buf.readInt() * 0.000001);
position.setLatitude(buf.readInt() * 0.000001);
-
- // Course
position.setCourse(buf.readUnsignedShort());
- // Report type
position.set(Event.KEY_TYPE, buf.readUnsignedByte());
-
- // Odometer
position.set(Event.KEY_ODOMETER, buf.readUnsignedInt() * 0.1);
-
- // Accuracy
position.set(Event.KEY_HDOP, buf.readUnsignedShort() * 0.1);
-
- // Input
position.set(Event.KEY_INPUT, buf.readUnsignedByte());
- // Speed
position.setSpeed(UnitsConverter.knotsFromKph(buf.readUnsignedShort()));
- // Output
position.set(Event.KEY_OUTPUT, buf.readUnsignedByte());
-
- // ADC
position.set(Event.PREFIX_ADC + 1, buf.readUnsignedShort() * 0.001);
- // Driver
position.set("driver", readString(buf));
- // Temperature
position.set(Event.PREFIX_TEMP + 1, buf.readShort() * 0.1);
position.set(Event.PREFIX_TEMP + 2, buf.readShort() * 0.1);
- // Text Message
position.set("message", readString(buf));
- // With AT$FORM Command you can extend atrack protocol.
- // For example adding AT$FORM %FC /Fuel used you can add the line in this position:
- // position.set("fuelused", buf.readUnsignedInt() * 0.1);
+ if (custom) {
+ String form = this.form;
+ if (form == null) {
+ form = readString(buf).substring("%CI".length());
+ }
+ readCustomData(position, buf, form);
+ }
+
positions.add(position);
+
}
return positions;
diff --git a/src/org/traccar/protocol/UlbotechProtocolDecoder.java b/src/org/traccar/protocol/UlbotechProtocolDecoder.java
index b015e768a..a3edfdb07 100644
--- a/src/org/traccar/protocol/UlbotechProtocolDecoder.java
+++ b/src/org/traccar/protocol/UlbotechProtocolDecoder.java
@@ -197,7 +197,7 @@ public class UlbotechProtocolDecoder extends BaseProtocolDecoder {
break;
case DATA_VIN:
- position.set("vin", buf.readBytes(length).toString(Charset.defaultCharset()));
+ position.set(Event.KEY_VIN, buf.readBytes(length).toString(Charset.defaultCharset()));
break;
case DATA_RFID: