Merge branch 'fix/esp_at_ready' into 'master'

fix: Fixed the issue where at cannot work immediately after restart and prompt ready See merge request application/esp-at!1514
espressif · Jan 30, 2024 · 5591f3b · 5591f3b
2 parents 8f09599 + 4bbfa04
commit 5591f3b
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 24 deletions.
diff --git a/components/at/src/at_init.c b/components/at/src/at_init.c
@@ -25,6 +25,7 @@
 const char *g_at_mfg_nvs_name = "mfg_nvs";
 
 // static variables
+static const char *s_ready_str = "\r\nready\r\n";
 static at_mfg_params_storage_mode_t s_at_param_mode = AT_PARAMS_NONE;
 static const char *TAG = "at-init";
 
@@ -266,6 +267,11 @@ static void at_nvs_flash_init_partition(void)
     printf("at param mode: %d\r\n", s_at_param_mode);
 }
 
+static void esp_at_ready(void)
+{
+    esp_at_port_active_write_data((uint8_t *)s_ready_str, strlen(s_ready_str));
+}
+
 void esp_at_init(void)
 {
     // initialize the manufacturing nvs partition
@@ -305,5 +311,6 @@ void esp_at_init(void)
     at_cmd_set_terminator(CONFIG_AT_COMMAND_TERMINATOR);
 #endif
 
+    esp_at_ready();
     ESP_LOGD(TAG, "esp_at_init done");
 }
diff --git a/main/interface/at_interface_api.c b/main/interface/at_interface_api.c
@@ -12,7 +12,6 @@
 #include "esp_at_core.h"
 
 // static variables
-static const char *s_ready_str = "\r\nready\r\n";
 static esp_at_device_ops_struct s_interface_ops;
 static esp_at_custom_ops_struct s_interface_hooks;
 static const char *TAG = "at-intf";
@@ -133,9 +132,3 @@ void at_interface_hooks(esp_at_custom_ops_struct *if_hooks)
     };
     esp_at_custom_ops_regist(&at_hooks);
 }
-
-void esp_at_ready(void)
-{
-    esp_at_port_active_write_data((uint8_t *)s_ready_str, strlen(s_ready_str));
-    ESP_LOGD(TAG, "AT interface ready");
-}
diff --git a/main/interface/include/esp_at_interface.h b/main/interface/include/esp_at_interface.h
@@ -48,8 +48,3 @@ void at_interface_ops_init(esp_at_device_ops_struct *ops);
  *              - not NULL: use the system-hooks and the interface-hooks.
 */
 void at_interface_hooks(esp_at_custom_ops_struct *if_hooks);
-
-/**
- * @brief This function is used to notify MCU that the esp-at is ready.
-*/
-void esp_at_ready(void);
diff --git a/main/interface/sdio/at_sdio_task.c b/main/interface/sdio/at_sdio_task.c
@@ -212,9 +212,6 @@ void at_interface_init(void)
 
     // init interface hooks
     at_interface_hooks(NULL);
-
-    // esp-at is ready
-    esp_at_ready();
 }
 
 #endif
diff --git a/main/interface/socket/at_socket_task.c b/main/interface/socket/at_socket_task.c
@@ -236,9 +236,6 @@ void at_interface_init(void)
         .pre_active_write_data_callback = NULL,
     };
     at_interface_hooks(&socket_hooks);
-
-    // interface ready
-    esp_at_ready();
 }
 
 #endif
diff --git a/main/interface/spi/at_spi_task.c b/main/interface/spi/at_spi_task.c
@@ -348,9 +348,6 @@ void at_interface_init(void)
 
     // init interface hooks
     at_interface_hooks(NULL);
-
-    // interface ready
-    esp_at_ready();
 }
 
 #endif
diff --git a/main/interface/uart/at_uart_task.c b/main/interface/uart/at_uart_task.c
@@ -281,9 +281,6 @@ void at_interface_init(void)
         .pre_active_write_data_callback = NULL,
     };
     at_interface_hooks(&uart_hooks);
-
-    // interface ready
-    esp_at_ready();
 }
 
 #endif