aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2020-06-05 23:33:48 -0700
committerAnton Tananaev <anton.tananaev@gmail.com>2020-06-05 23:33:48 -0700
commit473e671a14bb826cdbf73f732fbd8b8eec6f3986 (patch)
treeb118a148c3ac96d2f243a7bc8165d96fb1031266 /src
parent8acd5f768df28622506a292b6efec0198f27967d (diff)
downloadtrackermap-server-473e671a14bb826cdbf73f732fbd8b8eec6f3986.tar.gz
trackermap-server-473e671a14bb826cdbf73f732fbd8b8eec6f3986.tar.bz2
trackermap-server-473e671a14bb826cdbf73f732fbd8b8eec6f3986.zip
Support Teltonika codec 13
Diffstat (limited to 'src')
-rw-r--r--src/main/java/org/traccar/protocol/TeltonikaProtocolDecoder.java9
-rw-r--r--src/test/java/org/traccar/protocol/TeltonikaProtocolDecoderTest.java6
2 files changed, 14 insertions, 1 deletions
diff --git a/src/main/java/org/traccar/protocol/TeltonikaProtocolDecoder.java b/src/main/java/org/traccar/protocol/TeltonikaProtocolDecoder.java
index ab7aa4b43..be7a01ee0 100644
--- a/src/main/java/org/traccar/protocol/TeltonikaProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/TeltonikaProtocolDecoder.java
@@ -78,6 +78,7 @@ public class TeltonikaProtocolDecoder extends BaseProtocolDecoder {
public static final int CODEC_8 = 0x08;
public static final int CODEC_8_EXT = 0x8E;
public static final int CODEC_12 = 0x0C;
+ public static final int CODEC_13 = 0x0D;
public static final int CODEC_16 = 0x10;
private void sendImageRequest(Channel channel, SocketAddress remoteAddress, long id, int offset, int size) {
@@ -598,7 +599,13 @@ public class TeltonikaProtocolDecoder extends BaseProtocolDecoder {
position.setDeviceId(deviceSession.getDeviceId());
position.setValid(true);
- if (codec == CODEC_12) {
+ if (codec == CODEC_13) {
+ buf.readUnsignedByte(); // type
+ int length = buf.readInt() - 4;
+ getLastLocation(position, new Date(buf.readUnsignedInt() * 1000));
+ position.set(Position.KEY_RESULT,
+ buf.readCharSequence(length, StandardCharsets.US_ASCII).toString().trim());
+ } else if (codec == CODEC_12) {
decodeSerial(channel, remoteAddress, position, buf);
} else {
decodeLocation(position, buf, codec);
diff --git a/src/test/java/org/traccar/protocol/TeltonikaProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/TeltonikaProtocolDecoderTest.java
index 827e12a96..5b2df38db 100644
--- a/src/test/java/org/traccar/protocol/TeltonikaProtocolDecoderTest.java
+++ b/src/test/java/org/traccar/protocol/TeltonikaProtocolDecoderTest.java
@@ -16,6 +16,12 @@ public class TeltonikaProtocolDecoderTest extends ProtocolTest {
"000F313233343536373839303132333435"));
verifyPositions(decoder, false, binary(
+ "000000000000001C0D01050000001056E924222347455420444154414F524445520D0A0100004990"));
+
+ verifyPositions(decoder, false, binary(
+ "00000000000000170D01050000000F0000016C0A81C320676574696E666F0100006855"));
+
+ verifyPositions(decoder, false, binary(
"000000000000004f0c01060000004755555555777730362e343b30342e323b30302e303b30302e303b30302e303b30302e303b30302e303b30302e303b30312e333b30302e303b31302e373b30302e303b5353530d0a010000e371"));
verifyPositions(decoder, false, binary(