aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/protocol/FoxProtocolDecoder.java
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2017-04-17 16:32:02 +1200
committerAnton Tananaev <anton.tananaev@gmail.com>2017-04-17 16:32:02 +1200
commit1c756c57653b72a656407da9c53ac292c5551cdb (patch)
tree69e88e24aae184508ab51932ef2692ae9515eef2 /src/org/traccar/protocol/FoxProtocolDecoder.java
parent4ab007201bd177a2fbf46a90b7b73262c5792caf (diff)
downloadtrackermap-server-1c756c57653b72a656407da9c53ac292c5551cdb.tar.gz
trackermap-server-1c756c57653b72a656407da9c53ac292c5551cdb.tar.bz2
trackermap-server-1c756c57653b72a656407da9c53ac292c5551cdb.zip
Allow optional primitives
Diffstat (limited to 'src/org/traccar/protocol/FoxProtocolDecoder.java')
-rw-r--r--src/org/traccar/protocol/FoxProtocolDecoder.java26
1 files changed, 13 insertions, 13 deletions
diff --git a/src/org/traccar/protocol/FoxProtocolDecoder.java b/src/org/traccar/protocol/FoxProtocolDecoder.java
index 83bebd7c0..9b2cf0e1d 100644
--- a/src/org/traccar/protocol/FoxProtocolDecoder.java
+++ b/src/org/traccar/protocol/FoxProtocolDecoder.java
@@ -92,25 +92,25 @@ public class FoxProtocolDecoder extends BaseProtocolDecoder {
position.setProtocol(getProtocolName());
position.setDeviceId(deviceSession.getDeviceId());
- position.set(Position.KEY_STATUS, parser.nextInt());
+ position.set(Position.KEY_STATUS, parser.nextInt(0));
position.setValid(parser.next().equals("A"));
position.setTime(parser.nextDateTime(Parser.DateTimeFormat.DMY_HMS));
position.setLatitude(parser.nextCoordinate());
position.setLongitude(parser.nextCoordinate());
- position.setSpeed(UnitsConverter.knotsFromKph(parser.nextDouble()));
- position.setCourse(parser.nextDouble());
-
- position.set(Position.KEY_INPUT, parser.nextInt(2));
- position.set(Position.KEY_POWER, parser.nextDouble() * 0.1);
- position.set(Position.PREFIX_TEMP + 1, parser.nextInt());
- position.set(Position.KEY_RPM, parser.nextInt());
- position.set(Position.KEY_FUEL_LEVEL, parser.nextInt());
- position.set(Position.PREFIX_ADC + 1, parser.nextInt());
- position.set(Position.PREFIX_ADC + 2, parser.nextInt());
- position.set(Position.KEY_OUTPUT, parser.nextInt(2));
- position.set(Position.KEY_ODOMETER, parser.nextInt());
+ position.setSpeed(UnitsConverter.knotsFromKph(parser.nextDouble(0)));
+ position.setCourse(parser.nextDouble(0));
+
+ position.set(Position.KEY_INPUT, parser.nextBinInt(0));
+ position.set(Position.KEY_POWER, parser.nextDouble(0) * 0.1);
+ position.set(Position.PREFIX_TEMP + 1, parser.nextInt(0));
+ position.set(Position.KEY_RPM, parser.nextInt(0));
+ position.set(Position.KEY_FUEL_LEVEL, parser.nextInt(0));
+ position.set(Position.PREFIX_ADC + 1, parser.nextInt(0));
+ position.set(Position.PREFIX_ADC + 2, parser.nextInt(0));
+ position.set(Position.KEY_OUTPUT, parser.nextBinInt(0));
+ position.set(Position.KEY_ODOMETER, parser.nextInt(0));
position.set("statusData", parser.next());