[components][at] 适配new serialv2不再判断RTT版本号

Author: Ryan-CW-Code

components/net/at/include/at.h

@@ -91,7 +91,7 @@ struct at_server
     char recv_buffer[AT_SERVER_RECV_BUFF_LEN];
     rt_size_t cur_recv_len;
 
-#if (!defined(RT_USING_SERIAL_V2) || RT_VER_NUM < 0x50200)
+#if (!defined(RT_USING_SERIAL_V2))
     rt_sem_t rx_notice;
 #endif
 
@@ -169,7 +169,7 @@ struct at_client
     /* The maximum supported receive data length */
     rt_size_t recv_bufsz;
 
-#if (!defined(RT_USING_SERIAL_V2) || RT_VER_NUM < 0x50200)
+#if (!defined(RT_USING_SERIAL_V2))
     rt_sem_t rx_notice;
 #endif
 
@@ -229,6 +229,7 @@ int at_obj_set_urc_table(at_client_t client, const struct at_urc * table, rt_siz
 
 /* AT client send commands to AT server and waiter response */
 int at_obj_exec_cmd(at_client_t client, at_response_t resp, const char *cmd_expr, ...);
+int at_obj_exec_cmd_format(at_client_t client, at_response_t resp, const char* format, const char *cmd_expr, ...);
 
 /* AT response object create and delete */
 at_response_t at_create_resp(rt_size_t buf_size, rt_size_t line_num, rt_int32_t timeout);
@@ -249,6 +250,7 @@ int at_resp_parse_line_args_by_kw(at_response_t resp, const char *keyword, const
  */
 
 #define at_exec_cmd(resp, ...)                   at_obj_exec_cmd(at_client_get_first(), resp, __VA_ARGS__)
+#define at_exec_cmd_format(resp, format, ...)    at_obj_exec_cmd_format(at_client_get_first(), resp, format, __VA_ARGS__)
 #define at_client_wait_connect(timeout)          at_client_obj_wait_connect(at_client_get_first(), timeout)
 #define at_client_send(buf, size)                at_client_obj_send(at_client_get_first(), buf, size)
 #define at_client_recv(buf, size, timeout)       at_client_obj_recv(at_client_get_first(), buf, size, timeout)

components/net/at/src/at_client.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006-2024 RT-Thread Development Team
+ * Copyright (c) 2006-2025 RT-Thread Development Team
  *
  * SPDX-License-Identifier: Apache-2.0
  *
@@ -10,6 +10,8 @@
  * 2018-08-17     chenyong     multiple client support
  * 2021-03-17     Meco Man     fix a buf of leaking memory
  * 2021-07-14     Sszl         fix a buf of leaking memory
+ * 2025-01-02     dongly       support SERIAL_V2
+ * 2025-04-18     RyanCw       support New SERIAL_V2
  */
 
 #include <at.h>
@@ -19,13 +21,15 @@
 
 #define LOG_TAG              "at.clnt"
 #include <at_log.h>
-
 #ifdef AT_USING_CLIENT
 
 #define AT_RESP_END_OK                 "OK"
 #define AT_RESP_END_ERROR              "ERROR"
 #define AT_RESP_END_FAIL               "FAIL"
 #define AT_END_CR_LF                   "\r\n"
+#define AT_END_CR                      "\r"
+#define AT_END_LF                      "\n"
+#define AT_END_RAW                     ""
 
 static struct at_client at_client_table[AT_CLIENT_NUM_MAX] = { 0 };
 
@@ -34,6 +38,9 @@ extern rt_size_t at_utils_send(rt_device_t dev,
                                const void *buffer,
                                rt_size_t   size);
 extern rt_size_t at_vprintfln(rt_device_t device, char *send_buf, rt_size_t buf_size, const char *format, va_list args);
+extern rt_size_t at_vprintf(rt_device_t device, char *send_buf, rt_size_t buf_size, const char *format, va_list args);
+extern rt_size_t at_vprintfcr(rt_device_t device, char *send_buf, rt_size_t buf_size, const char *format, va_list args);
+extern rt_size_t at_vprintflf(rt_device_t device, char *send_buf, rt_size_t buf_size, const char *format, va_list args);
 extern void at_print_raw_cmd(const char *type, const char *cmd, rt_size_t size);
 
 /**
@@ -219,7 +226,8 @@ int at_resp_parse_line_args(at_response_t resp, rt_size_t resp_line, const char
     RT_ASSERT(resp);
     RT_ASSERT(resp_expr);
 
-    if ((resp_line_buf = at_resp_get_line(resp, resp_line)) == RT_NULL)
+    resp_line_buf = at_resp_get_line(resp, resp_line);
+    if (resp_line_buf == RT_NULL)
     {
         return -1;
     }
@@ -253,7 +261,8 @@ int at_resp_parse_line_args_by_kw(at_response_t resp, const char *keyword, const
     RT_ASSERT(resp);
     RT_ASSERT(resp_expr);
 
-    if ((resp_line_buf = at_resp_get_line_by_kw(resp, keyword)) == RT_NULL)
+    resp_line_buf = at_resp_get_line_by_kw(resp, keyword);
+    if (resp_line_buf == RT_NULL)
     {
         return -1;
     }
@@ -341,6 +350,97 @@ int at_obj_exec_cmd(at_client_t client, at_response_t resp, const char *cmd_expr
     return result;
 }
 
+/**
+ * Send commands through custom formatting to AT server and wait response.
+ *
+ * @param client current AT client object
+ * @param resp AT response object, using RT_NULL when you don't care response
+ * @param format formatting macro, it can be one of these values: AT_END_CR_LF, AT_END_RAW, AT_END_CR, AT_END_LF.
+ *               Behavior of AT_END_CR_LF is same as at_obj_exec_cmd, and it will add \r\n symnbol behind message.
+ *               AT_END_RAW means frame work won't modify anything of message. AT_END_CR will add \r for Carriage
+ *               Return. AT_END_LF means add \\n for Line Feed.
+ * @param cmd_expr AT commands expression
+ *
+ * @return 0 : success
+ *        -1 : response status error
+ *        -2 : wait timeout
+ *        -7 : enter AT CLI mode
+ */
+int at_obj_exec_cmd_format(at_client_t client, at_response_t resp, const char* format, const char *cmd_expr, ...)
+{
+    va_list args;
+    rt_err_t result = RT_EOK;
+
+    RT_ASSERT(cmd_expr);
+
+    if (client == RT_NULL)
+    {
+        LOG_E("input AT Client object is NULL, please create or get AT Client object!");
+        return -RT_ERROR;
+    }
+
+    /* check AT CLI mode */
+    if (client->status == AT_STATUS_CLI && resp)
+    {
+        return -RT_EBUSY;
+    }
+
+    rt_mutex_take(client->lock, RT_WAITING_FOREVER);
+
+    client->resp_status = AT_RESP_OK;
+
+    if (resp != RT_NULL)
+    {
+        resp->buf_len = 0;
+        resp->line_counts = 0;
+    }
+
+    client->resp = resp;
+    rt_sem_control(client->resp_notice, RT_IPC_CMD_RESET, RT_NULL);
+
+    va_start(args, cmd_expr);
+
+    if (strcmp(format, AT_END_CR_LF) == 0)
+    {
+        client->last_cmd_len = at_vprintfln(client->device, client->send_buf, client->send_bufsz, cmd_expr, args);
+    }
+    else if (strcmp(format, AT_END_RAW) == 0)
+    {
+        client->last_cmd_len = at_vprintf(client->device, client->send_buf, client->send_bufsz, cmd_expr, args);
+    }
+    else if (strcmp(format, AT_END_CR) == 0)
+    {
+        client->last_cmd_len = at_vprintfcr(client->device, client->send_buf, client->send_bufsz, cmd_expr, args);
+    }
+    else if (strcmp(format, AT_END_LF) == 0)
+    {
+        client->last_cmd_len = at_vprintflf(client->device, client->send_buf, client->send_bufsz, cmd_expr, args);
+    }
+
+    va_end(args);
+
+    if (resp != RT_NULL)
+    {
+        if (rt_sem_take(client->resp_notice, resp->timeout) != RT_EOK)
+        {
+            LOG_W("execute command (%.*s) timeout (%d ticks)!", client->last_cmd_len, client->send_buf, resp->timeout);
+            client->resp_status = AT_RESP_TIMEOUT;
+            result = -RT_ETIMEOUT;
+        }
+        else if (client->resp_status != AT_RESP_OK)
+        {
+            LOG_E("execute command (%.*s) failed!", client->last_cmd_len, client->send_buf);
+            result = -RT_ERROR;
+        }
+    }
+
+    client->resp = RT_NULL;
+
+    rt_mutex_release(client->lock);
+
+    return result;
+}
+
 /**
  * Waiting for connection to external devices.
  *
@@ -444,7 +544,7 @@ static rt_err_t at_client_getchar(at_client_t client, char *ch, rt_int32_t timeo
 {
     rt_err_t result = RT_EOK;
 
-#if (!defined(RT_USING_SERIAL_V2) || RT_VER_NUM < 0x50200)
+#if (!defined(RT_USING_SERIAL_V2))
     while (rt_device_read(client->device, 0, ch, 1) == 0)
     {
         result = rt_sem_take(client->rx_notice, rt_tick_from_millisecond(timeout));
@@ -495,7 +595,7 @@ rt_size_t at_client_obj_recv(at_client_t client, char *buf, rt_size_t size, rt_i
         return 0;
     }
 
-#if (!defined(RT_USING_SERIAL_V2) || RT_VER_NUM < 0x50200)
+#if (!defined(RT_USING_SERIAL_V2))
     while (size)
     {
         rt_size_t read_len;
@@ -703,7 +803,8 @@ static int at_recv_readline(at_client_t client)
         }
 
         /* is newline or URC data */
-        if ((client->urc = get_urc_obj(client)) != RT_NULL || (ch == '\n' && last_ch == '\r')
+        client->urc = get_urc_obj(client);
+        if (client->urc != RT_NULL || (ch == '\n' && last_ch == '\r')
                 || (client->end_sign != 0 && ch == client->end_sign))
         {
             if (is_full)
@@ -800,7 +901,7 @@ static void client_parser(at_client_t client)
     }
 }
 
-#if (!defined(RT_USING_SERIAL_V2) || RT_VER_NUM < 0x50200)
+#if (!defined(RT_USING_SERIAL_V2))
 static rt_err_t at_client_rx_ind(rt_device_t dev, rt_size_t size)
 {
     int idx = 0;
@@ -858,7 +959,7 @@ static int at_client_para_init(at_client_t client)
         goto __exit;
     }
 
-#if (!defined(RT_USING_SERIAL_V2) || RT_VER_NUM < 0x50200)
+#if (!defined(RT_USING_SERIAL_V2))
     rt_snprintf(name, RT_NAME_MAX, "%s%d", AT_CLIENT_SEM_NAME, at_client_num);
     client->rx_notice = rt_sem_create(name, 0, RT_IPC_FLAG_FIFO);
     if (client->rx_notice == RT_NULL)
@@ -886,7 +987,8 @@ static int at_client_para_init(at_client_t client)
                                      (void (*)(void *parameter))client_parser,
                                      client,
                                      1024 + 512,
-                                     RT_THREAD_PRIORITY_MAX / 3 - 1,
+                                     6,
+                                    /*  RT_THREAD_PRIORITY_MAX / 3 - 1,*/
                                      5);
     if (client->parser == RT_NULL)
     {
@@ -901,7 +1003,7 @@ static int at_client_para_init(at_client_t client)
             rt_mutex_delete(client->lock);
         }
 
-#if (!defined(RT_USING_SERIAL_V2) || RT_VER_NUM < 0x50200)
+#if (!defined(RT_USING_SERIAL_V2))
         if (client->rx_notice)
         {
             rt_sem_delete(client->rx_notice);
@@ -984,7 +1086,7 @@ int at_client_init(const char *dev_name, rt_size_t recv_bufsz, rt_size_t send_bu
     if (client->device)
     {
         RT_ASSERT(client->device->type == RT_Device_Class_Char);
-#if (!defined(RT_USING_SERIAL_V2) || RT_VER_NUM < 0x50200)
+#if (!defined(RT_USING_SERIAL_V2))
         rt_device_set_rx_indicate(client->device, at_client_rx_ind);
         /* using DMA mode first */
         open_result = rt_device_open(client->device, RT_DEVICE_OFLAG_RDWR | RT_DEVICE_FLAG_DMA_RX);
@@ -1021,4 +1123,4 @@ int at_client_init(const char *dev_name, rt_size_t recv_bufsz, rt_size_t send_bu
 
     return result;
 }
-#endif /* AT_USING_CLIENT */
+#endif /* AT_USING_CLIENT */

components/net/at/src/at_server.c

@@ -1,12 +1,14 @@
 /*
- * Copyright (c) 2006-2024 RT-Thread Development Team
+ * Copyright (c) 2006-2025, RT-Thread Development Team
  *
  * SPDX-License-Identifier: Apache-2.0
  *
  * Change Logs:
  * Date           Author       Notes
  * 2018-03-30     chenyong     first version
  * 2018-04-14     chenyong     modify parse arguments
+ * 2025-01-02     dongly       support SERIAL_V2
+ * 2025-04-18     RyanCw       support New SERIAL_V2
  */
 
 #include <at.h>
@@ -222,23 +224,24 @@ rt_size_t at_server_recv(at_server_t server, char *buf, rt_size_t size, rt_int32
         return 0;
     }
 
-#if (!defined(RT_USING_SERIAL_V2) || RT_VER_NUM < 0x50200)
-    while (size)
+#if (!defined(RT_USING_SERIAL_V2))
+    while (1)
     {
-        rt_size_t read_len;
-
-        rt_sem_control(server->rx_notice, RT_IPC_CMD_RESET, RT_NULL);
-
-        read_len = rt_device_read(server->device, 0, buf + read_idx, size);
-        if (read_len > 0)
+        if (read_idx < size)
         {
-            read_idx += read_len;
-            size -= read_len;
+            /* check get data value */
+            result = server->get_char(server, &ch, timeout);
+            if (result != RT_EOK)
+            {
+                LOG_E("AT Server receive failed, uart device get data error.");
+                return 0;
+            }
+
+            buf[read_idx++] = ch;
         }
         else
         {
-            if (rt_sem_take(server->rx_notice, rt_tick_from_millisecond(timeout)) != RT_EOK)
-                break;
+            break;
         }
     }
 #else
@@ -417,7 +420,7 @@ static rt_err_t at_server_getchar(at_server_t server, char *ch, rt_int32_t timeo
 {
     rt_err_t result = RT_EOK;
 
-#if (!defined(RT_USING_SERIAL_V2) || RT_VER_NUM < 0x50200)
+#if (!defined(RT_USING_SERIAL_V2))
     while (rt_device_read(at_server_local->device, 0, ch, 1) == 0)
     {
         result = rt_sem_take(at_server_local->rx_notice, rt_tick_from_millisecond(timeout));
@@ -515,7 +518,7 @@ static void server_parser(at_server_t server)
     }
 }
 
-#if (!defined(RT_USING_SERIAL_V2) || RT_VER_NUM < 0x50200)
+#if (!defined(RT_USING_SERIAL_V2))
 static rt_err_t at_rx_ind(rt_device_t dev, rt_size_t size)
 {
     if (size > 0)
@@ -571,7 +574,7 @@ int at_server_init(void)
     rt_memset(at_server_local->recv_buffer, 0x00, AT_SERVER_RECV_BUFF_LEN);
     at_server_local->cur_recv_len = 0;
 
-#if (!defined(RT_USING_SERIAL_V2) || RT_VER_NUM < 0x50200)
+#if (!defined(RT_USING_SERIAL_V2))
     at_server_local->rx_notice = rt_sem_create("at_svr", 0, RT_IPC_FLAG_FIFO);
     if (!at_server_local->rx_notice)
     {
@@ -586,7 +589,7 @@ int at_server_init(void)
     if (at_server_local->device)
     {
         RT_ASSERT(at_server_local->device->type == RT_Device_Class_Char);
-#if (!defined(RT_USING_SERIAL_V2) || RT_VER_NUM < 0x50200)
+#if (!defined(RT_USING_SERIAL_V2))
         rt_device_set_rx_indicate(at_server_local->device, at_rx_ind);
         /* using DMA mode first */
         open_result = rt_device_open(at_server_local->device, RT_DEVICE_OFLAG_RDWR | RT_DEVICE_FLAG_DMA_RX);
@@ -636,7 +639,7 @@ int at_server_init(void)
         if (at_server_local)
         {
 
-#if (!defined(RT_USING_SERIAL_V2) || RT_VER_NUM < 0x50200)
+#if (!defined(RT_USING_SERIAL_V2))
             if (at_server_local->rx_notice)
             {
                 rt_sem_delete(at_server_local->rx_notice);