Fix Aplicom EBS decoding

2 files changed, 52 insertions, 49 deletions

diff --git a/src/org/traccar/protocol/AplicomProtocolDecoder.java b/src/org/traccar/protocol/AplicomProtocolDecoder.java
index ef02cda7e..94d12c633 100644
--- a/src/org/traccar/protocol/AplicomProtocolDecoder.java
+++ b/src/org/traccar/protocol/AplicomProtocolDecoder.java
@@ -470,59 +470,59 @@ public class AplicomProtocolDecoder extends BaseProtocolDecoder {
         buf.readUnsignedShort(); // length
 
         while (buf.readableBytes() > 0) {
-            position.set("towedPosition", buf.readUnsignedByte());
+            buf.readUnsignedByte(); // towed position
             int type = buf.readUnsignedByte();
             int length = buf.readUnsignedByte();
+            int end = buf.readerIndex() + length;
 
-            if (type == 0x01) {
-                position.set("brakeFlags", ChannelBuffers.hexDump(buf.readBytes(length)));
-            } else if (type == 0x02) {
-                position.set("wheelSpeed", buf.readUnsignedShort() / 256.0);
-                position.set("wheelSpeedDifference", buf.readUnsignedShort() / 256.0 - 125.0);
-                position.set("lateralAcceleration", buf.readUnsignedByte() / 10.0 - 12.5);
-                position.set("vehicleSpeed", buf.readUnsignedShort() / 256.0);
-            } else if (type == 0x03) {
-                position.set("axleLoadSum", buf.readUnsignedShort() * 2);
-            } else if (type == 0x04) {
-                position.set("tyrePressure", buf.readUnsignedByte() * 10);
-                position.set("pneumaticPressure", buf.readUnsignedByte() * 5);
-            } else if (type == 0x05) {
-                position.set("brakeLining", buf.readUnsignedByte() * 0.4);
-                position.set("brakeTemperature", buf.readUnsignedByte() * 10);
-            } else if (type == 0x06) {
-                position.set(Position.KEY_ODOMETER, buf.readUnsignedInt() * 5);
-                position.set(Position.KEY_ODOMETER_TRIP, buf.readUnsignedInt() * 5);
-                position.set(Position.KEY_ODOMETER_SERVICE, (buf.readUnsignedInt() - 2105540607) * 5);
-            } else if (type == 0x0A) {
-                ChannelBuffer brakeData = buf.readBytes(length);
-                position.set("absStatusCounter", brakeData.readUnsignedShort());
-                position.set("atvbStatusCounter", brakeData.readUnsignedShort());
-                position.set("vdcActiveCounter", brakeData.readUnsignedShort());
-            } else if (type == 0x0B) {
-                position.set("brakeMinMaxData", ChannelBuffers.hexDump(buf.readBytes(length)));
-            } else if (type == 0x0C) {
-                position.set("missingPgn", ChannelBuffers.hexDump(buf.readBytes(length)));
-            } else if (type == 0x0D) {
-                switch (buf.readUnsignedByte()) {
-                    case 1:
-                        position.set("brakeManufacturer", "Wabco");
-                        break;
-                    case 2:
-                        position.set("brakeManufacturer", "Knorr");
-                        break;
-                    case 3:
-                        position.set("brakeManufacturer", "Haldex");
-                        break;
-                    default:
-                        position.set("brakeManufacturer", "Unknown");
-                        break;
-                }
-                buf.readUnsignedByte();
-                position.set(Position.KEY_VIN, buf.readBytes(17).toString(StandardCharsets.US_ASCII));
-                position.set("towedDetectionStatus", buf.readUnsignedByte());
-            } else if (type == 0x0E) {
-                buf.skipBytes(length);
+            switch (type) {
+                case 0x01:
+                    position.set("brakeFlags", ChannelBuffers.hexDump(buf.readBytes(length)));
+                    break;
+                case 0x02:
+                    position.set("wheelSpeed", buf.readUnsignedShort() / 256.0);
+                    position.set("wheelSpeedDifference", buf.readUnsignedShort() / 256.0 - 125.0);
+                    position.set("lateralAcceleration", buf.readUnsignedByte() / 10.0 - 12.5);
+                    position.set("vehicleSpeed", buf.readUnsignedShort() / 256.0);
+                    break;
+                case 0x03:
+                    position.set("axleLoadSum", buf.readUnsignedShort() * 2);
+                    break;
+                case 0x04:
+                    position.set("tyrePressure", buf.readUnsignedByte() * 10);
+                    position.set("pneumaticPressure", buf.readUnsignedByte() * 5);
+                    break;
+                case 0x05:
+                    position.set("brakeLining", buf.readUnsignedByte() * 0.4);
+                    position.set("brakeTemperature", buf.readUnsignedByte() * 10);
+                    break;
+                case 0x06:
+                    position.set(Position.KEY_ODOMETER, buf.readUnsignedInt() * 5L);
+                    position.set(Position.KEY_ODOMETER_TRIP, buf.readUnsignedInt() * 5L);
+                    position.set(Position.KEY_ODOMETER_SERVICE, (buf.readUnsignedInt() - 2105540607) * 5L);
+                    break;
+                case 0x0A:
+                    position.set("absStatusCounter", buf.readUnsignedShort());
+                    position.set("atvbStatusCounter", buf.readUnsignedShort());
+                    position.set("vdcActiveCounter", buf.readUnsignedShort());
+                    break;
+                case 0x0B:
+                    position.set("brakeMinMaxData", ChannelBuffers.hexDump(buf.readBytes(length)));
+                    break;
+                case 0x0C:
+                    position.set("missingPgn", ChannelBuffers.hexDump(buf.readBytes(length)));
+                    break;
+                case 0x0D:
+                    buf.readUnsignedByte();
+                    position.set("towedDetectionStatus", buf.readUnsignedInt());
+                    buf.skipBytes(17); // vin
+                    break;
+                case 0x0E:
+                default:
+                    break;
             }
+
+            buf.readerIndex(end);
         }
     }
 
diff --git a/test/org/traccar/protocol/AplicomProtocolDecoderTest.java b/test/org/traccar/protocol/AplicomProtocolDecoderTest.java
index 2498d94b3..862cff055 100644
--- a/test/org/traccar/protocol/AplicomProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/AplicomProtocolDecoderTest.java
@@ -11,6 +11,9 @@ public class AplicomProtocolDecoderTest extends ProtocolTest {
         AplicomProtocolDecoder decoder = new AplicomProtocolDecoder(new AplicomProtocol());

 

         verifyAttributes(decoder, binary(

+                "44c30144f667c4316500e903ffdfbc00f059aebeb659aebeb302e3f5860065fe32120000ae0000000e47000000000000000000000000000127cd0000014c00000000000000ff010a002900000000000000014542016d0001010090070e140144f667c4316559ae620402e3f7f300660714c0010d15ff0f3332373937313100000000000000000000002a01010737341d331fffcf0103020b8601060c0001a5860001a58600000000010b1001ca01ca7d007d007c7cffffffffffff010a240000ffff0000000100010001ffff0000ffffffffffffffffffffffffffff00000002ffff010c06fec6febffeec"));

+

+        verifyAttributes(decoder, binary(

                 "45c20144f667c06ff9005d0161ef17000104596da2dc4b10c0c01d99020d6c04004cba7a010d44463030303235333731363238303030000000000000000000000000000000000000000000000000000001010d44463030303235333731363238303030000000000000031c"));

 

         verifyAttributes(decoder, binary(