Support Suntech bluetooth (BLE)

2 files changed, 74 insertions, 43 deletions

diff --git a/src/main/java/org/traccar/protocol/SuntechProtocolDecoder.java b/src/main/java/org/traccar/protocol/SuntechProtocolDecoder.java
index d8710a899..cf40e1e95 100644
--- a/src/main/java/org/traccar/protocol/SuntechProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/SuntechProtocolDecoder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 - 2020 Anton Tananaev (anton@traccar.org)
+ * Copyright 2013 - 2021 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.
@@ -34,6 +34,7 @@ import java.nio.charset.StandardCharsets;
 import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.TimeZone;
 
 public class SuntechProtocolDecoder extends BaseProtocolDecoder {
@@ -448,7 +449,7 @@ public class SuntechProtocolDecoder extends BaseProtocolDecoder {
 
         String type = values[index++];
 
-        if (!type.equals("STT") && !type.equals("ALT")) {
+        if (!type.equals("STT") && !type.equals("ALT") && !type.equals("BLE")) {
             return null;
         }
 
@@ -462,6 +463,9 @@ public class SuntechProtocolDecoder extends BaseProtocolDecoder {
         position.set(Position.KEY_TYPE, type);
 
         int mask = Integer.parseInt(values[index++], 16);
+        if (type.equals("BLE")) {
+            mask = 0b1100000110110;
+        }
 
         if (BitUtil.check(mask, 1)) {
             index += 1; // model
@@ -510,63 +514,84 @@ public class SuntechProtocolDecoder extends BaseProtocolDecoder {
             position.setLongitude(Double.parseDouble(values[index++]));
         }
 
-        if (BitUtil.check(mask, 13)) {
-            position.setSpeed(UnitsConverter.knotsFromKph(Double.parseDouble(values[index++])));
-        }
+        if (type.equals("BLE")) {
 
-        if (BitUtil.check(mask, 14)) {
-            position.setCourse(Double.parseDouble(values[index++]));
-        }
+            position.setValid(true);
 
-        if (BitUtil.check(mask, 15)) {
-            position.set(Position.KEY_SATELLITES, Integer.parseInt(values[index++]));
-        }
+            int count = Integer.parseInt(values[index++]);
+            index += 1;
 
-        if (BitUtil.check(mask, 16)) {
-            position.setValid(values[index++].equals("1"));
-        }
+            for (int i = 1; i <= count; i++) {
+                position.set("tag" + i + "Rssi", Integer.parseInt(values[index++]));
+                index += 1; // rssi min
+                index += 1; // rssi max
+                position.set("tag" + i + "Id", values[index++]);
+                position.set("tag" + i + "Samples", Integer.parseInt(values[index++]));
+                position.set("tag" + i + "Major", Integer.parseInt(values[index++]));
+                position.set("tag" + i + "Minor", Integer.parseInt(values[index++]));
+            }
 
-        if (BitUtil.check(mask, 17)) {
-            position.set(Position.KEY_INPUT, Integer.parseInt(values[index++]));
-        }
+        } else {
 
-        if (BitUtil.check(mask, 18)) {
-            position.set(Position.KEY_OUTPUT, Integer.parseInt(values[index++]));
-        }
+            if (BitUtil.check(mask, 13)) {
+                position.setSpeed(UnitsConverter.knotsFromKph(Double.parseDouble(values[index++])));
+            }
 
-        if (type.equals("ALT")) {
-            if (BitUtil.check(mask, 19)) {
-                position.set("alertId", values[index++]);
+            if (BitUtil.check(mask, 14)) {
+                position.setCourse(Double.parseDouble(values[index++]));
             }
-            if (BitUtil.check(mask, 20)) {
-                position.set("alertModifier", values[index++]);
+
+            if (BitUtil.check(mask, 15)) {
+                position.set(Position.KEY_SATELLITES, Integer.parseInt(values[index++]));
             }
-            if (BitUtil.check(mask, 21)) {
-                position.set("alertData", values[index++]);
+
+            if (BitUtil.check(mask, 16)) {
+                position.setValid(values[index++].equals("1"));
             }
-        } else {
-            if (BitUtil.check(mask, 19)) {
-                position.set("mode", Integer.parseInt(values[index++]));
+
+            if (BitUtil.check(mask, 17)) {
+                position.set(Position.KEY_INPUT, Integer.parseInt(values[index++]));
             }
-            if (BitUtil.check(mask, 20)) {
-                position.set("reason", Integer.parseInt(values[index++]));
+
+            if (BitUtil.check(mask, 18)) {
+                position.set(Position.KEY_OUTPUT, Integer.parseInt(values[index++]));
             }
-            if (BitUtil.check(mask, 21)) {
-                position.set(Position.KEY_INDEX, Integer.parseInt(values[index++]));
+
+            if (type.equals("ALT")) {
+                if (BitUtil.check(mask, 19)) {
+                    position.set("alertId", values[index++]);
+                }
+                if (BitUtil.check(mask, 20)) {
+                    position.set("alertModifier", values[index++]);
+                }
+                if (BitUtil.check(mask, 21)) {
+                    position.set("alertData", values[index++]);
+                }
+            } else {
+                if (BitUtil.check(mask, 19)) {
+                    position.set("mode", Integer.parseInt(values[index++]));
+                }
+                if (BitUtil.check(mask, 20)) {
+                    position.set("reason", Integer.parseInt(values[index++]));
+                }
+                if (BitUtil.check(mask, 21)) {
+                    position.set(Position.KEY_INDEX, Integer.parseInt(values[index++]));
+                }
             }
-        }
 
-        if (BitUtil.check(mask, 22)) {
-            index += 1; // reserved
-        }
+            if (BitUtil.check(mask, 22)) {
+                index += 1; // reserved
+            }
 
-        if (BitUtil.check(mask, 23)) {
-            int assignMask = Integer.parseInt(values[index++], 16);
-            for (int i = 0; i <= 30; i++) {
-                if (BitUtil.check(assignMask, i)) {
-                    position.set(Position.PREFIX_IO + (i + 1), values[index++]);
+            if (BitUtil.check(mask, 23)) {
+                int assignMask = Integer.parseInt(values[index++], 16);
+                for (int i = 0; i <= 30; i++) {
+                    if (BitUtil.check(assignMask, i)) {
+                        position.set(Position.PREFIX_IO + (i + 1), values[index++]);
+                    }
                 }
             }
+
         }
 
         return position;
diff --git a/src/test/java/org/traccar/protocol/SuntechProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/SuntechProtocolDecoderTest.java
index 8cc4148f0..7f0700728 100644
--- a/src/test/java/org/traccar/protocol/SuntechProtocolDecoderTest.java
+++ b/src/test/java/org/traccar/protocol/SuntechProtocolDecoderTest.java
@@ -82,6 +82,12 @@ public class SuntechProtocolDecoderTest extends ProtocolTest {
 
         var decoder = new SuntechProtocolDecoder(null);
 
+        verifyPosition(decoder, buffer(
+                "BLE;0820012345;001FFF;82;1.0.0;20191203;17:00:51;+32.691615;-117.297160;2;2;-32;-100;33;AABBCCDDEEFF;12;18;52;1;-44;44;112233445566;32;69;101"));
+
+        verifyNull(decoder, buffer(
+                "BSA;0820012345;001FFF;82;1.0.0;1;20191203;17:00:51;+32.691615;-117.297160;1;-55;68:11:6A:FD:1A:A7;6AA5;1DE8"));
+
         verifyAttribute(decoder, buffer(
                 "ST300UEX;511331307;45;311;20210420;12:41:01;12361;-01.280825;-047.931773;000.000;000.00;16;1;0;12.54;000000;23;GTSL|6|1|0|9255143|2|;6F;000276;0.0;1;00000000000000;0"),
                 Position.KEY_DRIVER_UNIQUE_ID, "9255143");