Просмотр исходного кода

Merge branch 'bugfix/controller_hci_uart_sdkconfig_v4.3' into 'release/v4.3'

Bugfix/controller hci uart sdkconfig(backport v4.3)

See merge request espressif/esp-idf!14807
Wang Meng Yang 4 лет назад
Родитель
Сommit
90ef051d16

+ 0 - 0
examples/bluetooth/hci/controller_hci_uart/CMakeLists.txt → examples/bluetooth/hci/controller_hci_uart_esp32/CMakeLists.txt


+ 0 - 0
examples/bluetooth/hci/controller_hci_uart/Makefile → examples/bluetooth/hci/controller_hci_uart_esp32/Makefile


+ 0 - 0
examples/bluetooth/hci/controller_hci_uart/README.md → examples/bluetooth/hci/controller_hci_uart_esp32/README.md


+ 0 - 0
examples/bluetooth/hci/controller_hci_uart/main/CMakeLists.txt → examples/bluetooth/hci/controller_hci_uart_esp32/main/CMakeLists.txt


+ 0 - 0
examples/bluetooth/hci/controller_hci_uart/main/component.mk → examples/bluetooth/hci/controller_hci_uart_esp32/main/component.mk


+ 5 - 5
examples/bluetooth/hci/controller_hci_uart/main/controller_hci_uart_demo.c → examples/bluetooth/hci/controller_hci_uart_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
 }
 

+ 4 - 3
examples/bluetooth/hci/controller_hci_uart/sdkconfig.defaults → examples/bluetooth/hci/controller_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