diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2017-03-08 19:14:23 +1300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-08 19:14:23 +1300 |
| commit | e3a3f06cc07bc5d75d3d670e045abb5d6c91fcad (patch) | |
| tree | ee424dc1b6b86abb54abcc5fe4f2068ac0cbf286 /src/org/traccar/protocol/SkypatrolProtocolDecoder.java | |
| parent | b7e53f57689e1f8a1c0705aeea32dc6e69f3fcb3 (diff) | |
| parent | f94613b97cf80af64154ae571920a273771fa1d3 (diff) | |
| download | trackermap-server-e3a3f06cc07bc5d75d3d670e045abb5d6c91fcad.tar.gz trackermap-server-e3a3f06cc07bc5d75d3d670e045abb5d6c91fcad.tar.bz2 trackermap-server-e3a3f06cc07bc5d75d3d670e045abb5d6c91fcad.zip | |
Merge pull request #2979 from jon-stumpf/jss-add-info
Additional Protocol Information
Diffstat (limited to 'src/org/traccar/protocol/SkypatrolProtocolDecoder.java')
| -rw-r--r-- | src/org/traccar/protocol/SkypatrolProtocolDecoder.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/org/traccar/protocol/SkypatrolProtocolDecoder.java b/src/org/traccar/protocol/SkypatrolProtocolDecoder.java index dfe87caf5..f4dded972 100644 --- a/src/org/traccar/protocol/SkypatrolProtocolDecoder.java +++ b/src/org/traccar/protocol/SkypatrolProtocolDecoder.java @@ -92,15 +92,15 @@ public class SkypatrolProtocolDecoder extends BaseProtocolDecoder { position.setDeviceId(deviceSession.getDeviceId()); if (BitUtil.check(mask, 3)) { - buf.readUnsignedShort(); // io data + position.set(Position.PREFIX_IO + 1, buf.readUnsignedShort()); } if (BitUtil.check(mask, 4)) { - buf.readUnsignedShort(); // adc 1 + position.set(Position.PREFIX_ADC + 1, buf.readUnsignedShort()); } if (BitUtil.check(mask, 5)) { - buf.readUnsignedShort(); // adc 2 + position.set(Position.PREFIX_ADC + 2, buf.readUnsignedShort()); } if (BitUtil.check(mask, 7)) { @@ -150,11 +150,11 @@ public class SkypatrolProtocolDecoder extends BaseProtocolDecoder { } if (BitUtil.check(mask, 17)) { - buf.readUnsignedShort(); // battery percentage + position.set(Position.KEY_BATTERY, buf.readUnsignedShort()); } if (BitUtil.check(mask, 20)) { - position.set("trip", buf.readUnsignedInt()); + position.set(Position.KEY_ODOMETER_TRIP, buf.readUnsignedInt()); } if (BitUtil.check(mask, 21)) { @@ -166,7 +166,7 @@ public class SkypatrolProtocolDecoder extends BaseProtocolDecoder { } if (BitUtil.check(mask, 24)) { - position.set(Position.KEY_POWER, buf.readUnsignedShort() / 1000.0); + position.set(Position.KEY_POWER, buf.readUnsignedShort() * 0.001); } if (BitUtil.check(mask, 25)) { |