From 5f0b0ae9ea34b00a487870dd75d91df63df49f87 Mon Sep 17 00:00:00 2001
From: 95384 <664090429@qq.com>
Date: Fri, 13 Dec 2024 16:04:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86=E5=86=99=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E5=9C=B0=E5=9D=80=EF=BC=8C=E6=B3=A2=E7=89=B9=E7=8E=87?=
 =?UTF-8?q?=EF=BC=8C=E9=A3=8E=E9=80=9F=E5=B9=B3=E5=9D=87=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=EF=BC=8C=E6=B8=A9=E6=B9=BF=E5=BA=A6=E5=B9=B3=E5=9D=87=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=20=E6=97=B6=E7=9A=84=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App/Src/frt_protocol.c  | 20 +++++++++++++++++++-
 EWARM/micro_climate.ewd |  2 +-
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/App/Src/frt_protocol.c b/App/Src/frt_protocol.c
index 3818e81..37d3122 100644
--- a/App/Src/frt_protocol.c
+++ b/App/Src/frt_protocol.c
@@ -462,6 +462,10 @@ static u_int16_t FRT_WriteRegDeviceAddr(void *pMsg)
 {   
     uint16_t *pMsgAddr = (uint16_t *)pMsg;
     uint16_t data = *pMsgAddr;
+    if(data > 0xFF || data < 0x00)
+    {
+        return 0;
+    }
     g_usrConfigInfo.addr = data;
     save_usr_config_info(g_usrConfigInfo);
     
@@ -477,9 +481,15 @@ static u_int16_t FRT_WriteRegCommuBaudRate(void *pMsg)
 {   
     uint16_t *pMsgAddr = (uint16_t *)pMsg;
     uint16_t data = *pMsgAddr;
+    if(data != 2400 && data != 4800 && data != 9600 && data != 19200 && data != 38400)
+    {
+        return 0;
+    }
+    
+    //存
     g_usrConfigInfo.uart_baud = data;
     save_usr_config_info(g_usrConfigInfo);
-    
+    //改
     MX_USART3_UART_Init(g_usrConfigInfo.uart_baud);
     MX_USART1_UART_Init(g_usrConfigInfo.uart_baud);
     
@@ -495,6 +505,10 @@ static u_int16_t FRT_WriteRegSpeedAverageTime(void *pMsg)
 {   
     uint16_t *pMsgAddr = (uint16_t *)pMsg;
     uint16_t data = *pMsgAddr;
+    if(data > 600 || data < 1)
+    {
+        return 0;
+    }
     
     g_usrConfigInfo.speed_average_time = data;
     save_usr_config_info(g_usrConfigInfo);
@@ -511,6 +525,10 @@ static u_int16_t FRT_WriteRegTempHumUpdateTime(void *pMsg)
 {   
     uint16_t *pMsgAddr = (uint16_t *)pMsg;
     uint16_t data = *pMsgAddr;
+    if(data > 600 || data < 1)
+    {
+        return 0;
+    }
     
     g_usrConfigInfo.temp_hum_update_time = data;
     save_usr_config_info(g_usrConfigInfo);
diff --git a/EWARM/micro_climate.ewd b/EWARM/micro_climate.ewd
index c567dea..2e5c4d3 100644
--- a/EWARM/micro_climate.ewd
+++ b/EWARM/micro_climate.ewd
@@ -84,7 +84,7 @@
                 </option>
                 <option>
                     <name>OCDynDriverList</name>
-                    <state>STLINK_ID</state>
+                    <state>CMSISDAP_ID</state>
                 </option>
                 <option>
                     <name>OCLastSavedByProductVersion</name>