aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/org/traccar
diff options
context:
space:
mode:
authorAnton Tananaev <anton@traccar.org>2022-07-31 10:13:28 -0700
committerAnton Tananaev <anton@traccar.org>2022-07-31 10:13:28 -0700
commit91584d16eb8585d302d52b76058b7cc5c6b74d4f (patch)
treef332e29e6cc960870763f7a7b311bbbf77aabacf /src/main/java/org/traccar
parentf4c0264df170719d645f0cc57b609f1a2d786249 (diff)
downloadtrackermap-server-91584d16eb8585d302d52b76058b7cc5c6b74d4f.tar.gz
trackermap-server-91584d16eb8585d302d52b76058b7cc5c6b74d4f.tar.bz2
trackermap-server-91584d16eb8585d302d52b76058b7cc5c6b74d4f.zip
Minor Teltonika refactoring
Diffstat (limited to 'src/main/java/org/traccar')
-rw-r--r--src/main/java/org/traccar/protocol/TeltonikaProtocolDecoder.java10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/main/java/org/traccar/protocol/TeltonikaProtocolDecoder.java b/src/main/java/org/traccar/protocol/TeltonikaProtocolDecoder.java
index 77047fe26..a7c46402f 100644
--- a/src/main/java/org/traccar/protocol/TeltonikaProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/TeltonikaProtocolDecoder.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2013 - 2021 Anton Tananaev (anton@traccar.org)
+ * Copyright 2013 - 2022 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.
@@ -197,13 +197,13 @@ public class TeltonikaProtocolDecoder extends BaseProtocolDecoder {
}
}
- private void decodeOtherParameter(Position position, int id, ByteBuf buf, int length) {
+ private void decodeUniversalParameter(Position position, int id, ByteBuf buf, int length) {
switch (id) {
case 1:
case 2:
case 3:
case 4:
- position.set("di" + id, readValue(buf, length, false));
+ position.set(Position.PREFIX_IN + id, readValue(buf, length, false));
break;
case 9:
position.set(Position.PREFIX_ADC + 1, readValue(buf, length, false));
@@ -355,7 +355,7 @@ public class TeltonikaProtocolDecoder extends BaseProtocolDecoder {
if (codec == CODEC_GH3000) {
decodeGh3000Parameter(position, id, buf, length);
} else {
- decodeOtherParameter(position, id, buf, length);
+ decodeUniversalParameter(position, id, buf, length);
}
}
@@ -508,7 +508,7 @@ public class TeltonikaProtocolDecoder extends BaseProtocolDecoder {
if (codec == CODEC_8 || codec == CODEC_8_EXT || codec == CODEC_16) {
int cnt = readExtByte(buf, codec, CODEC_8_EXT);
for (int j = 0; j < cnt; j++) {
- decodeOtherParameter(position, readExtByte(buf, codec, CODEC_8_EXT, CODEC_16), buf, 8);
+ decodeParameter(position, readExtByte(buf, codec, CODEC_8_EXT, CODEC_16), buf, 8, codec);
}
}