Merge branch 'feature/br_board_usb_init_refactor' into 'main'

feat(BR): USB console init refactor See merge request espressif/esp-thread-br!87
espressif · Nov 20, 2023 · b96fbd8 · b96fbd8
2 parents 43d3326 + 2cda31a
commit b96fbd8
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 74 deletions.
diff --git a/docs/en/dev-guide/build_and_run.rst b/docs/en/dev-guide/build_and_run.rst
@@ -11,7 +11,7 @@ Clone the `esp-idf <https://github.com/espressif/esp-idf>`_ and the `esp-thread-
 
 .. code-block:: bash
 
-   git clone -b v5.1.1 --recursive https://github.com/espressif/esp-idf.git
+   git clone -b v5.1.2 --recursive https://github.com/espressif/esp-idf.git
    
 .. code-block:: bash
 

diff --git a/examples/basic_thread_border_router/main/esp_ot_config.h b/examples/basic_thread_border_router/main/esp_ot_config.h
@@ -77,6 +77,7 @@
         .target_chip = ESP32H2_CHIP,                                                                                 \
     }
 
+#if CONFIG_OPENTHREAD_CONSOLE_TYPE_UART
 #define ESP_OPENTHREAD_DEFAULT_HOST_CONFIG()                   \
     {                                                          \
         .host_connection_mode = HOST_CONNECTION_MODE_CLI_UART, \
@@ -96,6 +97,13 @@
             .tx_pin = UART_PIN_NO_CHANGE,                      \
         },                                                     \
     }
+#elif CONFIG_OPENTHREAD_CONSOLE_TYPE_USB_SERIAL_JTAG
+#define ESP_OPENTHREAD_DEFAULT_HOST_CONFIG()                        \
+    {                                                               \
+        .host_connection_mode = HOST_CONNECTION_MODE_CLI_USB,       \
+        .host_usb_config = USB_SERIAL_JTAG_DRIVER_CONFIG_DEFAULT(), \
+    }
+#endif
 
 #define ESP_OPENTHREAD_DEFAULT_PORT_CONFIG()                                            \
     {                                                                                   \

diff --git a/examples/basic_thread_border_router/sdkconfig.defaults b/examples/basic_thread_border_router/sdkconfig.defaults
@@ -52,6 +52,7 @@ CONFIG_OPENTHREAD_ENABLED=y
 CONFIG_OPENTHREAD_BORDER_ROUTER=y
 CONFIG_OPENTHREAD_TREL=y
 CONFIG_OPENTHREAD_CLI_OTA=y
+CONFIG_OPENTHREAD_CONSOLE_TYPE_USB_SERIAL_JTAG=y
 # end of OpenThread
 
 #
@@ -107,4 +108,4 @@ CONFIG_EXAMPLE_ETH_SPI_CLOCK_MHZ=36
 CONFIG_EXAMPLE_ETH_SPI_INT_GPIO=39
 CONFIG_EXAMPLE_ETH_PHY_RST_GPIO=40
 CONFIG_EXAMPLE_ETH_PHY_ADDR=1
-# end of Etherenet
+# end of Etherenet
diff --git a/examples/common/border_router_board/CMakeLists.txt b/examples/common/border_router_board/CMakeLists.txt
diff --git a/examples/common/border_router_board/include/border_router_board.h b/examples/common/border_router_board/include/border_router_board.h
diff --git a/examples/common/border_router_board/src/border_router_board.c b/examples/common/border_router_board/src/border_router_board.c
diff --git a/examples/common/thread_border_router/CMakeLists.txt b/examples/common/thread_border_router/CMakeLists.txt
@@ -1,4 +1,4 @@
-set(requires esp_ot_cli_extension openthread vfs border_router_board)
+set(requires esp_ot_cli_extension openthread vfs)
 
 if(CONFIG_OPENTHREAD_CLI_OTA)
     list(APPEND requires esp_http_client esp_br_http_ota)

diff --git a/examples/common/thread_border_router/src/border_router_launch.c b/examples/common/thread_border_router/src/border_router_launch.c
@@ -6,7 +6,6 @@
  */
 
 #include "border_router_launch.h"
-#include "border_router_board.h"
 
 #include <assert.h>
 #include <stdio.h>
@@ -94,7 +93,6 @@ static void ot_task_worker(void *ctx)
     assert(openthread_netif != NULL);
 
     // Initialize the OpenThread stack
-    ESP_ERROR_CHECK(border_router_board_init());
     esp_openthread_register_rcp_failure_handler(rcp_failure_handler);
     ESP_ERROR_CHECK(esp_openthread_init(&s_openthread_platform_config));