From dc4b2fbeed06c091ddcd3cf12fb576e062e50d05 Mon Sep 17 00:00:00 2001
From: "XI.CHEN" <2311041011@qq.com>
Date: Mon, 16 Dec 2024 15:48:27 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AD=89=E5=80=BC=E8=A6=86=E5=86=B0=E5=8E=9A?=
 =?UTF-8?q?=E5=BA=A6=E7=AD=89=E8=AE=A1=E7=AE=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/cpp/PhoneDevice.cpp | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/app/src/main/cpp/PhoneDevice.cpp b/app/src/main/cpp/PhoneDevice.cpp
index bf1383d4..3a122ac9 100644
--- a/app/src/main/cpp/PhoneDevice.cpp
+++ b/app/src/main/cpp/PhoneDevice.cpp
@@ -3622,10 +3622,10 @@ int CPhoneDevice::GetIceData(IDevice::ICE_INFO *iceInfo, IDevice::ICE_TAIL *iceT
     }
 
     Data_DEF airt;
-    //++等值覆冰厚度, 综合悬挂载荷, 不均衡张力差 置0
-    iceInfo->equal_icethickness = 0xff;
-    iceInfo->tension = 0xff;
-    iceInfo->tension_difference = 0xff;
+    //等值覆冰厚度, 综合悬挂载荷, 不均衡张力差 置0
+    iceInfo->equal_icethickness = 0;
+    iceInfo->tension = 0;
+    iceInfo->tension_difference = 0;
     bool status = 1;
 
     int pullno = 0;
@@ -3648,6 +3648,9 @@ int CPhoneDevice::GetIceData(IDevice::ICE_INFO *iceInfo, IDevice::ICE_TAIL *iceT
                 {
                     XYLOG(XYLOG_SEVERITY_INFO,"地址%d,采样状态 = %d,拉力未采集到数据,重新采样", sensorParam[num].devaddr, airt.AiState);
                     status = 0;
+                }else
+                {
+                    iceInfo->tension = iceInfo->tension + iceInfo->t_sensor_data[pullno].original_tension;
                 }
             }
             pullno++;
@@ -3693,6 +3696,8 @@ int CPhoneDevice::GetIceData(IDevice::ICE_INFO *iceInfo, IDevice::ICE_TAIL *iceT
             angleno++;
         }
     }
+    iceInfo->tension = iceInfo->tension * 0.913632;
+    iceInfo->tension_difference = iceInfo->tension * 0.13213;
 
     {
         std::lock_guard<std::mutex> lock(m_dataLocker);