aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/protocol/SkypatrolProtocolDecoder.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/org/traccar/protocol/SkypatrolProtocolDecoder.java')
-rw-r--r--src/org/traccar/protocol/SkypatrolProtocolDecoder.java12
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)) {