diff options
Diffstat (limited to 'src/main/java/org/traccar/protocol/BceProtocolDecoder.java')
| -rw-r--r-- | src/main/java/org/traccar/protocol/BceProtocolDecoder.java | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/src/main/java/org/traccar/protocol/BceProtocolDecoder.java b/src/main/java/org/traccar/protocol/BceProtocolDecoder.java index 535827f3c..a26b8e8e6 100644 --- a/src/main/java/org/traccar/protocol/BceProtocolDecoder.java +++ b/src/main/java/org/traccar/protocol/BceProtocolDecoder.java @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2021 Anton Tananaev (anton@traccar.org) + * Copyright 2015 - 2020 Anton Tananaev (anton@traccar.org) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -90,13 +90,11 @@ public class BceProtocolDecoder extends BaseProtocolDecoder { } if (BitUtil.check(mask, 14)) { - int mcc = buf.readUnsignedShortLE(); - int mnc = buf.readUnsignedByte(); - int lac = buf.readUnsignedShortLE(); - int cid = buf.readUnsignedShortLE(); - buf.readUnsignedByte(); // time advance - int rssi = -buf.readUnsignedByte(); - position.setNetwork(new Network(CellTower.from(mcc, mnc, lac, cid, rssi))); + position.setNetwork(new Network(CellTower.from( + buf.readUnsignedShortLE(), buf.readUnsignedByte(), + buf.readUnsignedShortLE(), buf.readUnsignedShortLE(), + buf.readUnsignedByte()))); + buf.readUnsignedByte(); } } @@ -179,16 +177,10 @@ public class BceProtocolDecoder extends BaseProtocolDecoder { buf.readUnsignedShortLE(); // dallas humidity } if (BitUtil.check(mask, 9)) { - position.set("fuel1", buf.readUnsignedShortLE()); - position.set("fuelTemp1", (int) buf.readByte()); - position.set("fuel2", buf.readUnsignedShortLE()); - position.set("fuelTemp2", (int) buf.readByte()); + buf.skipBytes(6); // lls group 1 } if (BitUtil.check(mask, 10)) { - position.set("fuel3", buf.readUnsignedShortLE()); - position.set("fuelTemp3", (int) buf.readByte()); - position.set("fuel4", buf.readUnsignedShortLE()); - position.set("fuelTemp4", (int) buf.readByte()); + buf.skipBytes(6); // lls group 2 } if (BitUtil.check(mask, 11)) { buf.skipBytes(21); // j1979 group 1 |