aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjon-stumpf <jon.stumpf@gmail.com>2017-02-12 17:02:26 -0500
committerjon-stumpf <jon.stumpf@gmail.com>2017-02-12 17:02:26 -0500
commit95d8f99db0183dcf1c6ccce460a9082cc2dbf6b3 (patch)
treeaa5e985f5a986e3e50d9ff5ffe227422a70814bc
parentdfd09a62ed8df49228eb9a147e497bdfd81f1b18 (diff)
downloadtraccar-server-95d8f99db0183dcf1c6ccce460a9082cc2dbf6b3.tar.gz
traccar-server-95d8f99db0183dcf1c6ccce460a9082cc2dbf6b3.tar.bz2
traccar-server-95d8f99db0183dcf1c6ccce460a9082cc2dbf6b3.zip
Added !A and !C records as per data found in MiniFinderDecoderTest.java;
-rw-r--r--src/org/traccar/protocol/MiniFinderProtocolDecoder.java174
1 files changed, 140 insertions, 34 deletions
diff --git a/src/org/traccar/protocol/MiniFinderProtocolDecoder.java b/src/org/traccar/protocol/MiniFinderProtocolDecoder.java
index 62a4c48fb..009b3cc9f 100644
--- a/src/org/traccar/protocol/MiniFinderProtocolDecoder.java
+++ b/src/org/traccar/protocol/MiniFinderProtocolDecoder.java
@@ -34,7 +34,42 @@ public class MiniFinderProtocolDecoder extends BaseProtocolDecoder {
super(protocol);
}
- private static final Pattern PATTERN = new PatternBuilder()
+ // The !A record is not in the documentation for MiniFinder or EV-07S.
+ // Eview, the manufacturer, indicated that resellers could implement new record types.
+ // Using the data in MiniFinderProtocolDecoderTest.java as a guide
+ private static final Pattern PATTERN_A = new PatternBuilder()
+ .expression("!A,")
+ .number("(d+)/(d+)/(d+),") // date
+ .number("(d+):(d+):(d+),") // time
+ .number("(-?d+.d+),") // latitude
+ .number("(-?d+.d+),") // longitude
+ .number("(d+.?d*),") // unknown
+ .number("(d+.?d*),") // unknown
+ .number("(d+.?d*)") // unknown
+ .compile();
+
+ // The !C record is not in the documentation for MiniFinder or EV-07S
+ // Eview, the manufacturer, indicated that resellers could implement new record types.
+ // Using the data in MiniFinderProtocolDecoderTest.java as a guide
+ private static final Pattern PATTERN_C = new PatternBuilder()
+ .expression("!C,")
+ .number("(d+)/(d+)/(d+),") // date
+ .number("(d+):(d+):(d+),") // time
+ .number("(-?d+.d+),") // latitude
+ .number("(-?d+.d+),") // longitude
+ .number("(d+.?d*),") // speed (km/h)
+ .number("(d+.?d*),") // course
+ .number("(x+),") // flags
+ .number("(-?d+.d+),") // altitude (meters)
+ .number("(d+),") // battery (percentage)
+ .number("(d+.?d*),") // unknown
+ .number("(d+.?d*),") // unknown
+ .number("(d+.?d*)") // unknown
+ .compile();
+
+ // The !B (buffered data) records are the same as !D (live data) records.
+ // This was confirmed with the manufacturer, Eview.
+ private static final Pattern PATTERN_BD = new PatternBuilder()
.expression("![BD],")
.number("(d+)/(d+)/(d+),") // date
.number("(d+):(d+):(d+),") // time
@@ -50,24 +85,56 @@ public class MiniFinderProtocolDecoder extends BaseProtocolDecoder {
.number("(d+.?d*)") // HDOP, confirmed with Eview manufacturer
.compile();
+ private void decodeFlags(Position position, int flags) {
+
+ position.setValid(BitUtil.check(flags, 0));
+
+ if (BitUtil.check(flags, 2)) {
+ position.set(Position.KEY_ALARM, Position.ALARM_FAULT);
+ }
+ if (BitUtil.check(flags, 6)) {
+ position.set(Position.KEY_ALARM, Position.ALARM_SOS);
+ }
+ if (BitUtil.check(flags, 7)) {
+ position.set(Position.KEY_ALARM, Position.ALARM_OVERSPEED);
+ }
+ if (BitUtil.check(flags, 8)) {
+ position.set(Position.KEY_ALARM, Position.ALARM_FALL_DOWN);
+ }
+ if (BitUtil.check(flags, 9) || BitUtil.check(flags, 10) || BitUtil.check(flags, 11)) {
+ position.set(Position.KEY_ALARM, Position.ALARM_GEOFENCE);
+ }
+ if (BitUtil.check(flags, 12)) {
+ position.set(Position.KEY_ALARM, Position.ALARM_LOW_BATTERY);
+ }
+ if (BitUtil.check(flags, 15) || BitUtil.check(flags, 14)) {
+ position.set(Position.KEY_ALARM, Position.ALARM_MOVEMENT);
+ }
+
+ position.set(Position.KEY_RSSI, BitUtil.between(flags, 16, 20));
+ position.set(Position.KEY_CHARGE, BitUtil.check(flags, 22));
+ }
+
@Override
protected Object decode(
Channel channel, SocketAddress remoteAddress, Object msg) throws Exception {
String sentence = (String) msg;
- if (sentence.startsWith("!1")) {
+ if (sentence.startsWith("!1,")) {
getDeviceSession(channel, remoteAddress, sentence.substring(3, sentence.length()));
- } else if (sentence.matches("![BD].*")) {
+ return null;
+ }
- DeviceSession deviceSession = getDeviceSession(channel, remoteAddress);
- if (deviceSession == null) {
- return null;
- }
+ DeviceSession deviceSession = getDeviceSession(channel, remoteAddress);
+ if (deviceSession == null) {
+ return null;
+ }
- Parser parser = new Parser(PATTERN, sentence);
+ if (sentence.startsWith("!B,") || sentence.startsWith("!D,")) {
+ Parser parser = new Parser(PATTERN_BD, sentence);
if (!parser.matches()) {
return null;
}
@@ -90,45 +157,84 @@ public class MiniFinderProtocolDecoder extends BaseProtocolDecoder {
position.setCourse(0);
}
- int flags = parser.nextInt(16);
+ decodeFlags(position, parser.nextInt(16));
- position.setValid(BitUtil.check(flags, 0));
+ position.setAltitude(parser.nextDouble());
- if (BitUtil.check(flags, 2)) {
- position.set(Position.KEY_ALARM, Position.ALARM_FAULT);
- }
- if (BitUtil.check(flags, 6)) {
- position.set(Position.KEY_ALARM, Position.ALARM_SOS);
- }
- if (BitUtil.check(flags, 7)) {
- position.set(Position.KEY_ALARM, Position.ALARM_OVERSPEED);
- }
- if (BitUtil.check(flags, 8)) {
- position.set(Position.KEY_ALARM, Position.ALARM_FALL_DOWN);
- }
- if (BitUtil.check(flags, 9) || BitUtil.check(flags, 10) || BitUtil.check(flags, 11)) {
- position.set(Position.KEY_ALARM, Position.ALARM_GEOFENCE);
- }
- if (BitUtil.check(flags, 12)) {
- position.set(Position.KEY_ALARM, Position.ALARM_LOW_BATTERY);
+ position.set(Position.KEY_BATTERY, parser.nextInt());
+ position.set(Position.KEY_SATELLITES, parser.nextInt());
+ position.set(Position.KEY_SATELLITES_VISIBLE, parser.nextInt());
+ position.set(Position.KEY_HDOP, parser.nextDouble());
+
+ position.set(Position.KEY_TYPE, sentence.substring(1, 2));
+
+ return position;
+ }
+
+ if (sentence.startsWith("!C,")) {
+ Parser parser = new Parser(PATTERN_C, sentence);
+ if (!parser.matches()) {
+ return null;
}
- if (BitUtil.check(flags, 15) || BitUtil.check(flags, 14)) {
- position.set(Position.KEY_ALARM, Position.ALARM_MOVEMENT);
+
+ Position position = new Position();
+ position.setProtocol(getProtocolName());
+ position.setDeviceId(deviceSession.getDeviceId());
+
+ DateBuilder dateBuilder = new DateBuilder()
+ .setDateReverse(parser.nextInt(), parser.nextInt(), parser.nextInt())
+ .setTime(parser.nextInt(), parser.nextInt(), parser.nextInt());
+ position.setTime(dateBuilder.getDate());
+
+ position.setLatitude(parser.nextDouble());
+ position.setLongitude(parser.nextDouble());
+ position.setSpeed(UnitsConverter.knotsFromKph(parser.nextDouble()));
+
+ position.setCourse(parser.nextDouble());
+ if (position.getCourse() > 360) {
+ position.setCourse(0);
}
- position.set(Position.KEY_RSSI, BitUtil.between(flags, 16, 20));
- position.set(Position.KEY_CHARGE, BitUtil.check(flags, 22));
+ decodeFlags(position, parser.nextInt(16));
position.setAltitude(parser.nextDouble());
position.set(Position.KEY_BATTERY, parser.nextInt());
- position.set(Position.KEY_SATELLITES, parser.nextInt());
- position.set(Position.KEY_SATELLITES_VISIBLE, parser.nextInt());
- position.set(Position.KEY_HDOP, parser.nextDouble());
+
+ // Ignoring last three fields, unknown
+ position.set("unknown", parser.next() + "," + parser.next() + "," + parser.next());
+
+ position.set(Position.KEY_TYPE, sentence.substring(1, 2));
return position;
}
+ if (sentence.startsWith("!A,")) {
+ Parser parser = new Parser(PATTERN_A, sentence);
+ if (!parser.matches()) {
+ return null;
+ }
+
+ Position position = new Position();
+ position.setProtocol(getProtocolName());
+ position.setDeviceId(deviceSession.getDeviceId());
+
+ DateBuilder dateBuilder = new DateBuilder()
+ .setDateReverse(parser.nextInt(), parser.nextInt(), parser.nextInt())
+ .setTime(parser.nextInt(), parser.nextInt(), parser.nextInt());
+ position.setTime(dateBuilder.getDate());
+
+ position.setLatitude(parser.nextDouble());
+ position.setLongitude(parser.nextDouble());
+
+ // Ignoring last three fields, unknown
+ position.set("unknown", parser.next() + "," + parser.next() + "," + parser.next());
+
+ return position;
+ }
+
+ // If we get here, we didn't understand the message
+
return null;
}
}