diff options
| author | jon-stumpf <jon.stumpf@gmail.com> | 2017-02-25 22:05:15 -0500 |
|---|---|---|
| committer | jon-stumpf <jon.stumpf@gmail.com> | 2017-03-04 16:27:02 -0500 |
| commit | 64b173bbd5d8eb001bcf70ad3a5b469d57e7bba7 (patch) | |
| tree | 5699b911c19dff12b8a1b87a4d15ca824e50e572 /src/org/traccar | |
| parent | 78139d12edc233faed0867b653bd0d2af5b49806 (diff) | |
| download | traccar-server-64b173bbd5d8eb001bcf70ad3a5b469d57e7bba7.tar.gz traccar-server-64b173bbd5d8eb001bcf70ad3a5b469d57e7bba7.tar.bz2 traccar-server-64b173bbd5d8eb001bcf70ad3a5b469d57e7bba7.zip | |
Recorded additional information in NavigilProtocol;
Diffstat (limited to 'src/org/traccar')
| -rw-r--r-- | src/org/traccar/protocol/NavigilProtocolDecoder.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/org/traccar/protocol/NavigilProtocolDecoder.java b/src/org/traccar/protocol/NavigilProtocolDecoder.java index 1aecdee55..e0db3d92b 100644 --- a/src/org/traccar/protocol/NavigilProtocolDecoder.java +++ b/src/org/traccar/protocol/NavigilProtocolDecoder.java @@ -102,8 +102,8 @@ public class NavigilProtocolDecoder extends BaseProtocolDecoder { position.setSpeed(buf.readUnsignedShort() * 0.194384); position.setCourse(buf.readUnsignedShort()); - position.set(Position.KEY_ODOMETER, buf.readUnsignedInt()); // distance - buf.readUnsignedInt(); // delta distance + position.set(Position.KEY_ODOMETER, buf.readUnsignedInt()); // distance in meters + position.set(Position.KEY_DISTANCE, buf.readUnsignedInt()); // delta distance in meters position.set(Position.KEY_BATTERY, buf.readUnsignedShort() * 0.001); @@ -140,8 +140,8 @@ public class NavigilProtocolDecoder extends BaseProtocolDecoder { position.setCourse(buf.readUnsignedShort()); position.set(Position.KEY_ODOMETER, buf.readUnsignedInt()); // distance - buf.readUnsignedShort(); // maximum speed - buf.readUnsignedShort(); // minimum speed + position.set("maximumSpeed", buf.readUnsignedShort()); // maximum speed + position.set("minimumSpeed", buf.readUnsignedShort()); // minimum speed position.set(Position.PREFIX_IO + 1, buf.readUnsignedShort()); // VSAUT1 voltage position.set(Position.PREFIX_IO + 2, buf.readUnsignedShort()); // VSAUT2 voltage @@ -228,8 +228,8 @@ public class NavigilProtocolDecoder extends BaseProtocolDecoder { position.setSpeed(buf.readUnsignedShort() * 0.194384); position.setCourse(buf.readUnsignedShort() * 0.1); - buf.readUnsignedByte(); // maximum speed - buf.readUnsignedByte(); // minimum speed + position.set("maximumSpeed", buf.readUnsignedByte()); // maximum speed + position.set("minimumSpeed", buf.readUnsignedByte()); // minimum speed position.set(Position.KEY_ODOMETER, buf.readUnsignedInt()); // distance position.set(Position.PREFIX_IO + 1, buf.readUnsignedByte()); // supply voltage 1 |