diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2016-08-18 12:01:58 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-18 12:01:58 +0300 |
| commit | 3826a93f1009942e22ec80c1e13be71e8e917b01 (patch) | |
| tree | a92de4071af67c80253b429de2bd0c905c304aea /src/org/traccar/protocol/Gps103ProtocolDecoder.java | |
| parent | bfacd794c443f0f54a27d5d52b33de4628a36009 (diff) | |
| parent | 82dc8263796169899fe154671781edb2e46cac9a (diff) | |
| download | trackermap-server-3826a93f1009942e22ec80c1e13be71e8e917b01.tar.gz trackermap-server-3826a93f1009942e22ec80c1e13be71e8e917b01.tar.bz2 trackermap-server-3826a93f1009942e22ec80c1e13be71e8e917b01.zip | |
Merge pull request #2223 from Abyss777/fuel
Some fuel attributes organization
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..af7efa959 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()); + parser.next(); // instant fuel consumption + 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()); |