Support additional attributes

2 files changed, 87 insertions, 14 deletions

diff --git a/src/main/java/org/traccar/protocol/BceProtocolDecoder.java b/src/main/java/org/traccar/protocol/BceProtocolDecoder.java
index f07338937..30f9bb1f3 100644
--- a/src/main/java/org/traccar/protocol/BceProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/BceProtocolDecoder.java
@@ -29,6 +29,7 @@ import org.traccar.model.Network;
 import org.traccar.model.Position;
 
 import java.net.SocketAddress;
+import java.nio.charset.StandardCharsets;
 import java.util.Date;
 import java.util.LinkedList;
 import java.util.List;
@@ -97,7 +98,7 @@ public class BceProtocolDecoder extends BaseProtocolDecoder {
         }
     }
 
-    private void decodeMask2(ByteBuf buf, int mask) {
+    private void decodeMask2(ByteBuf buf, int mask, Position position) {
 
         if (BitUtil.check(mask, 0)) {
             buf.readUnsignedShortLE(); // wheel speed
@@ -106,31 +107,31 @@ public class BceProtocolDecoder extends BaseProtocolDecoder {
             buf.readUnsignedByte(); // acceleration pedal
         }
         if (BitUtil.check(mask, 2)) {
-            buf.readUnsignedIntLE(); // total fuel used
+            position.set(Position.KEY_FUEL_USED, buf.readUnsignedIntLE());
         }
         if (BitUtil.check(mask, 3)) {
-            buf.readUnsignedByte(); // fuel level
+            position.set(Position.KEY_FUEL_LEVEL, buf.readUnsignedByte());
         }
         if (BitUtil.check(mask, 4)) {
-            buf.readUnsignedShortLE(); // engine speed
+            position.set(Position.KEY_RPM, buf.readUnsignedShortLE());
         }
         if (BitUtil.check(mask, 5)) {
-            buf.readUnsignedIntLE(); // total hours
+            position.set(Position.KEY_HOURS, buf.readUnsignedIntLE());
         }
         if (BitUtil.check(mask, 6)) {
-            buf.readUnsignedIntLE(); // total distance
+            position.set(Position.KEY_ODOMETER, buf.readUnsignedIntLE());
         }
         if (BitUtil.check(mask, 7)) {
-            buf.readUnsignedByte(); // engine coolant
+            position.set(Position.KEY_COOLANT_TEMP, (int) buf.readByte());
         }
         if (BitUtil.check(mask, 8)) {
-            buf.readUnsignedByte(); // fuel level 2
+            position.set("fuel2", buf.readUnsignedByte());
         }
         if (BitUtil.check(mask, 9)) {
-            buf.readUnsignedByte(); // engine load
+            position.set(Position.KEY_ENGINE_LOAD, buf.readUnsignedByte());
         }
         if (BitUtil.check(mask, 10)) {
-            buf.readUnsignedShortLE(); // service distance
+            position.set(Position.KEY_ODOMETER_SERVICE, buf.readUnsignedShortLE());
         }
         if (BitUtil.check(mask, 11)) {
             buf.skipBytes(8); // sensors
@@ -142,7 +143,7 @@ public class BceProtocolDecoder extends BaseProtocolDecoder {
             buf.skipBytes(8); // trailer id
         }
         if (BitUtil.check(mask, 14)) {
-            buf.readUnsignedShortLE(); // fuel rate
+            position.set(Position.KEY_FUEL_CONSUMPTION, buf.readUnsignedShortLE());
         }
     }
 
@@ -152,10 +153,10 @@ public class BceProtocolDecoder extends BaseProtocolDecoder {
             buf.readUnsignedShortLE(); // fuel economy
         }
         if (BitUtil.check(mask, 1)) {
-            buf.readUnsignedIntLE(); // fuel consumption
+            position.set(Position.KEY_FUEL_CONSUMPTION, buf.readUnsignedIntLE());
         }
         if (BitUtil.check(mask, 2)) {
-            buf.readUnsignedMediumLE(); // axle weight
+            position.set(Position.KEY_AXLE_WEIGHT, buf.readUnsignedMediumLE());
         }
         if (BitUtil.check(mask, 3)) {
             buf.readUnsignedByte(); // mil status
@@ -169,6 +170,70 @@ public class BceProtocolDecoder extends BaseProtocolDecoder {
         if (BitUtil.check(mask, 6)) {
             position.set(Position.KEY_DRIVER_UNIQUE_ID, String.valueOf(buf.readLongLE()));
         }
+        if (BitUtil.check(mask, 7)) {
+            buf.readUnsignedShortLE(); // dallas temperature
+        }
+        if (BitUtil.check(mask, 8)) {
+            buf.readUnsignedShortLE(); // dallas humidity
+        }
+        if (BitUtil.check(mask, 9)) {
+            buf.skipBytes(6); // lls group 1
+        }
+        if (BitUtil.check(mask, 10)) {
+            buf.skipBytes(6); // lls group 2
+        }
+        if (BitUtil.check(mask, 11)) {
+            buf.skipBytes(21); // j1979 group 1
+        }
+        if (BitUtil.check(mask, 12)) {
+            buf.skipBytes(20); // j1979 dtc
+        }
+        if (BitUtil.check(mask, 13)) {
+            buf.skipBytes(9); // j1708 group 1
+        }
+        if (BitUtil.check(mask, 14)) {
+            buf.skipBytes(21); // driving quality
+        }
+    }
+
+    private void decodeMask4(ByteBuf buf, int mask, Position position) {
+
+        if (BitUtil.check(mask, 0)) {
+            buf.readUnsignedIntLE();
+        }
+        if (BitUtil.check(mask, 1)) {
+            buf.skipBytes(30); // lls group 3
+        }
+        if (BitUtil.check(mask, 2)) {
+            buf.readUnsignedIntLE(); // instant fuel consumption
+        }
+        if (BitUtil.check(mask, 3)) {
+            buf.skipBytes(10); // axle weight group
+        }
+        if (BitUtil.check(mask, 4)) {
+            buf.readUnsignedByte();
+        }
+        if (BitUtil.check(mask, 5)) {
+            buf.readUnsignedShortLE();
+        }
+        if (BitUtil.check(mask, 6)) {
+            buf.readUnsignedByte(); // maximum acceleration
+            buf.readUnsignedByte(); // maximum deceleration
+            buf.readUnsignedByte(); // maximum cornering
+        }
+        if (BitUtil.check(mask, 7)) {
+            buf.skipBytes(16);
+        }
+        if (BitUtil.check(mask, 8)) {
+            buf.skipBytes(40); // temperature sensors
+        }
+        if (BitUtil.check(mask, 9)) {
+            position.set("driver1", buf.readCharSequence(16, StandardCharsets.US_ASCII).toString().trim());
+            position.set("driver2", buf.readCharSequence(16, StandardCharsets.US_ASCII).toString().trim());
+        }
+        if (BitUtil.check(mask, 10)) {
+            position.set(Position.KEY_ODOMETER, buf.readUnsignedIntLE());
+        }
     }
 
     @Override
@@ -223,13 +288,18 @@ public class BceProtocolDecoder extends BaseProtocolDecoder {
 
                     if (masks.size() >= 2) {
                         mask = masks.get(1);
-                        decodeMask2(buf, mask);
+                        decodeMask2(buf, mask, position);
                     }
 
                     if (masks.size() >= 3) {
                         mask = masks.get(2);
                         decodeMask3(buf, mask, position);
                     }
+
+                    if (masks.size() >= 4) {
+                        mask = masks.get(3);
+                        decodeMask4(buf, mask, position);
+                    }
                 }
 
                 buf.readerIndex(structEnd);
diff --git a/src/test/java/org/traccar/protocol/BceProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/BceProtocolDecoderTest.java
index 71211ccfc..9801b56cc 100644
--- a/src/test/java/org/traccar/protocol/BceProtocolDecoderTest.java
+++ b/src/test/java/org/traccar/protocol/BceProtocolDecoderTest.java
@@ -14,6 +14,9 @@ public class BceProtocolDecoderTest extends ProtocolTest {
                 "3ab90b71bc1503000300c10bff11"));
 
         verifyPositions(decoder, binary(
+                "cdc3440cf31403001902a58c0a06e0ceb0009f4e4452419417e0ceb08bc0ffcf428014463627b24018104b425b1c508b00d16a9743d188da6e0110ce001455069262002e4c5adabb810200418728157501004229460377000bb4d04b10c000ffff335aa800000000000000000000000000a912963d0042313130303030313236313432303031202020202020202020202020202020203f2946030301f70100007b0400009f130000762700000a26e0ceb06f074e4452419427e0ceb08bc0ffcf42801446ee28b240a40f4b425c1c518a00df414c42d188936eff0fce001455069262002e4c5adabb810200417b28157501004c294603770008b4d04b10c000ffff4c5a89000000000000000000000000009a2c8c3b004231313030303031323631343230303120202020202020202020202020202020492946030301f80100007c040000a9130000802700009477e0ceb08bc0ffcf42801446eb2fb2405c0d4b425d1c53830089e07e43d188a56eff0fce001455069262002eb35700bb810200415227167501007e294603780000b4d04b10c000ffff995700000000000000000000000000008bd9f43b004231313030303031323631343230303120202020202020202020202020202020802946030301fd01000081040000e0130000b72700000a86e0ceb064464e4452410a96e0ceb000a54e4452410aa6e0ceb000914e4452410ab6e0ceb068334e4452410ac6e0ceb0009f4e4452410ac6e0ceb06f074e445241f4"));
+
+        verifyPositions(decoder, binary(
                 "cc2c5792c6160300b000a5520aa6c813ae64465343513840a7c813ae0bc0fd800080040036093f427884ea41001c900e00000000009088c562a301024156d12a004c00006df80c0000000086fb0200562a08005a000000000ac6c813ae0091534351380af6c813ae009f534351380af6c813ae6f075343513840f7c813ae0bc0fd800080040036093f427884ea41001c900e00000000009088f162a301024156d12a004c00006df80c0000000086fb0200562a08005a000000003f"));
 
         verifyPositions(decoder, false, binary(