diff options
| author | Evgeny S Maksimov <me@vragam.net> | 2019-01-13 12:00:04 +0300 |
|---|---|---|
| committer | Evgeny S Maksimov <me@vragam.net> | 2019-01-13 12:00:04 +0300 |
| commit | 582812218089fa5aa34675af6d97e0c15e0f6c07 (patch) | |
| tree | fca12acdd41bb5929d4abdc605ec201ecfbc3b59 | |
| parent | 74da80f82085e5c1517a5b05604091814a9c6511 (diff) | |
| download | traccar-server-582812218089fa5aa34675af6d97e0c15e0f6c07.tar.gz traccar-server-582812218089fa5aa34675af6d97e0c15e0f6c07.tar.bz2 traccar-server-582812218089fa5aa34675af6d97e0c15e0f6c07.zip | |
Fixed output field for F4 format
| -rw-r--r-- | src/org/traccar/protocol/NavisProtocolDecoder.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/org/traccar/protocol/NavisProtocolDecoder.java b/src/org/traccar/protocol/NavisProtocolDecoder.java index 6476d3dfb..83088e9f0 100644 --- a/src/org/traccar/protocol/NavisProtocolDecoder.java +++ b/src/org/traccar/protocol/NavisProtocolDecoder.java @@ -113,14 +113,13 @@ public class NavisProtocolDecoder extends BaseProtocolDecoder { position.set(Position.KEY_STATUS, buf.readUnsignedByte()); position.set(Position.KEY_RSSI, buf.readUnsignedByte()); - // NOTE: Needs testing if (isFormat(format, F10, F20, F30)) { position.set(Position.KEY_OUTPUT, buf.readUnsignedShortLE()); - } else if (isFormat(format, F40, F50, F51, F52)) { + } else if (isFormat(format, F50, F51, F52)) { int extField = buf.readUnsignedByte(); position.set(Position.KEY_OUTPUT, extField & 0x3); position.set(Position.KEY_SATELLITES, extField >> 2); - } else if (isFormat(format, F60)) { + } else if (isFormat(format, F40, F60)) { position.set(Position.KEY_OUTPUT, buf.readUnsignedByte() & 0xF); } |