From 3453e2d2213934b151632748594da6c71f31d6c9 Mon Sep 17 00:00:00 2001 From: jxjajs Date: Thu, 13 Mar 2025 15:08:17 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=B8=A5=E6=A0=BC=E5=8C=BA?= =?UTF-8?q?=E5=88=86=E6=B8=A9=E6=B9=BF=E5=BA=A6=E5=92=8C=E9=A3=8E=E9=80=9F?= =?UTF-8?q?=E9=A3=8E=E5=90=91=E5=8F=8A=E5=A4=9A=E8=A6=81=E7=B4=A0=E6=B0=94?= =?UTF-8?q?=E8=B1=A1=E4=BC=A0=E6=84=9F=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/cpp/SensorsProtocol.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/src/main/cpp/SensorsProtocol.cpp b/app/src/main/cpp/SensorsProtocol.cpp index 75735802..b81dc5e6 100644 --- a/app/src/main/cpp/SensorsProtocol.cpp +++ b/app/src/main/cpp/SensorsProtocol.cpp @@ -2675,6 +2675,8 @@ void ShxyProtocolDataProcess(int devno) switch (curserial->m_au8RecvBuf[j]) { case 1: /*温度*/ + if(devparam[devno].ProtocolIdx == WIND_PROTOCOL) + break; if ((fvalue < -60) || (fvalue > 100)) { frnb = (GeneratingRandomNumber() % 101 - 50) / 1000.0; @@ -2697,6 +2699,8 @@ void ShxyProtocolDataProcess(int devno) } break; case 2: /*气压*/ + if(devparam[devno].ProtocolIdx == WIND_PROTOCOL) + break; if ((fvalue < 550) || (fvalue > 1060)) { frnb = (GeneratingRandomNumber() % 41 - 20) / 10000.0; @@ -2718,6 +2722,8 @@ void ShxyProtocolDataProcess(int devno) } break; case 3: /*湿度*/ + if(devparam[devno].ProtocolIdx == WIND_PROTOCOL) + break; if ((fvalue < 0) || (fvalue > 100)) { frnb = (GeneratingRandomNumber() % 41 - 20) / 1000.0;