From a7602b3042396cd8277c113780f4c5943dd0e5cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E9=A9=AC=5F666?=
 <13089258+pony-six-hundred-and-sixty-six@user.noreply.gitee.com>
Date: Thu, 6 Feb 2025 14:24:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=8A=A5=E7=9A=84=E5=AE=9A=E6=97=B6?=
 =?UTF-8?q?=E5=99=A8=E8=B6=85=E5=87=BA=E5=80=BC=E5=86=8D=E5=8A=A0=E4=BA=86?=
 =?UTF-8?q?=E4=B8=80=E5=B1=82=E9=99=90=E5=B9=85=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .mrs/launch.json          | 6 +++---
 bsp/src/at_device_nt26k.c | 1 -
 bsp/src/bsp_nt26k.c       | 5 +++++
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/.mrs/launch.json b/.mrs/launch.json
index be75f06..25a7cbf 100644
--- a/.mrs/launch.json
+++ b/.mrs/launch.json
@@ -5,7 +5,7 @@
 			"type": "mrs-debugger",
 			"request": "launch",
 			"name": "JT-DT-YD4N02A_RTT_MRS-4G",
-			"cwd": "d:\\SXDT\\Project\\CH32\\JT-DT-YD4N02A_RTT_MRS-NT26K",
+			"cwd": "c:\\Users\\张喆1223\\Desktop\\NT26K\\JT-DT-YD4N02A_4G_RTT_MRS",
 			"openOCDCfg": {
 				"useLocalOpenOCD": true,
 				"executable": "c:/MounRiver/MounRiver_Studio2/resources/app/resources/win32/components/WCH/OpenOCD/OpenOCD/bin/openocd.exe",
@@ -39,8 +39,8 @@
 					"additionalCommands": []
 				},
 				"loadedFiles": {
-					"executableFile": "d:\\SXDT\\Project\\CH32\\JT-DT-YD4N02A_RTT_MRS-NT26K\\obj\\JT-DT-YD4N02A_RTT_MRS-4G.elf",
-					"symbolFile": "d:\\SXDT\\Project\\CH32\\JT-DT-YD4N02A_RTT_MRS-NT26K\\obj\\JT-DT-YD4N02A_RTT_MRS-4G.elf",
+					"executableFile": "c:\\Users\\张喆1223\\Desktop\\NT26K\\JT-DT-YD4N02A_4G_RTT_MRS\\obj\\JT-DT-YD4N02A_RTT_MRS-4G.elf",
+					"symbolFile": "c:\\Users\\张喆1223\\Desktop\\NT26K\\JT-DT-YD4N02A_4G_RTT_MRS\\obj\\JT-DT-YD4N02A_RTT_MRS-4G.elf",
 					"executableFileOffset": 0,
 					"symbolFileOffset": 0
 				},
diff --git a/bsp/src/at_device_nt26k.c b/bsp/src/at_device_nt26k.c
index e64dc07..59c9236 100644
--- a/bsp/src/at_device_nt26k.c
+++ b/bsp/src/at_device_nt26k.c
@@ -382,7 +382,6 @@ int at_send_data(struct at_device *device, const char *data, rt_size_t size)
             }
         }
     }
-
     at_delete_resp(resp);
     return -RT_ERROR;
 }
diff --git a/bsp/src/bsp_nt26k.c b/bsp/src/bsp_nt26k.c
index a0287cc..4a02529 100644
--- a/bsp/src/bsp_nt26k.c
+++ b/bsp/src/bsp_nt26k.c
@@ -62,6 +62,7 @@ struct rt_event at_device_event;
 rt_sem_t nt26k_recv_sem;
 rt_sem_t nt26k_recv_msg_sem; // 用于接收信号
 rt_sem_t nt26k_disconnect_sem;
+
 static rt_timer_t nt26k_timer;        // 上报心跳
 static rt_timer_t nt26k_upload_timer; // 更新本地时间定时器
 static rt_timer_t nt26k_error_timer;  // 上电失败情况下启动定时器
@@ -1580,6 +1581,10 @@ int BSP_Nt26k_Thread_Init(void)
     else
     {
         timeout = iot_upload_time * 60 * RT_TICK_PER_SECOND;
+        if (timeout >= RT_TICK_MAX / 2)//超了就直接默认值
+        {
+            timeout = 60 * 60 * RT_TICK_PER_SECOND;
+        }
     }
 
     LOG_I("上报服务器周期：%d分钟", iot_upload_time);