From 71cbb44efde5f9bea8ff927c5484d176e40abcc7 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, 17 Jan 2025 15:18:12 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E4=BA=86=E5=BD=93=E5=9C=A8=E5=B9=B3?= =?UTF-8?q?=E5=8F=B0=E6=9C=AA=E6=B3=A8=E5=86=8CIMEI=E5=8F=B7=E6=97=B6,?= =?UTF-8?q?=E7=BB=BF=E7=81=AF=E9=97=AA=E7=83=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bsp/inc/bsp_nt26k.h | 1 + bsp/src/bsp_led.c | 8 ++++---- bsp/src/bsp_nt26k.c | 6 +++++- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/bsp/inc/bsp_nt26k.h b/bsp/inc/bsp_nt26k.h index 3038183..f276f9c 100644 --- a/bsp/inc/bsp_nt26k.h +++ b/bsp/inc/bsp_nt26k.h @@ -205,6 +205,7 @@ extern rt_sem_t nt26k_recv_sem; extern rt_sem_t nt26k_recv_heart_sem; extern rt_sem_t nt26k_disconnect_sem; extern rt_uint8_t nt26k_conncet_tcp_flag; +extern rt_uint8_t nt26k_connect_sever_flag; extern rt_uint8_t nt26k_disconnect_pdp_flag; extern rt_uint8_t power_on_send_flag; int BSP_Nt26k_Thread_Init(void); diff --git a/bsp/src/bsp_led.c b/bsp/src/bsp_led.c index c1bf4f3..143ee94 100644 --- a/bsp/src/bsp_led.c +++ b/bsp/src/bsp_led.c @@ -27,11 +27,11 @@ static void BSP_Led_thread_entry(void *param) { if (SysControl.status == kNormalDetectionEvents) { - if ((nt26k_conncet_tcp_flag)) + if ((nt26k_conncet_tcp_flag == 1) && nt26k_connect_sever_flag == 1) { LED_G_NORMAL; } - else if ((!nt26k_conncet_tcp_flag)) + else { LED_STOP(r); LED_STOP(g); @@ -46,7 +46,7 @@ static void BSP_Led_thread_entry(void *param) { if (SysControl.last_status == kNormalDetectionEvents) { - if ((nt26k_conncet_tcp_flag)) + if ((nt26k_conncet_tcp_flag == 1) && nt26k_connect_sever_flag == 1) { LED_G_NORMAL; } @@ -62,7 +62,7 @@ static void BSP_Led_thread_entry(void *param) } } } - rt_thread_mdelay(1000); + rt_thread_mdelay(1); } } int BSP_LED_Init(void) diff --git a/bsp/src/bsp_nt26k.c b/bsp/src/bsp_nt26k.c index 1187f89..5045d56 100644 --- a/bsp/src/bsp_nt26k.c +++ b/bsp/src/bsp_nt26k.c @@ -2,7 +2,7 @@ * @Author: mbw * @Date: 2024-10-09 08:42:14 * @LastEditors: mbw && 1600520629@qq.com - * @LastEditTime: 2025-01-17 14:10:00 + * @LastEditTime: 2025-01-17 15:04:55 * @FilePath: \JT-DT-YD4N02A_RTT_MRS-NT26K\bsp\src\bsp_nt26k.c * @Description: * @@ -45,6 +45,7 @@ #define NT26K_LIFE_THREAD_PRIORITY 26 #define NT26K_LIFE_THREAD_TICKS 10 + // static rt_uint32_t nt26k_status = 0; ALIGN(RT_ALIGN_SIZE) static char nt26k_thread_stack[NT26K_THREAD_STACK_SIZE]; @@ -66,6 +67,7 @@ static rt_timer_t nt26k_timer; // 上报心跳 static rt_timer_t nt26k_upload_timer; // 更新本地时间定时器 static rt_timer_t nt26k_power_error_timer; // 上电失败情况下启动定时器 +rt_uint8_t nt26k_connect_sever_flag; rt_uint8_t nt26k_conncet_tcp_flag; rt_uint8_t nt26k_disconnect_pdp_flag; // PDP断开连接标志 rt_uint8_t nt26k_disconnect_retry_flag = 0; // 用于判断是否已经启动了重连，如果启动，不需要每次都进入 @@ -811,6 +813,7 @@ int Nt26k_Process_Events(Nt26kEvent nt26k_recv_event, struct at_device *device, if (rt_sem_take(nt26k_recv_heart_sem, 5000) == RT_EOK) { LOG_D("收到心跳回复\n"); + nt26k_connect_sever_flag = 1; return RT_EOK; // 函数执行完毕，返回0 } else @@ -818,6 +821,7 @@ int Nt26k_Process_Events(Nt26kEvent nt26k_recv_event, struct at_device *device, LOG_E("nt26k send cmd failed\n"); // 收不到说明断网了，重连下10s后再发送 LOG_D("rt_sem_release (nt26k_disconnect_sem)"); nt26k_conncet_tcp_flag = 0; + nt26k_connect_sever_flag =0; rt_thread_mdelay(1); rt_sem_release(nt26k_disconnect_sem); rt_thread_mdelay(5000);