From 1c76a9a1cebf1c7d144819928af98f08df470f0f Mon Sep 17 00:00:00 2001 From: zhangwen <3466561528@qq.com> Date: Wed, 14 Jan 2026 20:22:29 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BA=86=E7=94=B5?= =?UTF-8?q?=E5=8E=8B=E5=81=8F=E5=B7=AE=E4=B8=8A=E9=80=81=E6=96=B9=E5=BC=8F?= =?UTF-8?q?=EF=BC=8C=E5=8F=96=E4=B8=8A=E4=B8=8B=E5=81=8F=E5=B7=AE=E4=B8=AD?= =?UTF-8?q?=E7=BB=9D=E5=AF=B9=E5=80=BC=E8=BE=83=E5=A4=A7=E7=9A=84=E9=82=A3?= =?UTF-8?q?=E4=B8=80=E4=B8=AA=E6=8C=87=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- LFtid1056/PQSMsg.h | 10 ++++++++-- LFtid1056/dealMsg.cpp | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/LFtid1056/PQSMsg.h b/LFtid1056/PQSMsg.h index 0d2b515..74cbb0c 100644 --- a/LFtid1056/PQSMsg.h +++ b/LFtid1056/PQSMsg.h @@ -757,7 +757,10 @@ public: // 12-14位从UU_Deviation和UL_Deviation各自取前三个，取不为0的值 for (int i = 0; i < 3; ++i) { - float val = (UU_Deviation[i] != 0.0f) ? UU_Deviation[i] : UL_Deviation[i]; + // 直接选择绝对值更大的那个（必然是有效数值） + float val = (fabs(UU_Deviation[i]) > fabs(UL_Deviation[i])) + ? UU_Deviation[i] + : UL_Deviation[i]; float_buffer.push_back(val); } @@ -1032,7 +1035,10 @@ public: // 9-11位从UU_Deviation和UL_Deviation各自取前三个，取不为0的值 for (int i = 0; i < 3; ++i) { - float val = (UU_Deviation[i] != 0.0f) ? UU_Deviation[i] : UL_Deviation[i]; + // 直接选择绝对值更大的那个（必然是有效数值） + float val = (fabs(UU_Deviation[i]) > fabs(UL_Deviation[i])) + ? UU_Deviation[i] + : UL_Deviation[i]; float_buffer.push_back(val); } diff --git a/LFtid1056/dealMsg.cpp b/LFtid1056/dealMsg.cpp index 587426e..db47593 100644 --- a/LFtid1056/dealMsg.cpp +++ b/LFtid1056/dealMsg.cpp @@ -490,7 +490,7 @@ void process_received_message(string mac, string id,const char* data, size_t len std::string min_base64Str = min_data.ConvertToBase64(nPTType); std::string avg_base64Str = avg_data.ConvertToBase64(nPTType); std::string cp95_base64Str = cp95_data.ConvertToBase64(nPTType); - //std::cout << "New star base64Str0:" << max_base64Str << std::endl; + //std::cout << "New del base64Str1:" << avg_data.ConvertToBase64(1) << std::endl; //lnk20250708浣跨敤鎺ュ彛鍙戦 time_t data_time = ConvertToTimestamp(avg_data.time); From a4cd9cf62f1987e8565e52be99a368599fd2cdf1 Mon Sep 17 00:00:00 2001 From: zhangwen <3466561528@qq.com> Date: Thu, 15 Jan 2026 13:49:58 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BA=86=E5=AE=9E?= =?UTF-8?q?=E6=97=B6=E6=95=B0=E6=8D=AE=E7=94=B5=E5=8E=8B=E5=81=8F=E5=B7=AE?= =?UTF-8?q?=E5=92=8C=E8=B4=9F=E5=BA=8F=E4=B8=8D=E5=B9=B3=E8=A1=A1=E7=9A=84?= =?UTF-8?q?=E4=B8=8A=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- LFtid1056/PQSMsg.h | 30 ++++++++++++++++++++++++------ 1 file changed, 24 insertions(+), 6 deletions(-) diff --git a/LFtid1056/PQSMsg.h b/LFtid1056/PQSMsg.h index 74cbb0c..4cb0216 100644 --- a/LFtid1056/PQSMsg.h +++ b/LFtid1056/PQSMsg.h @@ -760,7 +760,7 @@ public: // 直接选择绝对值更大的那个（必然是有效数值） float val = (fabs(UU_Deviation[i]) > fabs(UL_Deviation[i])) ? UU_Deviation[i] - : UL_Deviation[i]; + : -UL_Deviation[i]; float_buffer.push_back(val); } @@ -1038,7 +1038,7 @@ public: // 直接选择绝对值更大的那个（必然是有效数值） float val = (fabs(UU_Deviation[i]) > fabs(UL_Deviation[i])) ? UU_Deviation[i] - : UL_Deviation[i]; + : -UL_Deviation[i]; float_buffer.push_back(val); } @@ -1815,7 +1815,11 @@ public: // 9-11: 电压偏差（取不为0的值） for (int i = 0; i < 3; ++i) { - float val = (UU_Deviation[i] != 0.0f) ? UU_Deviation[i] : UL_Deviation[i]; + //float val = (UU_Deviation[i] != 0.0f) ? UU_Deviation[i] : UL_Deviation[i]; + // 直接选择绝对值更大的那个（必然是有效数值） + float val = (fabs(UU_Deviation[i]) > fabs(UL_Deviation[i])) + ? UU_Deviation[i] + : -UL_Deviation[i]; float_buffer.push_back(val); } @@ -1842,7 +1846,12 @@ public: // 26-33: 电压电流序分量（前8个元素） for (int i = 0; i < 2; ++i) { for (int j = 0; j < 4; ++j) { // 取每行的前4个元素 - float_buffer.push_back(UI_Seq[i][j]); + if (j == 3) { + float_buffer.push_back(UI_Seq[i][j+1]); + } + else { + float_buffer.push_back(UI_Seq[i][j]); + } } } @@ -1954,7 +1963,11 @@ public: // 12-14: 电压偏差（取不为0的值） for (int i = 0; i < 3; ++i) { - float val = (UU_Deviation[i] != 0.0f) ? UU_Deviation[i] : UL_Deviation[i]; + //float val = (UU_Deviation[i] != 0.0f) ? UU_Deviation[i] : UL_Deviation[i]; + // 直接选择绝对值更大的那个（必然是有效数值） + float val = (fabs(UU_Deviation[i]) > fabs(UL_Deviation[i])) + ? UU_Deviation[i] + : -UL_Deviation[i]; float_buffer.push_back(val); } @@ -1981,7 +1994,12 @@ public: // 26-33: 电压电流序分量（前8个元素） for (int i = 0; i < 2; ++i) { for (int j = 0; j < 4; ++j) { - float_buffer.push_back(UI_Seq[i][j]); + if (j == 3) { + float_buffer.push_back(UI_Seq[i][j + 1]); + } + else { + float_buffer.push_back(UI_Seq[i][j]); + } } }