aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/protocol/XirgoProtocolDecoder.java
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2016-08-18 12:01:58 +0300
committerGitHub <noreply@github.com>2016-08-18 12:01:58 +0300
commit3826a93f1009942e22ec80c1e13be71e8e917b01 (patch)
treea92de4071af67c80253b429de2bd0c905c304aea /src/org/traccar/protocol/XirgoProtocolDecoder.java
parentbfacd794c443f0f54a27d5d52b33de4628a36009 (diff)
parent82dc8263796169899fe154671781edb2e46cac9a (diff)
downloadtraccar-server-3826a93f1009942e22ec80c1e13be71e8e917b01.tar.gz
traccar-server-3826a93f1009942e22ec80c1e13be71e8e917b01.tar.bz2
traccar-server-3826a93f1009942e22ec80c1e13be71e8e917b01.zip
Merge pull request #2223 from Abyss777/fuel
Some fuel attributes organization
Diffstat (limited to 'src/org/traccar/protocol/XirgoProtocolDecoder.java')
-rw-r--r--src/org/traccar/protocol/XirgoProtocolDecoder.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/org/traccar/protocol/XirgoProtocolDecoder.java b/src/org/traccar/protocol/XirgoProtocolDecoder.java
index 5006102e6..df5665992 100644
--- a/src/org/traccar/protocol/XirgoProtocolDecoder.java
+++ b/src/org/traccar/protocol/XirgoProtocolDecoder.java
@@ -75,7 +75,7 @@ public class XirgoProtocolDecoder extends BaseProtocolDecoder {
.number("(d+),") // satellites
.number("(d+.?d*),") // hdop
.number("(d+.?d*),") // odometer
- .number("d+.?d*,") // fuel consumption
+ .number("(d+.?d*),") // fuel consumption
.number("(d+.d+),") // battery
.number("(d+),") // gsm
.number("(d+),") // gps
@@ -134,6 +134,7 @@ public class XirgoProtocolDecoder extends BaseProtocolDecoder {
if (newFormat) {
position.set(Position.KEY_ODOMETER, parser.next());
+ position.set(Position.KEY_FUEL_CONSUMPTION, parser.next());
}
position.set(Position.KEY_BATTERY, parser.next());