diff options
| author | Abyss777 <abyss@fox5.ru> | 2016-08-16 17:46:59 +0500 |
|---|---|---|
| committer | Abyss777 <abyss@fox5.ru> | 2016-08-17 19:26:34 +0500 |
| commit | 81eaa754481df6390175a8dc01e6378dcd9fc485 (patch) | |
| tree | 9df00ae671d97bb17182ae6694f4c7d2be47a351 /src/org/traccar/protocol/Gps103ProtocolDecoder.java | |
| parent | bfacd794c443f0f54a27d5d52b33de4628a36009 (diff) | |
| download | traccar-server-81eaa754481df6390175a8dc01e6378dcd9fc485.tar.gz traccar-server-81eaa754481df6390175a8dc01e6378dcd9fc485.tar.bz2 traccar-server-81eaa754481df6390175a8dc01e6378dcd9fc485.zip | |
- Used constants for fuel consumption
- Fixed Gps103 fuel
Diffstat (limited to 'src/org/traccar/protocol/Gps103ProtocolDecoder.java')
| -rw-r--r-- | src/org/traccar/protocol/Gps103ProtocolDecoder.java | 5 |
1 files changed, 3 insertions, 2 deletions
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()); |