diff options
| author | jon-stumpf <jon.stumpf@gmail.com> | 2017-02-25 20:58:03 -0500 |
|---|---|---|
| committer | jon-stumpf <jon.stumpf@gmail.com> | 2017-03-04 15:59:06 -0500 |
| commit | 2df0487ffaac8afe4f338bcf2f04dd4dfaa86c4b (patch) | |
| tree | 819bad403beeb298d0f4a052f7e08e05b130c356 | |
| parent | 96ad8262428107025ff3f5cde165cc53117acca4 (diff) | |
| download | trackermap-server-2df0487ffaac8afe4f338bcf2f04dd4dfaa86c4b.tar.gz trackermap-server-2df0487ffaac8afe4f338bcf2f04dd4dfaa86c4b.tar.bz2 trackermap-server-2df0487ffaac8afe4f338bcf2f04dd4dfaa86c4b.zip | |
Updated protocols that used hardcoded strings where there are predefined KEYS;
| -rw-r--r-- | src/org/traccar/protocol/AplicomProtocolDecoder.java | 4 | ||||
| -rw-r--r-- | src/org/traccar/protocol/Mta6ProtocolDecoder.java | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/org/traccar/protocol/AplicomProtocolDecoder.java b/src/org/traccar/protocol/AplicomProtocolDecoder.java index 33e882cee..f6b97435b 100644 --- a/src/org/traccar/protocol/AplicomProtocolDecoder.java +++ b/src/org/traccar/protocol/AplicomProtocolDecoder.java @@ -463,8 +463,8 @@ public class AplicomProtocolDecoder extends BaseProtocolDecoder { position.set("brakeLining", buf.readUnsignedByte() * 0.4); position.set("brakeTemperature", buf.readUnsignedByte() * 10); } else if (type == 0x06) { - position.set("totalDistance", buf.readUnsignedInt() * 5); - position.set("tripDistance", buf.readUnsignedInt() * 5); + position.set(Position.KEY_ODOMETER, buf.readUnsignedInt() * 5); + position.set(Position.KEY_TRIP_ODOMETER, buf.readUnsignedInt() * 5); position.set("serviceDistance", (buf.readUnsignedInt() - 2105540607) * 5); } else if (type == 0x0A) { ChannelBuffer brakeData = buf.readBytes(length); diff --git a/src/org/traccar/protocol/Mta6ProtocolDecoder.java b/src/org/traccar/protocol/Mta6ProtocolDecoder.java index f8a316931..63266b193 100644 --- a/src/org/traccar/protocol/Mta6ProtocolDecoder.java +++ b/src/org/traccar/protocol/Mta6ProtocolDecoder.java @@ -233,7 +233,7 @@ public class Mta6ProtocolDecoder extends BaseProtocolDecoder { if (BitUtil.check(flags, 1)) { position.set(Position.KEY_FUEL_CONSUMPTION, new FloatReader().readFloat(buf)); - position.set("hours", new FloatReader().readFloat(buf)); + position.set(Position.KEY_HOURS, new FloatReader().readFloat(buf)); position.set("tank", buf.readUnsignedByte() * 0.4); } |