From ab10e710a9c57ef761ea9955198273db5f473581 Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton@traccar.org>
Date: Thu, 27 Oct 2022 07:17:25 -0700
Subject: Fix DT700 temperature decoding

---
 .../java/org/traccar/protocol/HuabaoProtocolDecoder.java  | 15 +++++++++------
 .../org/traccar/protocol/HuabaoProtocolDecoderTest.java   |  4 ++--
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/main/java/org/traccar/protocol/HuabaoProtocolDecoder.java b/src/main/java/org/traccar/protocol/HuabaoProtocolDecoder.java
index b6940aecf..27a5094a0 100644
--- a/src/main/java/org/traccar/protocol/HuabaoProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/HuabaoProtocolDecoder.java
@@ -408,6 +408,13 @@ public class HuabaoProtocolDecoder extends BaseProtocolDecoder {
         }
     }
 
+    private double decodeCustomDouble(ByteBuf buf) {
+        int b1 = buf.readByte();
+        int b2 = buf.readUnsignedByte();
+        int sign = b1 != 0 ? b1 / Math.abs(b1) : 1;
+        return sign * (Math.abs(b1) + b2 / 255.0);
+    }
+
     private Position decodeLocation(DeviceSession deviceSession, ByteBuf buf) {
 
         Position position = new Position(getProtocolName());
@@ -529,12 +536,8 @@ public class HuabaoProtocolDecoder extends BaseProtocolDecoder {
                     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);
+                        position.set(Position.PREFIX_TEMP + sensorIndex, decodeCustomDouble(buf));
+                        position.set("humidity" + sensorIndex, decodeCustomDouble(buf));
                     }
                     break;
                 case 0xEB:
diff --git a/src/test/java/org/traccar/protocol/HuabaoProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/HuabaoProtocolDecoderTest.java
index f7873ef08..9bbd375dc 100644
--- a/src/test/java/org/traccar/protocol/HuabaoProtocolDecoderTest.java
+++ b/src/test/java/org/traccar/protocol/HuabaoProtocolDecoderTest.java
@@ -15,8 +15,8 @@ public class HuabaoProtocolDecoderTest extends ProtocolTest {
                 "7e010200204f07788ef67601824f4459344f544d314d4459774d4441314d444977626d5633553235536457786cba7e"));
 
         verifyAttribute(decoder, binary(
-                "7e0200005e01229130231209e300000000000c002300d264a305ff322300160000000022091514493503020000a70400000000ac0400000000e5020003e62c01bc5729009ca319bbff0002dd34020754fe1a83393c03bc572900ce371a6133d704dd34020751551d00fefb9a7e"),
-                Position.PREFIX_TEMP + 4, 29.0);
+                "7e02000042012291302260198f00000000800c012300d2651605ff3188001e0000000022102510310003020000a70400000000ac040000012ce5020003e60b03bc572900ce2eef183200e7030000005c7e"),
+                Position.PREFIX_TEMP + 3, -17.094117647058823);
 
         verifyAttribute(decoder, binary(
                 "7E0200008201215233475100030000000000000003015A7F6106CF8CEC003D0000000021071311481901040000005630011931011AE10200755D3D0601CC0024990A7dA0032301CC002499099B2941FC01CC002499099B29430B01CC0024990A7dA0290601CC0024990A7dA015FD01CC0026220994506BFFFE157C010400000001F10C000000000000000000000000997E"),
-- 
cgit v1.2.3