diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2017-04-17 15:52:01 +1200 |
|---|---|---|
| committer | Anton Tananaev <anton.tananaev@gmail.com> | 2017-04-17 15:52:01 +1200 |
| commit | f5868e7cd0e40706c19c5a5f28490b8968a50b88 (patch) | |
| tree | f8c479e716aa156086b5c786160c563c7f1d8115 /src/org/traccar/protocol/IntellitracProtocolDecoder.java | |
| parent | 73ecddc51d9c998e08ffa85d54a8e6da90567f36 (diff) | |
| download | trackermap-server-f5868e7cd0e40706c19c5a5f28490b8968a50b88.tar.gz trackermap-server-f5868e7cd0e40706c19c5a5f28490b8968a50b88.tar.bz2 trackermap-server-f5868e7cd0e40706c19c5a5f28490b8968a50b88.zip | |
Normalize RPM values
Diffstat (limited to 'src/org/traccar/protocol/IntellitracProtocolDecoder.java')
| -rw-r--r-- | src/org/traccar/protocol/IntellitracProtocolDecoder.java | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/org/traccar/protocol/IntellitracProtocolDecoder.java b/src/org/traccar/protocol/IntellitracProtocolDecoder.java index 0f69101aa..f43fa4aac 100644 --- a/src/org/traccar/protocol/IntellitracProtocolDecoder.java +++ b/src/org/traccar/protocol/IntellitracProtocolDecoder.java @@ -94,23 +94,23 @@ public class IntellitracProtocolDecoder extends BaseProtocolDecoder { position.set(Position.KEY_SATELLITES, satellites); position.set(Position.KEY_INDEX, parser.nextLong()); - position.set(Position.KEY_INPUT, parser.next()); - position.set(Position.KEY_OUTPUT, parser.next()); + position.set(Position.KEY_INPUT, parser.nextInt()); + position.set(Position.KEY_OUTPUT, parser.nextInt()); - position.set(Position.PREFIX_ADC + 1, parser.next()); - position.set(Position.PREFIX_ADC + 2, parser.next()); + position.set(Position.PREFIX_ADC + 1, parser.nextDouble()); + position.set(Position.PREFIX_ADC + 2, parser.nextDouble()); // J1939 data - position.set(Position.KEY_OBD_SPEED, parser.next()); - position.set(Position.KEY_RPM, parser.next()); - position.set("coolant", parser.next()); - position.set(Position.KEY_FUEL_LEVEL, parser.next()); - position.set(Position.KEY_FUEL_CONSUMPTION, parser.next()); - position.set(Position.PREFIX_TEMP + 1, parser.next()); - position.set(Position.KEY_CHARGE, parser.next()); - position.set("tpl", parser.next()); - position.set("axle", parser.next()); - position.set(Position.KEY_OBD_ODOMETER, parser.next()); + position.set(Position.KEY_OBD_SPEED, parser.nextInt()); + position.set(Position.KEY_RPM, parser.nextInt()); + position.set("coolant", parser.nextInt()); + position.set(Position.KEY_FUEL_LEVEL, parser.nextInt()); + position.set(Position.KEY_FUEL_CONSUMPTION, parser.nextInt()); + position.set(Position.PREFIX_TEMP + 1, parser.nextInt()); + position.set(Position.KEY_CHARGE, parser.nextInt()); + position.set("tpl", parser.nextInt()); + position.set("axle", parser.nextInt()); + position.set(Position.KEY_OBD_ODOMETER, parser.nextInt()); return position; } |