Merge branch 'bugfix/controller_hci_uart_sdkconfig' into 'master'

controller_hci_uart: fixed the use of deprecated sdkconfig options in the example and rename the example Closes BT-1907 See merge request espressif/esp-idf!14800
espressif · Oct 8, 2021 · 76a4410 · 76a4410
2 parents a5ba1ac + ef2a871
commit 76a4410
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 8 deletions.
diff --git a/...th/hci/controller_hci_uart/CMakeLists.txt → .../controller_hci_uart_esp32/CMakeLists.txt b/...th/hci/controller_hci_uart/CMakeLists.txt → .../controller_hci_uart_esp32/CMakeLists.txt
diff --git a/...luetooth/hci/controller_hci_uart/Makefile → ...th/hci/controller_hci_uart_esp32/Makefile b/...luetooth/hci/controller_hci_uart/Makefile → ...th/hci/controller_hci_uart_esp32/Makefile
diff --git a/...uetooth/hci/controller_hci_uart/README.md → ...h/hci/controller_hci_uart_esp32/README.md b/...uetooth/hci/controller_hci_uart/README.md → ...h/hci/controller_hci_uart_esp32/README.md
diff --git a/...i/controller_hci_uart/main/CMakeLists.txt → ...roller_hci_uart_esp32/main/CMakeLists.txt b/...i/controller_hci_uart/main/CMakeLists.txt → ...roller_hci_uart_esp32/main/CMakeLists.txt
diff --git a/...hci/controller_hci_uart/main/component.mk → ...ntroller_hci_uart_esp32/main/component.mk b/...hci/controller_hci_uart/main/component.mk → ...ntroller_hci_uart_esp32/main/component.mk
diff --git a/..._hci_uart/main/controller_hci_uart_demo.c → ...art_esp32/main/controller_hci_uart_demo.c b/..._hci_uart/main/controller_hci_uart_demo.c → ...art_esp32/main/controller_hci_uart_demo.c
@@ -19,17 +19,17 @@ static const char *tag = "CONTROLLER_UART_HCI";
 
 static void uart_gpio_reset(void)
 {
-#if CONFIG_BT_HCI_UART_NO == 1
+#if CONFIG_BTDM_CTRL_HCI_UART_NO == 1
     periph_module_enable(PERIPH_UART1_MODULE);
-#elif CONFIG_BT_HCI_UART_NO == 2
+#elif CONFIG_BTDM_CTRL_HCI_UART_NO == 2
     periph_module_enable(PERIPH_UART2_MODULE);
 #endif
     periph_module_enable(PERIPH_UHCI0_MODULE);
 
-#ifdef CONFIG_BT_HCI_UART_NO
-    ESP_LOGI(tag, "HCI UART%d Pin select: TX 5, RX, 18, CTS 23, RTS 19", CONFIG_BT_HCI_UART_NO);
+#ifdef CONFIG_BTDM_CTRL_HCI_UART_NO
+    ESP_LOGI(tag, "HCI UART%d Pin select: TX 5, RX, 18, CTS 23, RTS 19", CONFIG_BTDM_CTRL_HCI_UART_NO);
 
-    uart_set_pin(CONFIG_BT_HCI_UART_NO, 5, 18, 19, 23);
+    uart_set_pin(CONFIG_BTDM_CTRL_HCI_UART_NO, 5, 18, 19, 23);
 #endif
 }
 

diff --git a/...ci/controller_hci_uart/sdkconfig.defaults → ...troller_hci_uart_esp32/sdkconfig.defaults b/...ci/controller_hci_uart/sdkconfig.defaults → ...troller_hci_uart_esp32/sdkconfig.defaults
@@ -13,6 +13,7 @@ CONFIG_BTDM_CTRL_BR_EDR_MAX_ACL_CONN=7
 CONFIG_BTDM_CTRL_BR_EDR_MAX_SYNC_CONN=3
 CONFIG_BT_BLUEDROID_ENABLED=n
 CONFIG_BT_CONTROLLER_ONLY=y
-CONFIG_BT_HCI_UART=y
-CONFIG_BT_HCI_UART_NO_DEFAULT=1
-CONFIG_BT_HCI_UART_BAUDRATE_DEFAULT=921600
+CONFIG_BTDM_CTRL_HCI_MODE_UART_H4=y
+CONFIG_BTDM_CTRL_HCI_UART_NO=1
+CONFIG_BTDM_CTRL_HCI_UART_BAUDRATE=921600
+CONFIG_BTDM_CTRL_MODEM_SLEEP=n