aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2023-09-30 05:17:32 +0900
committerGitHub <noreply@github.com>2023-09-30 05:17:32 +0900
commitfae601aa36d83828cba16e3405ada179ce7d1e57 (patch)
treef5707d6b87b5fb27965836b41a538e267c79fbb8
parent190f74fedf00303abdbc7228b5bb389533da3f5a (diff)
parentdb169dab28ac661adc3eb10e3f395c5b2296d9cc (diff)
downloadtrackermap-server-fae601aa36d83828cba16e3405ada179ce7d1e57.tar.gz
trackermap-server-fae601aa36d83828cba16e3405ada179ce7d1e57.tar.bz2
trackermap-server-fae601aa36d83828cba16e3405ada179ce7d1e57.zip
Merge pull request #5187 from yuriy-piskarev/master
fix PR #4839:
Diffstat
-rw-r--r--src/main/java/org/traccar/protocol/NavtelecomProtocolDecoder.java54
1 files changed, 27 insertions, 27 deletions
diff --git a/src/main/java/org/traccar/protocol/NavtelecomProtocolDecoder.java b/src/main/java/org/traccar/protocol/NavtelecomProtocolDecoder.java
index 2e857b212..ffcaa0c6c 100644
--- a/src/main/java/org/traccar/protocol/NavtelecomProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/NavtelecomProtocolDecoder.java
@@ -193,12 +193,12 @@ public class NavtelecomProtocolDecoder extends BaseProtocolDecoder {
Position position = new Position(getProtocolName());
position.setDeviceId(deviceSession.getDeviceId());
- for (int j = 0; j < bits.length(); j++) {
- if (bits.get(j)) {
+ for (int j = 1; j <= bits.length(); j++) {
+ if (bits.get(j - 1)) {
int value;
- switch (j + 1) {
+ switch (j) {
case 1:
position.set(Position.KEY_INDEX, buf.readUnsignedIntLE());
break;
@@ -216,7 +216,6 @@ public class NavtelecomProtocolDecoder extends BaseProtocolDecoder {
int guardMode = BitUtil.between(value, 3, 4);
position.set(Position.KEY_ARMED, (0 < guardMode) && (guardMode < 3));
break;
-
case 5:
value = buf.readUnsignedByte();
position.set(Position.KEY_ROAMING, BitUtil.check(value, 6) ? true : null);
@@ -245,7 +244,7 @@ public class NavtelecomProtocolDecoder extends BaseProtocolDecoder {
position.setCourse(buf.readUnsignedShortLE());
break;
case 15:
- position.set(Position.KEY_ODOMETER, buf.readFloatLE());
+ position.set(Position.KEY_ODOMETER, buf.readFloatLE() * 1000);
break;
case 19:
position.set(Position.KEY_POWER, buf.readShortLE() * 0.001);
@@ -259,7 +258,7 @@ public class NavtelecomProtocolDecoder extends BaseProtocolDecoder {
case 24:
case 25:
case 26:
- position.set(Position.PREFIX_ADC + (j + 2 - 21), buf.readUnsignedShortLE() * 0.001);
+ position.set(Position.PREFIX_ADC + (j + 1 - 21), buf.readUnsignedShortLE() * 0.001);
break;
case 29:
value = buf.readUnsignedByte();
@@ -275,11 +274,11 @@ public class NavtelecomProtocolDecoder extends BaseProtocolDecoder {
break;
case 33:
case 34:
- position.set(Position.PREFIX_COUNT + (j + 2 - 33), buf.readUnsignedIntLE());
+ position.set(Position.PREFIX_COUNT + (j + 1 - 33), buf.readUnsignedIntLE());
break;
case 35:
case 36:
- position.set("freq" + (j + 2 - 35), buf.readUnsignedShortLE());
+ position.set("freq" + (j + 1 - 35), buf.readUnsignedShortLE());
break;
case 37:
position.set(Position.KEY_HOURS, buf.readUnsignedIntLE() * 1000);
@@ -292,7 +291,7 @@ public class NavtelecomProtocolDecoder extends BaseProtocolDecoder {
case 43:
value = buf.readUnsignedShortLE();
position.set(
- Position.KEY_FUEL_LEVEL + (j + 2 - 38), (value < 65500) ? value : null);
+ Position.KEY_FUEL_LEVEL + (j + 1 - 38), (value < 65500) ? value : null);
break;
case 44:
value = buf.readUnsignedShortLE();
@@ -308,20 +307,21 @@ public class NavtelecomProtocolDecoder extends BaseProtocolDecoder {
case 52:
value = buf.readByte();
position.set(
- Position.PREFIX_TEMP + (j + 2 - 45), (value != (byte) 0x80) ? value : null);
+ Position.PREFIX_TEMP + (j + 1 - 45), (value != (byte) 0x80) ? value : null);
break;
case 53:
value = buf.readUnsignedShortLE();
if (value != 0x7FFF) {
- if (BitUtil.check(value, 7)) {
- position.set("obdFuelLevel", BitUtil.to(value, 6));
+ if (BitUtil.check(value, 15)) {
+ position.set("obdFuelLevel", BitUtil.to(value, 14));
} else {
- position.set("obdFuel", BitUtil.to(value, 6) / 10);
+ position.set("obdFuel", BitUtil.to(value, 14) * 0.1);
}
}
break;
case 54:
- position.set(Position.KEY_FUEL_USED, buf.readFloatLE());
+ double fuelUsed = buf.readFloatLE() * 0.5;
+ position.set(Position.KEY_FUEL_USED, (fuelUsed >= 0) ? fuelUsed : null);
break;
case 55:
value = buf.readUnsignedShortLE();
@@ -332,7 +332,7 @@ public class NavtelecomProtocolDecoder extends BaseProtocolDecoder {
position.set(Position.KEY_COOLANT_TEMP, (value != (byte) 0x80) ? value : null);
break;
case 57:
- position.set(Position.KEY_OBD_ODOMETER, buf.readFloatLE());
+ position.set(Position.KEY_OBD_ODOMETER, buf.readFloatLE() * 1000);
break;
case 58:
case 59:
@@ -340,7 +340,7 @@ public class NavtelecomProtocolDecoder extends BaseProtocolDecoder {
case 61:
case 62:
value = buf.readUnsignedShortLE();
- position.set("axleWeight" + (j + 2 - 58), (value != 0xFFFF) ? value : null);
+ position.set("axleWeight" + (j + 1 - 58), (value != 0xFFFF) ? value : null);
break;
case 63:
value = buf.readUnsignedByte();
@@ -357,10 +357,10 @@ public class NavtelecomProtocolDecoder extends BaseProtocolDecoder {
case 66:
value = buf.readUnsignedShortLE();
if (value != 0x7FFF) {
- if (BitUtil.check(value, 7)) {
- position.set("obdAdBlueLevel", BitUtil.to(value, 6));
+ if (BitUtil.check(value, 15)) {
+ position.set("obdAdBlueLevel", BitUtil.to(value, 14));
} else {
- position.set("obdAdBlue", BitUtil.to(value, 6) / 10);
+ position.set("obdAdBlue", BitUtil.to(value, 14) * 0.1);
}
}
break;
@@ -385,7 +385,7 @@ public class NavtelecomProtocolDecoder extends BaseProtocolDecoder {
case 81:
case 82:
case 83:
- position.set("fuelTemp" + (j + 2 - 78), (int) buf.readByte());
+ position.set("fuelTemp" + (j + 1 - 78), (int) buf.readByte());
break;
case 163:
case 164:
@@ -393,7 +393,7 @@ public class NavtelecomProtocolDecoder extends BaseProtocolDecoder {
case 166:
value = buf.readShortLE();
position.set(
- Position.PREFIX_TEMP + (j + 2 + 8 - 163),
+ Position.PREFIX_TEMP + (j + 1 + 8 - 163),
(value != (short) 0x8000) ? value * 0.05 : null);
break;
case 167:
@@ -401,22 +401,22 @@ public class NavtelecomProtocolDecoder extends BaseProtocolDecoder {
case 169:
case 170:
value = buf.readUnsignedByte();
- position.set("humidity" + (j + 2 - 167), (value != 0xFF) ? value * 0.5 : null);
+ position.set("humidity" + (j + 1 - 167), (value != 0xFF) ? value * 0.5 : null);
break;
case 206:
position.set("diagnostic", buf.readUnsignedIntLE());
break;
default:
if ((207 <= j) && (j <= 222)) {
- position.set("user1Byte" + (j + 2 - 207), buf.readUnsignedByte());
+ position.set("user1Byte" + (j + 1 - 207), buf.readUnsignedByte());
} else if ((223 <= j) && (j <= 237)) {
- position.set("user2Byte" + (j + 2 - 223), buf.readUnsignedShortLE());
+ position.set("user2Byte" + (j + 1 - 223), buf.readUnsignedShortLE());
} else if ((238 <= j) && (j <= 252)) {
- position.set("user4Byte" + (j + 2 - 238), buf.readUnsignedIntLE());
+ position.set("user4Byte" + (j + 1 - 238), buf.readUnsignedIntLE());
} else if ((253 <= j) && (j <= 255)) {
- position.set("user8Byte" + (j + 2 - 253), buf.readLongLE());
+ position.set("user8Byte" + (j + 1 - 253), buf.readLongLE());
} else {
- buf.skipBytes(getItemLength(j + 1));
+ buf.skipBytes(getItemLength(j));
}
break;
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-19 04:27:06 +0000