diff --git a/components/soc/esp32/include/soc/Kconfig.soc_caps.in b/components/soc/esp32/include/soc/Kconfig.soc_caps.in index 1740e9988101..bc8600d9008f 100644 --- a/components/soc/esp32/include/soc/Kconfig.soc_caps.in +++ b/components/soc/esp32/include/soc/Kconfig.soc_caps.in @@ -855,6 +855,10 @@ config SOC_BLE_DEVICE_PRIVACY_SUPPORTED bool default n +config SOC_BLUFI_SUPPORTED + bool + default y + config SOC_ULP_HAS_ADC bool default y diff --git a/components/soc/esp32/include/soc/soc_caps.h b/components/soc/esp32/include/soc/soc_caps.h index 5d435ac348d3..7d568947db2b 100644 --- a/components/soc/esp32/include/soc/soc_caps.h +++ b/components/soc/esp32/include/soc/soc_caps.h @@ -417,6 +417,7 @@ #define SOC_BLE_MESH_SUPPORTED (1) /*!< Support BLE MESH */ #define SOC_BT_CLASSIC_SUPPORTED (1) /*!< Support Bluetooth Classic hardware */ #define SOC_BLE_DEVICE_PRIVACY_SUPPORTED (0) /*!< Support BLE device privacy mode */ +#define SOC_BLUFI_SUPPORTED (1) /*!< Support BLUFI */ /*-------------------------- ULP CAPS ----------------------------------------*/ #define SOC_ULP_HAS_ADC (1) /* ADC can be accessed from ULP */ diff --git a/components/soc/esp32c2/include/soc/Kconfig.soc_caps.in b/components/soc/esp32c2/include/soc/Kconfig.soc_caps.in index d5c5e16f75da..a30dbda08493 100644 --- a/components/soc/esp32c2/include/soc/Kconfig.soc_caps.in +++ b/components/soc/esp32c2/include/soc/Kconfig.soc_caps.in @@ -658,3 +658,7 @@ config SOC_BLE_50_SUPPORTED config SOC_BLE_DEVICE_PRIVACY_SUPPORTED bool default y + +config SOC_BLUFI_SUPPORTED + bool + default y diff --git a/components/soc/esp32c2/include/soc/soc_caps.h b/components/soc/esp32c2/include/soc/soc_caps.h index e12cee096b31..30a151cf818b 100644 --- a/components/soc/esp32c2/include/soc/soc_caps.h +++ b/components/soc/esp32c2/include/soc/soc_caps.h @@ -307,3 +307,4 @@ #define SOC_ESP_NIMBLE_CONTROLLER (1) /*!< Support BLE EMBEDDED controller V1 */ #define SOC_BLE_50_SUPPORTED (1) /*!< Support Bluetooth 5.0 */ #define SOC_BLE_DEVICE_PRIVACY_SUPPORTED (1) /*!< Support BLE device privacy mode */ +#define SOC_BLUFI_SUPPORTED (1) /*!< Support BLUFI */ diff --git a/components/soc/esp32c3/include/soc/Kconfig.soc_caps.in b/components/soc/esp32c3/include/soc/Kconfig.soc_caps.in index 82d591bd61c7..30200b3390fc 100644 --- a/components/soc/esp32c3/include/soc/Kconfig.soc_caps.in +++ b/components/soc/esp32c3/include/soc/Kconfig.soc_caps.in @@ -982,3 +982,7 @@ config SOC_BLE_50_SUPPORTED config SOC_BLE_DEVICE_PRIVACY_SUPPORTED bool default y + +config SOC_BLUFI_SUPPORTED + bool + default y diff --git a/components/soc/esp32c3/include/soc/soc_caps.h b/components/soc/esp32c3/include/soc/soc_caps.h index 7aa96138ca3a..468b00121c07 100644 --- a/components/soc/esp32c3/include/soc/soc_caps.h +++ b/components/soc/esp32c3/include/soc/soc_caps.h @@ -425,3 +425,4 @@ #define SOC_BLE_MESH_SUPPORTED (1) /*!< Support BLE MESH */ #define SOC_BLE_50_SUPPORTED (1) /*!< Support Bluetooth 5.0 */ #define SOC_BLE_DEVICE_PRIVACY_SUPPORTED (1) /*!< Support BLE device privacy mode */ +#define SOC_BLUFI_SUPPORTED (1) /*!< Support BLUFI */ diff --git a/components/soc/esp32c6/include/soc/Kconfig.soc_caps.in b/components/soc/esp32c6/include/soc/Kconfig.soc_caps.in index c6549ee53805..3b1d8501cf97 100644 --- a/components/soc/esp32c6/include/soc/Kconfig.soc_caps.in +++ b/components/soc/esp32c6/include/soc/Kconfig.soc_caps.in @@ -1238,3 +1238,7 @@ config SOC_BLE_DEVICE_PRIVACY_SUPPORTED config SOC_BLE_POWER_CONTROL_SUPPORTED bool default y + +config SOC_BLUFI_SUPPORTED + bool + default y diff --git a/components/soc/esp32c6/include/soc/soc_caps.h b/components/soc/esp32c6/include/soc/soc_caps.h index dbb699d51b37..aee39ee99a46 100644 --- a/components/soc/esp32c6/include/soc/soc_caps.h +++ b/components/soc/esp32c6/include/soc/soc_caps.h @@ -506,3 +506,4 @@ #define SOC_BLE_50_SUPPORTED (1) /*!< Support Bluetooth 5.0 */ #define SOC_BLE_DEVICE_PRIVACY_SUPPORTED (1) /*!< Support BLE device privacy mode */ #define SOC_BLE_POWER_CONTROL_SUPPORTED (1) /*!< Support Bluetooth Power Control */ +#define SOC_BLUFI_SUPPORTED (1) /*!< Support BLUFI */ diff --git a/components/soc/esp32s3/include/soc/Kconfig.soc_caps.in b/components/soc/esp32s3/include/soc/Kconfig.soc_caps.in index eec3270d249c..24f46814709a 100644 --- a/components/soc/esp32s3/include/soc/Kconfig.soc_caps.in +++ b/components/soc/esp32s3/include/soc/Kconfig.soc_caps.in @@ -1275,6 +1275,10 @@ config SOC_BLE_DEVICE_PRIVACY_SUPPORTED bool default y +config SOC_BLUFI_SUPPORTED + bool + default y + config SOC_ULP_HAS_ADC bool default y diff --git a/components/soc/esp32s3/include/soc/soc_caps.h b/components/soc/esp32s3/include/soc/soc_caps.h index 37e3e4f70987..075d8f93292c 100644 --- a/components/soc/esp32s3/include/soc/soc_caps.h +++ b/components/soc/esp32s3/include/soc/soc_caps.h @@ -515,6 +515,7 @@ #define SOC_BLE_MESH_SUPPORTED (1) /*!< Support BLE MESH */ #define SOC_BLE_50_SUPPORTED (1) /*!< Support Bluetooth 5.0 */ #define SOC_BLE_DEVICE_PRIVACY_SUPPORTED (1) /*!< Support BLE device privacy mode */ +#define SOC_BLUFI_SUPPORTED (1) /*!< Support BLUFI */ /*-------------------------- ULP CAPS ----------------------------------------*/ #define SOC_ULP_HAS_ADC (1) /* ADC can be accessed from ULP */ diff --git a/docs/conf_common.py b/docs/conf_common.py index 032488d9ff8b..4c86aca62e9c 100644 --- a/docs/conf_common.py +++ b/docs/conf_common.py @@ -19,8 +19,7 @@ if os.environ.get('IDF_PATH') is None: raise RuntimeError('IDF_PATH should be set, run export.sh before building docs') -BT_DOCS = ['api-guides/blufi.rst', - 'api-reference/bluetooth/bt_le.rst', +BT_DOCS = ['api-reference/bluetooth/bt_le.rst', 'api-reference/bluetooth/esp_bt_defs.rst', 'api-reference/bluetooth/esp_bt_device.rst', 'api-reference/bluetooth/esp_bt_main.rst', @@ -30,7 +29,6 @@ 'api-reference/bluetooth/esp_gatt_defs.rst', 'api-reference/bluetooth/esp_gatts.rst', 'api-reference/bluetooth/esp_gattc.rst', - 'api-reference/bluetooth/esp_blufi.rst', 'api-reference/bluetooth/index.rst', 'api-reference/bluetooth/nimble/index.rst'] @@ -56,6 +54,9 @@ 'api-reference/bluetooth/esp_gap_bt.rst', 'migration-guides/release-5.x/5.0/bluetooth-classic.rst'] +BLUFI_DOCS = ['api-guides/blufi.rst', + 'api-reference/bluetooth/esp_blufi.rst'] + WIFI_DOCS = ['api-guides/wifi.rst', 'api-guides/wifi-security.rst', 'api-guides/wireshark-user-guide.rst'] @@ -167,6 +168,7 @@ conditional_include_dict = {'SOC_BT_SUPPORTED':BT_DOCS, 'SOC_BLE_SUPPORTED':BLE_DOCS, 'SOC_BLE_MESH_SUPPORTED':BLE_MESH_DOCS, + 'SOC_BLUFI_SUPPORTED':BLUFI_DOCS, 'SOC_WIFI_SUPPORTED':WIFI_DOCS, 'SOC_BT_CLASSIC_SUPPORTED':CLASSIC_BT_DOCS, 'SOC_SUPPORT_COEXISTENCE':COEXISTENCE_DOCS, diff --git a/docs/docs_not_updated/esp32c6.txt b/docs/docs_not_updated/esp32c6.txt index 9e4925272827..3455409ae42c 100644 --- a/docs/docs_not_updated/esp32c6.txt +++ b/docs/docs_not_updated/esp32c6.txt @@ -1,15 +1,8 @@ -api-guides/blufi api-guides/coexist api-guides/usb-serial-jtag-console api-guides/wifi api-guides/esp-wifi-mesh api-guides/dfu -api-guides/esp-ble-mesh -api-guides/esp-ble-mesh/ble-mesh-index -api-guides/esp-ble-mesh/ble-mesh-feature-list -api-guides/esp-ble-mesh/ble-mesh-terminology -api-guides/esp-ble-mesh/ble-mesh-architecture -api-guides/esp-ble-mesh/ble-mesh-faq api-guides/wifi-security api-guides/openthread api-reference/peripherals/sdio_slave @@ -32,33 +25,6 @@ api-reference/system/inc/show-efuse-table_ESP32-C6 api-reference/system/inc/power_management_esp32s2_and_later api-reference/system/inc/espefuse_summary_ESP32-C6 api-reference/system/ulp-risc-v -api-reference/bluetooth -api-reference/bluetooth/esp_spp -api-reference/bluetooth/esp_l2cap_bt -api-reference/bluetooth/esp_hidd -api-reference/bluetooth/esp_avrc -api-reference/bluetooth/controller_vhci -api-reference/bluetooth/esp_bt_defs -api-reference/bluetooth/esp_hf_ag -api-reference/bluetooth/esp_bt_main -api-reference/bluetooth/esp_bt_device -api-reference/bluetooth/esp_gatts -api-reference/bluetooth/esp_gattc -api-reference/bluetooth/esp_sdp -api-reference/bluetooth/bt_common -api-reference/bluetooth/nimble -api-reference/bluetooth/nimble/index -api-reference/bluetooth/esp_hf_client -api-reference/bluetooth/esp_a2dp -api-reference/bluetooth/esp_blufi -api-reference/bluetooth/bt_le -api-reference/bluetooth/esp_hf_defs -api-reference/bluetooth/esp_gap_bt -api-reference/bluetooth/esp_gatt_defs -api-reference/bluetooth/esp-ble-mesh -api-reference/bluetooth/index -api-reference/bluetooth/esp_gap_ble -api-reference/bluetooth/classic_bt api-reference/protocols/esp_serial_slave_link api-reference/protocols/esp_spi_slave_protocol api-reference/protocols/index diff --git a/docs/docs_not_updated/esp32h2.txt b/docs/docs_not_updated/esp32h2.txt index 6a2b8da3f909..0a29b5aefbe2 100644 --- a/docs/docs_not_updated/esp32h2.txt +++ b/docs/docs_not_updated/esp32h2.txt @@ -8,17 +8,11 @@ contribute/copyright-guide contribute/install-pre-commit-hook contribute/index api-guides/RF_calibration -api-guides/blufi api-guides/coexist api-guides/wifi api-guides/esp-wifi-mesh api-guides/cplusplus api-guides/dfu -api-guides/esp-ble-mesh/ble-mesh-index -api-guides/esp-ble-mesh/ble-mesh-feature-list -api-guides/esp-ble-mesh/ble-mesh-terminology -api-guides/esp-ble-mesh/ble-mesh-architecture -api-guides/esp-ble-mesh/ble-mesh-faq api-guides/wifi-security api-guides/index api-guides/openthread @@ -57,32 +51,6 @@ api-reference/system/inc/espefuse_summary_ESP32-H2 api-reference/system/inc/revisions_ESP32-H2 api-reference/system/inc/show-efuse-table_ESP32-H2 api-reference/system/inc/power_management_esp32s2_and_later -api-reference/bluetooth/esp_spp -api-reference/bluetooth/esp_l2cap_bt -api-reference/bluetooth/esp_hidd -api-reference/bluetooth/esp_avrc -api-reference/bluetooth/controller_vhci -api-reference/bluetooth/esp_bt_defs -api-reference/bluetooth/esp_hf_ag -api-reference/bluetooth/esp_bt_main -api-reference/bluetooth/esp_bt_device -api-reference/bluetooth/esp_gatts -api-reference/bluetooth/esp_gattc -api-reference/bluetooth/esp_sdp -api-reference/bluetooth/bt_common -api-reference/bluetooth/nimble -api-reference/bluetooth/nimble/index -api-reference/bluetooth/esp_hf_client -api-reference/bluetooth/esp_a2dp -api-reference/bluetooth/esp_blufi -api-reference/bluetooth/bt_le -api-reference/bluetooth/esp_hf_defs -api-reference/bluetooth/esp_gap_bt -api-reference/bluetooth/esp_gatt_defs -api-reference/bluetooth/esp-ble-mesh -api-reference/bluetooth/index -api-reference/bluetooth/esp_gap_ble -api-reference/bluetooth/classic_bt api-reference/protocols/esp_serial_slave_link api-reference/protocols/esp_sdio_slave_protocol api-reference/protocols/esp_spi_slave_protocol @@ -92,9 +60,7 @@ about resources migration-guides/release-5.x/5.1/index migration-guides/release-5.x/5.1/peripherals -migration-guides/release-5.x/5.0/bluetooth-classic migration-guides/release-5.x/5.0/gcc -migration-guides/release-5.x/5.0/bluetooth-low-energy migration-guides/release-5.x/5.0/removed-components migration-guides/release-5.x/5.0/protocols migration-guides/release-5.x/5.0/networking diff --git a/docs/en/api-guides/index.rst b/docs/en/api-guides/index.rst index 84ddc4b97a0e..ed5565a7f9e8 100644 --- a/docs/en/api-guides/index.rst +++ b/docs/en/api-guides/index.rst @@ -7,7 +7,7 @@ API Guides app_trace startup - :SOC_BT_SUPPORTED: blufi + :SOC_BLUFI_SUPPORTED: blufi bootloader build-system :SOC_SUPPORT_COEXISTENCE: coexist diff --git a/docs/en/api-reference/bluetooth/bt_le.rst b/docs/en/api-reference/bluetooth/bt_le.rst index 9535c01da772..68d11ae2cd90 100644 --- a/docs/en/api-reference/bluetooth/bt_le.rst +++ b/docs/en/api-reference/bluetooth/bt_le.rst @@ -8,4 +8,4 @@ BT LE BLE GATT DEFINE BLE GATT SERVER BLE GATT CLIENT - BLE BLUFI + :SOC_BLUFI_SUPPORTED: BLE BLUFI diff --git a/docs/zh_CN/api-guides/index.rst b/docs/zh_CN/api-guides/index.rst index d25be595020f..8e56d1b70e95 100644 --- a/docs/zh_CN/api-guides/index.rst +++ b/docs/zh_CN/api-guides/index.rst @@ -7,7 +7,7 @@ API 指南 app_trace startup - :SOC_BT_SUPPORTED: blufi + :SOC_BLUFI_SUPPORTED: blufi bootloader build-system :SOC_SUPPORT_COEXISTENCE: coexist