aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2017-06-13 04:43:11 +1200
committerAnton Tananaev <anton.tananaev@gmail.com>2017-06-13 04:43:11 +1200
commit1df59fb0916ec36604a7771a40f887caebd0e228 (patch)
tree3460c7498dc18339a32909cce74f884dfeb883f6 /src/org/traccar
parent2c82232375a16c1b3f5a62e2e5561d37a482dff9 (diff)
downloadtrackermap-server-1df59fb0916ec36604a7771a40f887caebd0e228.tar.gz
trackermap-server-1df59fb0916ec36604a7771a40f887caebd0e228.tar.bz2
trackermap-server-1df59fb0916ec36604a7771a40f887caebd0e228.zip
Fix GPS103 OBD message decoding
Diffstat (limited to 'src/org/traccar')
-rw-r--r--src/org/traccar/protocol/Gps103ProtocolDecoder.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/org/traccar/protocol/Gps103ProtocolDecoder.java b/src/org/traccar/protocol/Gps103ProtocolDecoder.java
index b0113e0be..2b546bb26 100644
--- a/src/org/traccar/protocol/Gps103ProtocolDecoder.java
+++ b/src/org/traccar/protocol/Gps103ProtocolDecoder.java
@@ -90,10 +90,10 @@ public class Gps103ProtocolDecoder extends BaseProtocolDecoder {
.number("(d+),") // odometer
.number("(d+.d+)?,") // fuel instant
.number("(d+.d+)?,") // fuel average
- .number("(d+),") // hours
+ .number("(d+)?,") // hours
.number("(d+),") // speed
.number("d+.?d*%,") // power load
- .number("(d+),") // temperature
+ .number("(?:([-+]?d+)|[-+]?),") // temperature
.number("(d+.?d*%),") // throttle
.number("(d+),") // rpm
.number("(d+.d+),") // battery
@@ -209,9 +209,9 @@ public class Gps103ProtocolDecoder extends BaseProtocolDecoder {
position.set(Position.KEY_ODOMETER, parser.nextInt(0));
parser.nextDouble(0); // instant fuel consumption
position.set(Position.KEY_FUEL_CONSUMPTION, parser.nextDouble(0));
- position.set(Position.KEY_HOURS, parser.nextInt(0));
+ position.set(Position.KEY_HOURS, parser.nextInt());
position.set(Position.KEY_OBD_SPEED, parser.nextInt(0));
- position.set(Position.PREFIX_TEMP + 1, parser.nextInt(0));
+ position.set(Position.PREFIX_TEMP + 1, parser.nextInt());
position.set(Position.KEY_THROTTLE, parser.next());
position.set(Position.KEY_RPM, parser.nextInt(0));
position.set(Position.KEY_BATTERY, parser.nextDouble(0));