alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fix soc caps define for all chips

Browse Source
This commit is contained in:
Geng Yuchao 2022-07-25 14:02:07 +08:00
parent c7c6910bed
commit 0a1d8c1e09
18 changed files with 101 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
components/soc/esp32/include/soc/Kconfig.soc_caps.in
View File

@ -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

5
components/soc/esp32/include/soc/soc_caps.h
View File

@ -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 */

12
components/soc/esp32c2/include/soc/Kconfig.soc_caps.in
View File

@ -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

5
components/soc/esp32c2/include/soc/soc_caps.h
View File

@ -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 */

4
components/soc/esp32c3/include/soc/Kconfig.soc_caps.in
View File

@ -810,3 +810,7 @@ config SOC_WIFI_CSI_SUPPORT
config SOC_WIFI_MESH_SUPPORT
bool
default y
config SOC_BLE_SUPPORTED
bool
default y

3
components/soc/esp32c3/include/soc/soc_caps.h
View File

@ -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 */

12
components/soc/esp32h2/include/soc/Kconfig.soc_caps.in
View File

@ -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

5
components/soc/esp32h2/include/soc/soc_caps.h
View File

@ -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 */

4
components/soc/esp32s3/include/soc/Kconfig.soc_caps.in
View File

@ -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

3
components/soc/esp32s3/include/soc/soc_caps.h
View File

@ -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 */

2
docs/conf_common.py
View File

@ -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,

2
docs/en/api-reference/bluetooth/index.rst
View File

@ -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

23
docs/en/migration-guides/release-5.x/bluetooth-classic.rst
View File

@ -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`

43
docs/en/migration-guides/release-5.x/bluetooth-low-energy.rst Normal file
View File

@ -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.

3
docs/en/migration-guides/release-5.x/index.rst
View File

@ -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

2
docs/zh_CN/api-reference/bluetooth/index.rst
View File

@ -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

1
docs/zh_CN/migration-guides/release-5.x/bluetooth-low-energy.rst Normal file
View File

@ -0,0 +1 @@
.. include:: ../../../en/migration-guides/release-5.x/bluetooth-low-energy.rst

3
docs/zh_CN/migration-guides/release-5.x/index.rst
View File

@ -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