From c7114700ff135a6d826992a1804ad62c315f40db 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: Fri, 7 Feb 2025 15:21:03 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=87=8D=E8=BF=9E=E5=90=8E?= =?UTF-8?q?=E4=B8=8A=E6=8A=A5=E6=9C=8D=E5=8A=A1=E5=99=A8=E5=BF=83=E8=B7=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- applications/user_sys.h | 2 +- bsp/src/bsp_nt26k.c | 5 +++-- rt-thread/rtconfig.h | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/applications/user_sys.h b/applications/user_sys.h index e0d3406..d823194 100644 --- a/applications/user_sys.h +++ b/applications/user_sys.h @@ -20,7 +20,7 @@ #define MAX_EXPIRATION_DAYS (365 * MAX_EXPIRATION_YEARS + 30 * 3U) #define SYS_HW_VERSION (0X22U) -#define SYS_SW_VERSION (0X11U) +#define SYS_SW_VERSION (0X10U) #define SYS_IOT_UPLOAD_CYCLE_MIN (0X3C00U) // 高位在前，低位在后 #define SYS_IOT_RETRY (0X03U) #define SYS_TEMP_ALARM_THRESHOLD (0X30U) diff --git a/bsp/src/bsp_nt26k.c b/bsp/src/bsp_nt26k.c index 12df637..7c43cb0 100644 --- a/bsp/src/bsp_nt26k.c +++ b/bsp/src/bsp_nt26k.c @@ -1469,7 +1469,7 @@ static void Nt26k_Life_Thread_Entry(void *parameter) { LOG_D("重连网络中...\n"); nt26k_connect_sever_flag = 0; - resp = at_create_resp(128, 0, 5000); + resp = at_create_resp(128, 0, 5000); if (resp == RT_NULL) { LOG_E("No memory for response structure!"); @@ -1527,6 +1527,7 @@ static void Nt26k_Life_Thread_Entry(void *parameter) nt26k_conncet_tcp_flag = RT_TRUE; delay_n = 0; nt26k_disconnect_retry_flag = 0; + Nt26k_Send_Event(kNt26kHeartbeatEvent); at_delete_resp(resp); } else @@ -1556,7 +1557,7 @@ static void Nt26k_Life_Thread_Entry(void *parameter) { at_delete_resp(resp); } - + delay_n++; if (delay_n >= 360) // 连续重连大于1小时都不行，则重启设备 { diff --git a/rt-thread/rtconfig.h b/rt-thread/rtconfig.h index 7d09260..4662ee6 100644 --- a/rt-thread/rtconfig.h +++ b/rt-thread/rtconfig.h @@ -15,8 +15,8 @@ /*使用动态日志及密码功能时，需开启宏 FINSH_USING_AUTH ULOG_USING_FILTER ENABLE_LOG_ALL ULOG_OUTPUT_LVL = 7 以及设置ulog.c 1522行 输出等级为0*/ /**/ -// #define FINSH_USING_AUTH //开启终端密码登录功能 -// #define ULOG_USING_FILTER //开启动态修改日志等级 默认修改在ulog.c 1522行 +#define FINSH_USING_AUTH //开启终端密码登录功能 +#define ULOG_USING_FILTER //开启动态修改日志等级 默认修改在ulog.c 1522行 #define ENABLE_LOG_ALL #define TEST_ENABLE //打开所有的终端测试程序