From 725195a271f4313255b80c99278b3a91cff799e1 Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton@traccar.org>
Date: Fri, 9 Sep 2022 17:35:56 -0700
Subject: Add DT700 bluetooth temperature

---
 src/main/java/org/traccar/protocol/HuabaoProtocolDecoder.java | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'src/main/java/org/traccar/protocol/HuabaoProtocolDecoder.java')

diff --git a/src/main/java/org/traccar/protocol/HuabaoProtocolDecoder.java b/src/main/java/org/traccar/protocol/HuabaoProtocolDecoder.java
index 5393c6f74..d2b8f1fb5 100644
--- a/src/main/java/org/traccar/protocol/HuabaoProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/HuabaoProtocolDecoder.java
@@ -513,6 +513,16 @@ public class HuabaoProtocolDecoder extends BaseProtocolDecoder {
                     position.set(Position.KEY_MOTION, BitUtil.check(deviceStatus, 2));
                     position.set("cover", BitUtil.check(deviceStatus, 3));
                     break;
+                case 0xE6:
+                    int sensorIndex = buf.readUnsignedByte();
+                    buf.skipBytes(6); // mac
+                    position.set(
+                            Position.PREFIX_TEMP + sensorIndex,
+                            buf.readUnsignedByte() + buf.readUnsignedByte() * 0.01);
+                    position.set(
+                            "humidity" + sensorIndex,
+                            buf.readUnsignedByte() + buf.readUnsignedByte() * 0.01);
+                    break;
                 case 0xEB:
                     if (buf.getUnsignedShort(buf.readerIndex()) > 200) {
                         Network network = new Network();
-- 
cgit v1.2.3


From 729bf987349dc9230293140139dd8ad10b7de107 Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton@traccar.org>
Date: Fri, 16 Sep 2022 18:17:28 -0700
Subject: Handle multiple DT700 sensors

---
 .../org/traccar/protocol/HuabaoProtocolDecoder.java    | 18 ++++++++++--------
 .../traccar/protocol/HuabaoProtocolDecoderTest.java    |  4 ++--
 2 files changed, 12 insertions(+), 10 deletions(-)

(limited to 'src/main/java/org/traccar/protocol/HuabaoProtocolDecoder.java')

diff --git a/src/main/java/org/traccar/protocol/HuabaoProtocolDecoder.java b/src/main/java/org/traccar/protocol/HuabaoProtocolDecoder.java
index d2b8f1fb5..0639b9dcf 100644
--- a/src/main/java/org/traccar/protocol/HuabaoProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/HuabaoProtocolDecoder.java
@@ -514,14 +514,16 @@ public class HuabaoProtocolDecoder extends BaseProtocolDecoder {
                     position.set("cover", BitUtil.check(deviceStatus, 3));
                     break;
                 case 0xE6:
-                    int sensorIndex = buf.readUnsignedByte();
-                    buf.skipBytes(6); // mac
-                    position.set(
-                            Position.PREFIX_TEMP + sensorIndex,
-                            buf.readUnsignedByte() + buf.readUnsignedByte() * 0.01);
-                    position.set(
-                            "humidity" + sensorIndex,
-                            buf.readUnsignedByte() + buf.readUnsignedByte() * 0.01);
+                    while (buf.readerIndex() < endIndex) {
+                        int sensorIndex = buf.readUnsignedByte();
+                        buf.skipBytes(6); // mac
+                        position.set(
+                                Position.PREFIX_TEMP + sensorIndex,
+                                buf.readUnsignedByte() + buf.readUnsignedByte() * 0.01);
+                        position.set(
+                                "humidity" + sensorIndex,
+                                buf.readUnsignedByte() + buf.readUnsignedByte() * 0.01);
+                    }
                     break;
                 case 0xEB:
                     if (buf.getUnsignedShort(buf.readerIndex()) > 200) {
diff --git a/src/test/java/org/traccar/protocol/HuabaoProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/HuabaoProtocolDecoderTest.java
index 4ef2e25ea..3661a0202 100644
--- a/src/test/java/org/traccar/protocol/HuabaoProtocolDecoderTest.java
+++ b/src/test/java/org/traccar/protocol/HuabaoProtocolDecoderTest.java
@@ -12,8 +12,8 @@ public class HuabaoProtocolDecoderTest extends ProtocolTest {
         var decoder = inject(new HuabaoProtocolDecoder(null));
 
         verifyAttribute(decoder, binary(
-                "7e0200003d012291302256004800000000000c012300d2648805ff31db000e0000000022090708255503020000a70400000000ac04000002bce5020000e60b01dd34020754fe1bce3efc357e"),
-                Position.PREFIX_TEMP + 1, 29.06);
+                "7e0200005e01229130231209e300000000000c002300d264a305ff322300160000000022091514493503020000a70400000000ac0400000000e5020003e62c01bc5729009ca319bbff0002dd34020754fe1a83393c03bc572900ce371a6133d704dd34020751551d00fefb9a7e"),
+                Position.PREFIX_TEMP + 4, 29.0);
 
         verifyAttribute(decoder, binary(
                 "7E0200008201215233475100030000000000000003015A7F6106CF8CEC003D0000000021071311481901040000005630011931011AE10200755D3D0601CC0024990A7dA0032301CC002499099B2941FC01CC002499099B29430B01CC0024990A7dA0290601CC0024990A7dA015FD01CC0026220994506BFFFE157C010400000001F10C000000000000000000000000997E"),
-- 
cgit v1.2.3