diff --git a/components/soc/esp32/include/soc/Kconfig.soc_caps.in b/components/soc/esp32/include/soc/Kconfig.soc_caps.in index 03480b7cd9..c4466d4269 100644 --- a/components/soc/esp32/include/soc/Kconfig.soc_caps.in +++ b/components/soc/esp32/include/soc/Kconfig.soc_caps.in @@ -39,10 +39,6 @@ config SOC_BT_SUPPORTED bool default y -config SOC_CLASSIC_BT_SUPPORTED - bool - default y - config SOC_PCNT_SUPPORTED bool default y @@ -726,3 +722,11 @@ config SOC_WIFI_CSI_SUPPORT config SOC_WIFI_MESH_SUPPORT bool default y + +config SOC_BLE_SUPPORTED + bool + default y + +config SOC_BT_CLASSIC_SUPPORTED + bool + default y diff --git a/components/soc/esp32/include/soc/soc_caps.h b/components/soc/esp32/include/soc/soc_caps.h index 3c284abc5e..e9fa2b4228 100644 --- a/components/soc/esp32/include/soc/soc_caps.h +++ b/components/soc/esp32/include/soc/soc_caps.h @@ -69,7 +69,6 @@ #define SOC_MCPWM_SUPPORTED 1 #define SOC_SDMMC_HOST_SUPPORTED 1 #define SOC_BT_SUPPORTED 1 -#define SOC_CLASSIC_BT_SUPPORTED 1 #define SOC_PCNT_SUPPORTED 1 #define SOC_WIFI_SUPPORTED 1 #define SOC_SDIO_SLAVE_SUPPORTED 1 @@ -387,3 +386,7 @@ #define SOC_WIFI_WAPI_SUPPORT (1) /*!< Support WAPI */ #define SOC_WIFI_CSI_SUPPORT (1) /*!< Support CSI */ #define SOC_WIFI_MESH_SUPPORT (1) /*!< Support WIFI MESH */ + +/*---------------------------------- Bluetooth CAPS ----------------------------------*/ +#define SOC_BLE_SUPPORTED (1) /*!< Support Bluetooth Low Energy hardware */ +#define SOC_BT_CLASSIC_SUPPORTED (1) /*!< Support Bluetooth Classic hardware */ diff --git a/components/soc/esp32c2/include/soc/Kconfig.soc_caps.in b/components/soc/esp32c2/include/soc/Kconfig.soc_caps.in index d32f09d2c6..e4baa151fd 100644 --- a/components/soc/esp32c2/include/soc/Kconfig.soc_caps.in +++ b/components/soc/esp32c2/include/soc/Kconfig.soc_caps.in @@ -19,10 +19,6 @@ config SOC_BT_SUPPORTED bool default y -config SOC_ESP_NIMBLE_CONTROLLER - bool - default y - config SOC_WIFI_SUPPORTED bool default y @@ -574,3 +570,11 @@ config SOC_WIFI_CSI_SUPPORT config SOC_WIFI_MESH_SUPPORT bool default n + +config SOC_BLE_SUPPORTED + bool + default y + +config SOC_ESP_NIMBLE_CONTROLLER + bool + default y diff --git a/components/soc/esp32c2/include/soc/soc_caps.h b/components/soc/esp32c2/include/soc/soc_caps.h index 10259a7949..965ff9fe1d 100644 --- a/components/soc/esp32c2/include/soc/soc_caps.h +++ b/components/soc/esp32c2/include/soc/soc_caps.h @@ -29,7 +29,6 @@ #define SOC_DEDICATED_GPIO_SUPPORTED 1 #define SOC_GDMA_SUPPORTED 1 #define SOC_BT_SUPPORTED 1 -#define SOC_ESP_NIMBLE_CONTROLLER 1 #define SOC_WIFI_SUPPORTED 1 #define SOC_ASYNC_MEMCPY_SUPPORTED 1 #define SOC_SUPPORTS_SECURE_DL_MODE 1 @@ -277,3 +276,7 @@ #define SOC_WIFI_WAPI_SUPPORT (0) /*!< WAPI is not supported */ #define SOC_WIFI_CSI_SUPPORT (0) /*!< CSI is not supported */ #define SOC_WIFI_MESH_SUPPORT (0) /*!< WIFI MESH is not supported */ + +/*---------------------------------- Bluetooth CAPS ----------------------------------*/ +#define SOC_BLE_SUPPORTED (1) /*!< Support Bluetooth Low Energy hardware */ +#define SOC_ESP_NIMBLE_CONTROLLER (1) /*!< Support BLE EMBEDDED controller V1 */ diff --git a/components/soc/esp32c3/include/soc/Kconfig.soc_caps.in b/components/soc/esp32c3/include/soc/Kconfig.soc_caps.in index cf719099f8..83b5f689f9 100644 --- a/components/soc/esp32c3/include/soc/Kconfig.soc_caps.in +++ b/components/soc/esp32c3/include/soc/Kconfig.soc_caps.in @@ -810,3 +810,7 @@ config SOC_WIFI_CSI_SUPPORT config SOC_WIFI_MESH_SUPPORT bool default y + +config SOC_BLE_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 b69476162f..16a3a21d8b 100644 --- a/components/soc/esp32c3/include/soc/soc_caps.h +++ b/components/soc/esp32c3/include/soc/soc_caps.h @@ -374,3 +374,6 @@ #define SOC_WIFI_WAPI_SUPPORT (1) /*!< Support WAPI */ #define SOC_WIFI_CSI_SUPPORT (1) /*!< Support CSI */ #define SOC_WIFI_MESH_SUPPORT (1) /*!< Support WIFI MESH */ + +/*---------------------------------- Bluetooth CAPS ----------------------------------*/ +#define SOC_BLE_SUPPORTED (1) /*!< Support Bluetooth Low Energy hardware */ diff --git a/components/soc/esp32h2/include/soc/Kconfig.soc_caps.in b/components/soc/esp32h2/include/soc/Kconfig.soc_caps.in index 7c38936113..2852aa37f7 100644 --- a/components/soc/esp32h2/include/soc/Kconfig.soc_caps.in +++ b/components/soc/esp32h2/include/soc/Kconfig.soc_caps.in @@ -23,10 +23,6 @@ config SOC_BT_SUPPORTED bool default y -config SOC_ESP_NIMBLE_CONTROLLER - bool - default y - config SOC_ASYNC_MEMCPY_SUPPORTED bool default y @@ -738,3 +734,11 @@ config SOC_TEMPERATURE_SENSOR_SUPPORT_FAST_RC config SOC_TEMPERATURE_SENSOR_SUPPORT_XTAL bool default y + +config SOC_BLE_SUPPORTED + bool + default y + +config SOC_ESP_NIMBLE_CONTROLLER + bool + default y diff --git a/components/soc/esp32h2/include/soc/soc_caps.h b/components/soc/esp32h2/include/soc/soc_caps.h index e990dbf6b1..dd42e85503 100644 --- a/components/soc/esp32h2/include/soc/soc_caps.h +++ b/components/soc/esp32h2/include/soc/soc_caps.h @@ -38,7 +38,6 @@ #define SOC_GDMA_SUPPORTED 1 #define SOC_TWAI_SUPPORTED 1 #define SOC_BT_SUPPORTED 1 -#define SOC_ESP_NIMBLE_CONTROLLER 1 #define SOC_ASYNC_MEMCPY_SUPPORTED 1 #define SOC_USB_SERIAL_JTAG_SUPPORTED 1 #define SOC_SUPPORTS_SECURE_DL_MODE 1 @@ -358,3 +357,7 @@ /*-------------------------- Temperature Sensor CAPS -------------------------------------*/ #define SOC_TEMPERATURE_SENSOR_SUPPORT_FAST_RC (1) #define SOC_TEMPERATURE_SENSOR_SUPPORT_XTAL (1) + +/*---------------------------------- Bluetooth CAPS ----------------------------------*/ +#define SOC_BLE_SUPPORTED (1) /*!< Support Bluetooth Low Energy hardware */ +#define SOC_ESP_NIMBLE_CONTROLLER (1) /*!< Support BLE EMBEDDED controller V1 */ diff --git a/components/soc/esp32s3/include/soc/Kconfig.soc_caps.in b/components/soc/esp32s3/include/soc/Kconfig.soc_caps.in index c2ca8c5d34..9ac34bc0ef 100644 --- a/components/soc/esp32s3/include/soc/Kconfig.soc_caps.in +++ b/components/soc/esp32s3/include/soc/Kconfig.soc_caps.in @@ -1031,6 +1031,10 @@ config SOC_WIFI_MESH_SUPPORT bool default y +config SOC_BLE_SUPPORTED + bool + default y + config SOC_TWAI_BRP_MIN int default 2 diff --git a/components/soc/esp32s3/include/soc/soc_caps.h b/components/soc/esp32s3/include/soc/soc_caps.h index f777535268..333d6364c1 100644 --- a/components/soc/esp32s3/include/soc/soc_caps.h +++ b/components/soc/esp32s3/include/soc/soc_caps.h @@ -442,3 +442,6 @@ #define SOC_WIFI_WAPI_SUPPORT (1) /*!< Support WAPI */ #define SOC_WIFI_CSI_SUPPORT (1) /*!< Support CSI */ #define SOC_WIFI_MESH_SUPPORT (1) /*!< Support WIFI MESH */ + +/*---------------------------------- Bluetooth CAPS ----------------------------------*/ +#define SOC_BLE_SUPPORTED (1) /*!< Support Bluetooth Low Energy hardware */ diff --git a/docs/conf_common.py b/docs/conf_common.py index a752816949..6e43ca6600 100644 --- a/docs/conf_common.py +++ b/docs/conf_common.py @@ -144,7 +144,7 @@ ESP32C3_DOCS = ['hw-reference/esp32c3/**', # format: {tag needed to include: documents to included}, tags are parsed from sdkconfig and peripheral_caps.h headers conditional_include_dict = {'SOC_BT_SUPPORTED':BT_DOCS, 'SOC_WIFI_SUPPORTED':WIFI_DOCS, - 'SOC_CLASSIC_BT_SUPPORTED':CLASSIC_BT_DOCS, + 'SOC_BT_CLASSIC_SUPPORTED':CLASSIC_BT_DOCS, 'SOC_SUPPORT_COEXISTENCE':COEXISTENCE_DOCS, 'SOC_SDMMC_HOST_SUPPORTED':SDMMC_DOCS, 'SOC_SDIO_SLAVE_SUPPORTED':SDIO_SLAVE_DOCS, diff --git a/docs/en/api-reference/bluetooth/index.rst b/docs/en/api-reference/bluetooth/index.rst index 52326945c6..8863d35595 100644 --- a/docs/en/api-reference/bluetooth/index.rst +++ b/docs/en/api-reference/bluetooth/index.rst @@ -8,7 +8,7 @@ Bluetooth API bt_common bt_le - :SOC_CLASSIC_BT_SUPPORTED: classic_bt + :SOC_BT_CLASSIC_SUPPORTED: classic_bt controller_vhci esp-ble-mesh nimble/index diff --git a/docs/en/migration-guides/release-5.x/bluetooth-classic.rst b/docs/en/migration-guides/release-5.x/bluetooth-classic.rst index 3fb7824ea6..fb46287a16 100644 --- a/docs/en/migration-guides/release-5.x/bluetooth-classic.rst +++ b/docs/en/migration-guides/release-5.x/bluetooth-classic.rst @@ -4,29 +4,6 @@ Bluetooth Classic Bluedroid --------- - The following Bluedroid macros, types, and functions have been renamed: - - - :component_file:`bt/host/bluedroid/api/include/api/esp_gap_ble_api.h` - - - In :cpp:enum:`esp_gap_ble_cb_event_t` - - - ``ESP_GAP_BLE_SET_PREFERED_DEFAULT_PHY_COMPLETE_EVT`` renamed to ``ESP_GAP_BLE_SET_PREFERRED_DEFAULT_PHY_COMPLETE_EVT`` - - ``ESP_GAP_BLE_SET_PREFERED_PHY_COMPLETE_EVT`` renamed to ``ESP_GAP_BLE_SET_PREFERRED_PHY_COMPLETE_EVT`` - - ``ESP_GAP_BLE_CHANNEL_SELETE_ALGORITHM_EVT`` renamed to ``ESP_GAP_BLE_CHANNEL_SELECT_ALGORITHM_EVT`` - - - ``esp_ble_wl_opration_t`` renamed to :cpp:enum:`esp_ble_wl_operation_t` - - ``esp_ble_gap_cb_param_t.pkt_data_lenth_cmpl`` renamed to ``pkt_data_length_cmpl`` - - ``esp_ble_gap_cb_param_t.update_whitelist_cmpl.wl_opration`` renamed to ``wl_operation`` - - ``esp_ble_gap_set_prefered_default_phy`` renamed to :cpp:func:`esp_ble_gap_set_preferred_default_phy` - - ``esp_ble_gap_set_prefered_phy`` renamed to :cpp:func:`esp_ble_gap_set_preferred_phy` - - - :component_file:`bt/host/bluedroid/api/include/api/esp_gatt_defs.h` - - - In :cpp:enum:`esp_gatt_status_t` - - - ``ESP_GATT_ENCRYPED_MITM`` renamed to ``ESP_GATT_ENCRYPTED_MITM`` - - ``ESP_GATT_ENCRYPED_NO_MITM`` renamed to ``ESP_GATT_ENCRYPTED_NO_MITM`` - - :component_file:`bt/host/bluedroid/api/include/api/esp_hf_defs.h` - In :cpp:enum:`esp_hf_cme_err_t` diff --git a/docs/en/migration-guides/release-5.x/bluetooth-low-energy.rst b/docs/en/migration-guides/release-5.x/bluetooth-low-energy.rst new file mode 100644 index 0000000000..ded3985925 --- /dev/null +++ b/docs/en/migration-guides/release-5.x/bluetooth-low-energy.rst @@ -0,0 +1,43 @@ +Bluetooth Low Energy +==================== + +Bluedroid +--------- + + The following Bluedroid macros, types, and functions have been renamed: + + - :component_file:`bt/host/bluedroid/api/include/api/esp_gap_ble_api.h` + + - In :cpp:enum:`esp_gap_ble_cb_event_t` + + - ``ESP_GAP_BLE_SET_PREFERED_DEFAULT_PHY_COMPLETE_EVT`` renamed to ``ESP_GAP_BLE_SET_PREFERRED_DEFAULT_PHY_COMPLETE_EVT`` + - ``ESP_GAP_BLE_SET_PREFERED_PHY_COMPLETE_EVT`` renamed to ``ESP_GAP_BLE_SET_PREFERRED_PHY_COMPLETE_EVT`` + - ``ESP_GAP_BLE_CHANNEL_SELETE_ALGORITHM_EVT`` renamed to ``ESP_GAP_BLE_CHANNEL_SELECT_ALGORITHM_EVT`` + + - ``esp_ble_wl_opration_t`` renamed to :cpp:enum:`esp_ble_wl_operation_t` + - ``esp_ble_gap_cb_param_t.pkt_data_lenth_cmpl`` renamed to ``pkt_data_length_cmpl`` + - ``esp_ble_gap_cb_param_t.update_whitelist_cmpl.wl_opration`` renamed to ``wl_operation`` + - ``esp_ble_gap_set_prefered_default_phy`` renamed to :cpp:func:`esp_ble_gap_set_preferred_default_phy` + - ``esp_ble_gap_set_prefered_phy`` renamed to :cpp:func:`esp_ble_gap_set_preferred_phy` + + - :component_file:`bt/host/bluedroid/api/include/api/esp_gatt_defs.h` + + - In :cpp:enum:`esp_gatt_status_t` + + - ``ESP_GATT_ENCRYPED_MITM`` renamed to ``ESP_GATT_ENCRYPTED_MITM`` + - ``ESP_GATT_ENCRYPED_NO_MITM`` renamed to ``ESP_GATT_ENCRYPTED_NO_MITM`` + +Nimble +-------- + + The following Nimble APIs have been removed: + + - :component_file:`bt/host/nimble/esp-hci/include/esp_nimble_hci.h` + + - Remove : esp_err_t esp_nimble_hci_and_controller_init(void); + + - Controller initialization, enable and HCI initialization calls have been moved to `nimble_port_init`. This function can be deleted directly. + + - Remove : esp_err_t esp_nimble_hci_and_controller_deinit(void); + + - Controller deinitialization, disable and HCI deinitialization calls have been moved to `nimble_port_deinit`. This function can be deleted directly. diff --git a/docs/en/migration-guides/release-5.x/index.rst b/docs/en/migration-guides/release-5.x/index.rst index c9cc97d89e..eaf292ec93 100644 --- a/docs/en/migration-guides/release-5.x/index.rst +++ b/docs/en/migration-guides/release-5.x/index.rst @@ -6,7 +6,8 @@ Migration from 4.4 to 5.0 .. toctree:: :maxdepth: 1 - :SOC_CLASSIC_BT_SUPPORTED: bluetooth-classic + :SOC_BT_CLASSIC_SUPPORTED: bluetooth-classic + bluetooth-low-energy build-system gcc networking diff --git a/docs/zh_CN/api-reference/bluetooth/index.rst b/docs/zh_CN/api-reference/bluetooth/index.rst index b1a3f3e0de..088c2975b4 100644 --- a/docs/zh_CN/api-reference/bluetooth/index.rst +++ b/docs/zh_CN/api-reference/bluetooth/index.rst @@ -8,7 +8,7 @@ bt_common bt_le - :SOC_CLASSIC_BT_SUPPORTED: classic_bt + :SOC_BT_CLASSIC_SUPPORTED: classic_bt controller_vhci esp-ble-mesh nimble/index diff --git a/docs/zh_CN/migration-guides/release-5.x/bluetooth-low-energy.rst b/docs/zh_CN/migration-guides/release-5.x/bluetooth-low-energy.rst new file mode 100644 index 0000000000..15cd74bfc2 --- /dev/null +++ b/docs/zh_CN/migration-guides/release-5.x/bluetooth-low-energy.rst @@ -0,0 +1 @@ +.. include:: ../../../en/migration-guides/release-5.x/bluetooth-low-energy.rst diff --git a/docs/zh_CN/migration-guides/release-5.x/index.rst b/docs/zh_CN/migration-guides/release-5.x/index.rst index 3c4a3b45e2..c5970670e0 100644 --- a/docs/zh_CN/migration-guides/release-5.x/index.rst +++ b/docs/zh_CN/migration-guides/release-5.x/index.rst @@ -6,7 +6,8 @@ .. toctree:: :maxdepth: 1 - :SOC_CLASSIC_BT_SUPPORTED: bluetooth-classic + :SOC_BT_CLASSIC_SUPPORTED: bluetooth-classic + bluetooth-low-energy build-system gcc networking