From 81eaa754481df6390175a8dc01e6378dcd9fc485 Mon Sep 17 00:00:00 2001 From: Abyss777 Date: Tue, 16 Aug 2016 17:46:59 +0500 Subject: - Used constants for fuel consumption - Fixed Gps103 fuel --- src/org/traccar/protocol/Mta6ProtocolDecoder.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/org/traccar/protocol/Mta6ProtocolDecoder.java') diff --git a/src/org/traccar/protocol/Mta6ProtocolDecoder.java b/src/org/traccar/protocol/Mta6ProtocolDecoder.java index 609f0b63e..ea1902c89 100644 --- a/src/org/traccar/protocol/Mta6ProtocolDecoder.java +++ b/src/org/traccar/protocol/Mta6ProtocolDecoder.java @@ -231,7 +231,7 @@ public class Mta6ProtocolDecoder extends BaseProtocolDecoder { } if (BitUtil.check(flags, 1)) { - new FloatReader().readFloat(buf); // fuel consumtion + position.set(Position.KEY_FUEL_CONSUMPTION, new FloatReader().readFloat(buf)); position.set("hours", new FloatReader().readFloat(buf)); position.set("tank", buf.readUnsignedByte() * 0.4); } -- cgit v1.2.3 From 311a106c0339199b3398b5f53c72286db92d5fcf Mon Sep 17 00:00:00 2001 From: Abyss777 Date: Wed, 17 Aug 2016 11:33:20 +0500 Subject: Mta6 fixed KEY_FUEL meaning --- src/org/traccar/protocol/Mta6ProtocolDecoder.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/org/traccar/protocol/Mta6ProtocolDecoder.java') diff --git a/src/org/traccar/protocol/Mta6ProtocolDecoder.java b/src/org/traccar/protocol/Mta6ProtocolDecoder.java index ea1902c89..b6aea9092 100644 --- a/src/org/traccar/protocol/Mta6ProtocolDecoder.java +++ b/src/org/traccar/protocol/Mta6ProtocolDecoder.java @@ -159,7 +159,8 @@ public class Mta6ProtocolDecoder extends BaseProtocolDecoder { } if (BitUtil.check(flags, 4)) { - position.set(Position.KEY_FUEL, buf.readUnsignedInt() + "|" + buf.readUnsignedInt()); + position.set(Position.KEY_FUEL_CONSUMPTION + "Accumulator1", buf.readUnsignedInt()); + position.set(Position.KEY_FUEL_CONSUMPTION + "Accumulator2", buf.readUnsignedInt()); position.set("hours1", buf.readUnsignedShort()); position.set("hours2", buf.readUnsignedShort()); } -- cgit v1.2.3