From a14c76c4eddc436b10683d23630387abd35e787f Mon Sep 17 00:00:00 2001 From: "XI.CHEN" <2311041011@qq.com> Date: Thu, 13 Mar 2025 11:37:58 +0800 Subject: [PATCH 1/3] Update version to 1.3.72 Based Core Version to 1.4.39 --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index ff17f1e0..1b0869e2 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -5,7 +5,7 @@ plugins { // 10,00,000 major-minor-build def AppMajorVersion = 1 def AppMinorVersion = 3 -def AppBuildNumber = 71 +def AppBuildNumber = 72 def AppVersionName = AppMajorVersion + "." + AppMinorVersion + "." + AppBuildNumber def AppVersionCode = AppMajorVersion * 100000 + AppMinorVersion * 1000 + AppBuildNumber From 3453e2d2213934b151632748594da6c71f31d6c9 Mon Sep 17 00:00:00 2001 From: jxjajs Date: Thu, 13 Mar 2025 15:08:17 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=B8=A5=E6=A0=BC?= =?UTF-8?q?=E5=8C=BA=E5=88=86=E6=B8=A9=E6=B9=BF=E5=BA=A6=E5=92=8C=E9=A3=8E?= =?UTF-8?q?=E9=80=9F=E9=A3=8E=E5=90=91=E5=8F=8A=E5=A4=9A=E8=A6=81=E7=B4=A0?= =?UTF-8?q?=E6=B0=94=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; From b8416b8e1b08ba091fdd9eaa041831a2f251c1de Mon Sep 17 00:00:00 2001 From: jxjajs Date: Thu, 13 Mar 2025 15:09:39 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=B8=A5=E6=A0=BC?= =?UTF-8?q?=E5=8C=BA=E5=88=86=E6=B8=A9=E6=B9=BF=E5=BA=A6=E5=92=8C=E9=A3=8E?= =?UTF-8?q?=E9=80=9F=E9=A3=8E=E5=90=91=E5=8F=8A=E5=A4=9A=E8=A6=81=E7=B4=A0?= =?UTF-8?q?=E6=B0=94=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.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/src/main/cpp/SensorsProtocol.h b/app/src/main/cpp/SensorsProtocol.h index 034e2985..488d01c6 100644 --- a/app/src/main/cpp/SensorsProtocol.h +++ b/app/src/main/cpp/SensorsProtocol.h @@ -83,9 +83,9 @@ #define P_IRIS_OPEN 0x04000000 /* 光圈放大(1 有效)*/ #define P_FOCUS_NEAR 0x02000000 /* 近距离聚焦(1 有效)*/ #define P_FOCUS_FAR 0x01000000 /* 远距离聚焦(1 有效)*/ -#define P_ZOOM_WIDE 0x00400000 /* 远离物体(1 有效)*/ +#define P_ZOOM_WIDE 0x00400000 /* 远离物体(1 有效)*/ #define P_ZOOM_TELE 0x00200000 /* 接近物体(1 有效)*/ -#define P_MOVE_DOWN 0x0010001f /* 向下移动镜头(1 有效)*/ +#define P_MOVE_DOWN 0x0010001f /* 向下移动镜头(1 有效)*/ #define P_MOVE_UP 0x0008001f /* 向上移动镜头(1 有效)*/ #define P_MOVE_LEFT 0x00041f00 /* 向左移动镜头(1 有效)*/ #define P_MOVE_RIGHT 0x00021f00 /* 向右移动镜头(1 有效)*/ @@ -95,10 +95,10 @@ #define D_IRIS_CLOSE 0x04000000 /* 光圈缩小(1 有效)*/ #define D_IRIS_OPEN 0x02000000 /* 光圈放大(1 有效)*/ #define D_FOCUS_NEAR 0x01000000 /* 近距离聚焦(1 有效)*/ -#define D_FOCUS_FAR 0x00800000 /* 远距离聚焦(1 有效)*/ -#define D_ZOOM_WIDE 0x00400000 /* 远离物体(1 有效)*/ -#define D_ZOOM_TELE 0x00200000 /* 接近物体(1 有效)*/ -#define D_MOVE_DOWN 0x0010002d /* 向下移动镜头(1 有效)*/ +#define D_FOCUS_FAR 0x00800000 /* 远距离聚焦(1 有效)*/ +#define D_ZOOM_WIDE 0x00400000 /* 远离物体(1 有效)*/ +#define D_ZOOM_TELE 0x00200000 /* 接近物体(1 有效)*/ +#define D_MOVE_DOWN 0x0010002d /* 向下移动镜头(1 有效)*/ #define D_MOVE_UP 0x0008002d /* 向上移动镜头(1 有效)*/ #define D_MOVE_LEFT 0x00042d00 /* 向左移动镜头(1 有效)*/ #define D_MOVE_RIGHT 0x00022d00 /* 向右移动镜头(1 有效)*/