From f5868e7cd0e40706c19c5a5f28490b8968a50b88 Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Mon, 17 Apr 2017 15:52:01 +1200 Subject: Normalize RPM values --- src/org/traccar/protocol/Gps103ProtocolDecoder.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 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 49f1a2049..890465ab9 100644 --- a/src/org/traccar/protocol/Gps103ProtocolDecoder.java +++ b/src/org/traccar/protocol/Gps103ProtocolDecoder.java @@ -207,14 +207,14 @@ public class Gps103ProtocolDecoder extends BaseProtocolDecoder { getLastLocation(position, parser.nextDateTime()); position.set(Position.KEY_ODOMETER, parser.nextInt()); - 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()); + parser.nextDouble(); // instant fuel consumption + position.set(Position.KEY_FUEL_CONSUMPTION, parser.nextDouble()); + position.set(Position.KEY_HOURS, parser.nextInt()); + position.set(Position.KEY_OBD_SPEED, parser.nextInt()); + position.set(Position.PREFIX_TEMP + 1, parser.nextInt()); position.set(Position.KEY_THROTTLE, parser.next()); - position.set(Position.KEY_RPM, parser.next()); - position.set(Position.KEY_BATTERY, parser.next()); + position.set(Position.KEY_RPM, parser.nextInt()); + position.set(Position.KEY_BATTERY, parser.nextDouble()); position.set(Position.KEY_DTCS, parser.next().replace(',', ' ').trim()); return position; -- cgit v1.2.3