aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/org/traccar/protocol/TeltonikaProtocolDecoder.java186
-rw-r--r--test/org/traccar/protocol/TeltonikaProtocolDecoderTest.java12
2 files changed, 103 insertions, 95 deletions
diff --git a/src/org/traccar/protocol/TeltonikaProtocolDecoder.java b/src/org/traccar/protocol/TeltonikaProtocolDecoder.java
index f4c5c6932..9e2ef6a7a 100644
--- a/src/org/traccar/protocol/TeltonikaProtocolDecoder.java
+++ b/src/org/traccar/protocol/TeltonikaProtocolDecoder.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2013 - 2015 Anton Tananaev (anton.tananaev@gmail.com)
+ * Copyright 2013 - 2016 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.
@@ -57,17 +57,12 @@ public class TeltonikaProtocolDecoder extends BaseProtocolDecoder {
private static final int CODEC_FM4X00 = 0x08;
private static final int CODEC_12 = 0x0C;
- private List<Position> parseLocation(Channel channel, ChannelBuffer buf) {
+ private List<Position> parseData(Channel channel, ChannelBuffer buf) {
List<Position> positions = new LinkedList<>();
buf.skipBytes(4); // marker
buf.readUnsignedInt(); // data length
- int codec = buf.readUnsignedByte(); // codec
-
- if (codec == CODEC_12) {
- return null; // decode serial port data
- }
-
+ int codec = buf.readUnsignedByte();
int count = buf.readUnsignedByte();
for (int i = 0; i < count; i++) {
@@ -76,122 +71,135 @@ public class TeltonikaProtocolDecoder extends BaseProtocolDecoder {
position.setDeviceId(getDeviceId());
- int globalMask = 0x0f;
+ if (codec == CODEC_12) {
- if (codec == CODEC_GH3000) {
+ getLastLocation(position, null);
- long time = buf.readUnsignedInt() & 0x3fffffff;
- time += 1167609600; // 2007-01-01 00:00:00
+ position.set(Event.KEY_TYPE, buf.readUnsignedByte());
- globalMask = buf.readUnsignedByte();
- if (BitUtil.check(globalMask, 0)) {
+ position.set("command", buf.readBytes(buf.readInt()).toString(StandardCharsets.US_ASCII));
- position.setTime(new Date(time * 1000));
+ } else {
- int locationMask = buf.readUnsignedByte();
+ int globalMask = 0x0f;
- if (BitUtil.check(locationMask, 0)) {
- position.setLatitude(buf.readFloat());
- position.setLongitude(buf.readFloat());
- }
+ if (codec == CODEC_GH3000) {
- if (BitUtil.check(locationMask, 1)) {
- position.setAltitude(buf.readUnsignedShort());
- }
+ long time = buf.readUnsignedInt() & 0x3fffffff;
+ time += 1167609600; // 2007-01-01 00:00:00
- if (BitUtil.check(locationMask, 2)) {
- position.setCourse(buf.readUnsignedByte() * 360.0 / 256);
- }
+ globalMask = buf.readUnsignedByte();
+ if (BitUtil.check(globalMask, 0)) {
- if (BitUtil.check(locationMask, 3)) {
- position.setSpeed(UnitsConverter.knotsFromKph(buf.readUnsignedByte()));
- }
+ position.setTime(new Date(time * 1000));
- if (BitUtil.check(locationMask, 4)) {
- int satellites = buf.readUnsignedByte();
- position.set(Event.KEY_SATELLITES, satellites);
- position.setValid(satellites >= 3);
- }
+ int locationMask = buf.readUnsignedByte();
- if (BitUtil.check(locationMask, 5)) {
- position.set(Event.KEY_LAC, buf.readUnsignedShort());
- position.set(Event.KEY_CID, buf.readUnsignedShort());
- }
+ if (BitUtil.check(locationMask, 0)) {
+ position.setLatitude(buf.readFloat());
+ position.setLongitude(buf.readFloat());
+ }
- if (BitUtil.check(locationMask, 6)) {
- position.set(Event.KEY_GSM, buf.readUnsignedByte());
- }
+ if (BitUtil.check(locationMask, 1)) {
+ position.setAltitude(buf.readUnsignedShort());
+ }
- if (BitUtil.check(locationMask, 7)) {
- position.set("operator", buf.readUnsignedInt());
- }
+ if (BitUtil.check(locationMask, 2)) {
+ position.setCourse(buf.readUnsignedByte() * 360.0 / 256);
+ }
- } else {
+ if (BitUtil.check(locationMask, 3)) {
+ position.setSpeed(UnitsConverter.knotsFromKph(buf.readUnsignedByte()));
+ }
- getLastLocation(position, new Date(time * 1000));
+ if (BitUtil.check(locationMask, 4)) {
+ int satellites = buf.readUnsignedByte();
+ position.set(Event.KEY_SATELLITES, satellites);
+ position.setValid(satellites >= 3);
+ }
- }
+ if (BitUtil.check(locationMask, 5)) {
+ position.set(Event.KEY_LAC, buf.readUnsignedShort());
+ position.set(Event.KEY_CID, buf.readUnsignedShort());
+ }
- } else {
+ if (BitUtil.check(locationMask, 6)) {
+ position.set(Event.KEY_GSM, buf.readUnsignedByte());
+ }
+
+ if (BitUtil.check(locationMask, 7)) {
+ position.set("operator", buf.readUnsignedInt());
+ }
+
+ } else {
- position.setTime(new Date(buf.readLong()));
+ getLastLocation(position, new Date(time * 1000));
- position.set("priority", buf.readUnsignedByte());
+ }
- position.setLongitude(buf.readInt() / 10000000.0);
- position.setLatitude(buf.readInt() / 10000000.0);
- position.setAltitude(buf.readShort());
- position.setCourse(buf.readUnsignedShort());
+ } else {
- int satellites = buf.readUnsignedByte();
- position.set(Event.KEY_SATELLITES, satellites);
+ position.setTime(new Date(buf.readLong()));
- position.setValid(satellites != 0);
+ position.set("priority", buf.readUnsignedByte());
- position.setSpeed(UnitsConverter.knotsFromKph(buf.readUnsignedShort()));
+ position.setLongitude(buf.readInt() / 10000000.0);
+ position.setLatitude(buf.readInt() / 10000000.0);
+ position.setAltitude(buf.readShort());
+ position.setCourse(buf.readUnsignedShort());
- position.set(Event.KEY_EVENT, buf.readUnsignedByte());
+ int satellites = buf.readUnsignedByte();
+ position.set(Event.KEY_SATELLITES, satellites);
- buf.readUnsignedByte(); // total IO data records
+ position.setValid(satellites != 0);
- }
+ position.setSpeed(UnitsConverter.knotsFromKph(buf.readUnsignedShort()));
- // Read 1 byte data
- if (BitUtil.check(globalMask, 1)) {
- int cnt = buf.readUnsignedByte();
- for (int j = 0; j < cnt; j++) {
- int id = buf.readUnsignedByte();
- if (id == 1) {
- position.set(Event.KEY_POWER, buf.readUnsignedByte());
- } else {
- position.set(Event.PREFIX_IO + id, buf.readUnsignedByte());
+ position.set(Event.KEY_EVENT, buf.readUnsignedByte());
+
+ buf.readUnsignedByte(); // total IO data records
+
+ }
+
+ // Read 1 byte data
+ if (BitUtil.check(globalMask, 1)) {
+ int cnt = buf.readUnsignedByte();
+ for (int j = 0; j < cnt; j++) {
+ int id = buf.readUnsignedByte();
+ if (id == 1) {
+ position.set(Event.KEY_POWER, buf.readUnsignedByte());
+ } else {
+ position.set(Event.PREFIX_IO + id, buf.readUnsignedByte());
+ }
}
}
- }
- // Read 2 byte data
- if (BitUtil.check(globalMask, 2)) {
- int cnt = buf.readUnsignedByte();
- for (int j = 0; j < cnt; j++) {
- position.set(Event.PREFIX_IO + buf.readUnsignedByte(), buf.readUnsignedShort());
+ // Read 2 byte data
+ if (BitUtil.check(globalMask, 2)) {
+ int cnt = buf.readUnsignedByte();
+ for (int j = 0; j < cnt; j++) {
+ position.set(Event.PREFIX_IO + buf.readUnsignedByte(), buf.readUnsignedShort());
+ }
}
- }
- // Read 4 byte data
- if (BitUtil.check(globalMask, 3)) {
- int cnt = buf.readUnsignedByte();
- for (int j = 0; j < cnt; j++) {
- position.set(Event.PREFIX_IO + buf.readUnsignedByte(), buf.readUnsignedInt());
+ // Read 4 byte data
+ if (BitUtil.check(globalMask, 3)) {
+ int cnt = buf.readUnsignedByte();
+ for (int j = 0; j < cnt; j++) {
+ position.set(Event.PREFIX_IO + buf.readUnsignedByte(), buf.readUnsignedInt());
+ }
}
- }
- // Read 8 byte data
- if (codec == CODEC_FM4X00) {
- int cnt = buf.readUnsignedByte();
- for (int j = 0; j < cnt; j++) {
- position.set(Event.PREFIX_IO + buf.readUnsignedByte(), buf.readLong());
+ // Read 8 byte data
+ if (codec == CODEC_FM4X00) {
+ int cnt = buf.readUnsignedByte();
+ for (int j = 0; j < cnt; j++) {
+ position.set(Event.PREFIX_IO + buf.readUnsignedByte(), buf.readLong());
+ }
}
+
}
+
positions.add(position);
}
@@ -213,7 +221,7 @@ public class TeltonikaProtocolDecoder extends BaseProtocolDecoder {
if (buf.getUnsignedShort(0) > 0) {
parseIdentification(channel, remoteAddress, buf);
} else {
- return parseLocation(channel, buf);
+ return parseData(channel, buf);
}
return null;
diff --git a/test/org/traccar/protocol/TeltonikaProtocolDecoderTest.java b/test/org/traccar/protocol/TeltonikaProtocolDecoderTest.java
index afedf7489..7da61ffc2 100644
--- a/test/org/traccar/protocol/TeltonikaProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/TeltonikaProtocolDecoderTest.java
@@ -14,6 +14,9 @@ public class TeltonikaProtocolDecoderTest extends ProtocolTest {
"000F313233343536373839303132333435"));
verifyPositions(decoder, false, binary(
+ "00000000000000710c0106000000694154244d5347534e443d342c225354474234302c50522c3335363630313036303236353035302c313630343232313531372c313630343232313531382c432c2b3032332e332c302c2b3032332e312c302c4445414354492c302c4445414354492c302c312c30220d0a010000d8db"));
+
+ verifyPositions(decoder, false, binary(
"0000000000000055070450aa14320201f00150aa17f3031f42332a4c4193d68c008d00020901f00150aa1b6a031f423383f54193624f009d00000a01f00150aa1c230fc01a0000552b040164f400dd00f0010143100c0105000000050400006846"));
verifyPositions(decoder, binary(
@@ -36,13 +39,10 @@ public class TeltonikaProtocolDecoderTest extends ProtocolTest {
verifyPositions(decoder, binary(
"000000000000002b080100000140d4e3ec6e000cc661d01674a5e0fffc00000900000004020100f0000242322318000000000100007a04"));
-
- verifyNothing(decoder, binary(
+
+ verifyPositions(decoder, false, binary(
"000000000000002d0c01060000002523464d323d3236323033323736313732313339362c32363230332c30372e30322e30350d0a0100009a2e"));
-
- verifyNothing(decoder, binary(
- "000000000000000a0c0206000000020d0a0200006f4e"));
-
+
verifyPositions(decoder, binary(
"00000000000000a608010000013f14a1d1ce000f0eb790209a778000ab010c0500000000000000000100003390"));