diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2022-09-18 10:09:02 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-18 10:09:02 -0700 |
| commit | d702c9caf113ca761c57f811b128f8188c9dec0c (patch) | |
| tree | 8891e32d889f68ccbb294585bc0ff89875583567 /src/main/java/org/traccar/protocol/NavtelecomProtocolDecoder.java | |
| parent | d4513fa86539577e24ede46d40748d8d034b025c (diff) | |
| parent | 4de8efe1ef0810af492c161bfc1d3200958d75d8 (diff) | |
| download | trackermap-server-d702c9caf113ca761c57f811b128f8188c9dec0c.tar.gz trackermap-server-d702c9caf113ca761c57f811b128f8188c9dec0c.tar.bz2 trackermap-server-d702c9caf113ca761c57f811b128f8188c9dec0c.zip | |
Merge branch 'master' into ndtpv6-dev
Diffstat (limited to 'src/main/java/org/traccar/protocol/NavtelecomProtocolDecoder.java')
| -rw-r--r-- | src/main/java/org/traccar/protocol/NavtelecomProtocolDecoder.java | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/src/main/java/org/traccar/protocol/NavtelecomProtocolDecoder.java b/src/main/java/org/traccar/protocol/NavtelecomProtocolDecoder.java index 9122eb362..08b1a8d0f 100644 --- a/src/main/java/org/traccar/protocol/NavtelecomProtocolDecoder.java +++ b/src/main/java/org/traccar/protocol/NavtelecomProtocolDecoder.java @@ -1,5 +1,5 @@ /* - * Copyright 2021 Anton Tananaev (anton@traccar.org) + * Copyright 2021 - 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. @@ -196,7 +196,7 @@ public class NavtelecomProtocolDecoder extends BaseProtocolDecoder { for (int j = 0; j < bits.length(); j++) { if (bits.get(j)) { - int value = 0; + int value; switch (j + 1) { case 1: @@ -278,11 +278,11 @@ public class NavtelecomProtocolDecoder extends BaseProtocolDecoder { case 42: case 43: value = buf.readUnsignedShortLE(); - position.set("rs485Fuel" + (j + 2 - 38), (value < 65500) ? value : null); + position.set("fuel" + (j + 2 - 38), (value < 65500) ? value : null); break; case 44: value = buf.readUnsignedShortLE(); - position.set("rs232Fuel", (value < 65500) ? value : null); + position.set(Position.KEY_FUEL_LEVEL, (value < 65500) ? value : null); break; case 45: case 46: @@ -293,7 +293,17 @@ public class NavtelecomProtocolDecoder extends BaseProtocolDecoder { case 51: case 52: value = buf.readByte(); - position.set(Position.PREFIX_TEMP + (j + 2 - 45), (value != 0x80) ? value : null); + position.set( + Position.PREFIX_TEMP + (j + 2 - 45), + (value != (byte) 0x80) ? value : null); + break; + case 78: + case 79: + case 80: + case 81: + case 82: + case 83: + position.set("fuelTemp" + (j + 2 - 78), (int) buf.readByte()); break; default: buf.skipBytes(getItemLength(j + 1)); |