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/Gps103ProtocolDecoder.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/org/traccar/protocol/Gps103ProtocolDecoder.java') diff --git a/src/org/traccar/protocol/Gps103ProtocolDecoder.java b/src/org/traccar/protocol/Gps103ProtocolDecoder.java index b153984cb..db28bae51 100644 --- a/src/org/traccar/protocol/Gps103ProtocolDecoder.java +++ b/src/org/traccar/protocol/Gps103ProtocolDecoder.java @@ -87,7 +87,7 @@ public class Gps103ProtocolDecoder extends BaseProtocolDecoder { .number("(dd)(dd)(dd),") // time .number("(d+),") // odometer .number("(d+.d+)?,") // fuel instant - .number("(?:d+.d+)?,") // fuel average + .number("(d+.d+)?,") // fuel average .number("(d+),") // hours .number("(d+),") // speed .number("d+.?d*%,") // power load @@ -189,7 +189,8 @@ public class Gps103ProtocolDecoder extends BaseProtocolDecoder { getLastLocation(position, dateBuilder.getDate()); position.set(Position.KEY_ODOMETER, parser.nextInt()); - position.set(Position.KEY_FUEL, parser.next()); + position.set(Position.KEY_FUEL_INSTANT_CONSUMPTION, parser.next()); + position.set(Position.KEY_FUEL_CONSUMPTION, parser.next()); position.set(Position.KEY_HOURS, parser.next()); position.set(Position.KEY_OBD_SPEED, parser.next()); position.set(Position.PREFIX_TEMP + 1, parser.next()); -- cgit v1.2.3