From 371e8b0737ad40421ca03b22d5470fab8621b459 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 15:03:19 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=86=E6=81=A2=E5=A4=8D=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?=E5=8F=91=E9=80=813=E6=AC=A1=E5=A4=B1=E8=B4=A5=E9=87=8D?= =?UTF-8?q?=E6=96=B0=E5=8F=91=E9=80=81=E5=8E=BB=E6=8E=89=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bsp/src/at_device_nt26k.c | 4 +++- bsp/src/bsp_nt26k.c | 8 -------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/bsp/src/at_device_nt26k.c b/bsp/src/at_device_nt26k.c index d1c156c..86730a6 100644 --- a/bsp/src/at_device_nt26k.c +++ b/bsp/src/at_device_nt26k.c @@ -363,7 +363,9 @@ static int at_device_nt26k_connect_tcp(struct at_device *device) int at_send_data(struct at_device *device, const char *data, rt_size_t size) { +rt_mutex_take(nt26k_mutex, RT_WAITING_FOREVER); #define NT26K_SEND_RESP_TIME (3000) + const char *line_buffer = RT_NULL; at_response_t resp = at_create_resp(AT_CLIENT_RECV_BUFF_LEN, 2, NT26K_SEND_RESP_TIME); if (resp == RT_NULL) @@ -372,7 +374,7 @@ int at_send_data(struct at_device *device, const char *data, rt_size_t size) at_delete_resp(resp); return -RT_ERROR; } - rt_mutex_take(nt26k_mutex, RT_WAITING_FOREVER); + if (at_obj_exec_cmd(device->client, resp, TCP_SEND_DATA, socket_id, data) == RT_EOK) { if ((line_buffer = at_resp_get_line(resp, 2)) != RT_NULL) diff --git a/bsp/src/bsp_nt26k.c b/bsp/src/bsp_nt26k.c index e2191ad..34e5e51 100644 --- a/bsp/src/bsp_nt26k.c +++ b/bsp/src/bsp_nt26k.c @@ -1336,10 +1336,6 @@ static void Nt26k_Send_Thread_Entry(void *param) if (result != RT_EOK) { LOG_E("nt26k send data failed result = [%d]\n", result); - if (SysControl.status == kAlarmRcyEvent) - { - Nt26k_Send_Event(kNt26kAlarmRcyEvent); - } } } else if (nt26k_recv_event & Nt26k_Get_Event_Flag(kNt26kFaultEvent)) @@ -1360,10 +1356,6 @@ static void Nt26k_Send_Thread_Entry(void *param) if (result != RT_EOK) { LOG_E("nt26k send data failed result = [%d]\n", result); - if (SysControl.status == kFaultRcyEvent) - { - Nt26k_Send_Event(kNt26kFaultRcyEvent); - } } } else if (nt26k_recv_event & Nt26k_Get_Event_Flag(kNt26kSelfCheckEvent))