Skip to content

Commit 35d1704

Browse files
author
Jiang Jiang Jian
committed
Merge branch 'support/esp32c5eco2_ble_15_4' into 'master'
Resupport BLE and 15.4 for esp32c5eco2 Closes IDF-12822, IDF-12824, IDF-10559, IDF-10560, IDF-10561, IDF-10562, IDF-10563, IDF-10564, IDF-10565, IDF-10566, and IDF-10567 See merge request espressif/esp-idf!38804
2 parents d898c23 + b1cc598 commit 35d1704

File tree

77 files changed

+193
-158
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+193
-158
lines changed

‎components/soc/esp32c5/include/soc/Kconfig.soc_caps.in‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,10 @@ config SOC_SECURE_BOOT_SUPPORTED
171171
bool
172172
default y
173173

174+
config SOC_IEEE802154_SUPPORTED
175+
bool
176+
default y
177+
174178
config SOC_BOD_SUPPORTED
175179
bool
176180
default y
@@ -251,6 +255,10 @@ config SOC_SPIRAM_SUPPORTED
251255
bool
252256
default y
253257

258+
config SOC_BT_SUPPORTED
259+
bool
260+
default y
261+
254262
config SOC_PHY_SUPPORTED
255263
bool
256264
default y
@@ -1667,6 +1675,34 @@ config SOC_WIFI_NAN_SUPPORT
16671675
bool
16681676
default y
16691677

1678+
config SOC_BLE_SUPPORTED
1679+
bool
1680+
default y
1681+
1682+
config SOC_ESP_NIMBLE_CONTROLLER
1683+
bool
1684+
default y
1685+
1686+
config SOC_BLE_50_SUPPORTED
1687+
bool
1688+
default y
1689+
1690+
config SOC_BLE_DEVICE_PRIVACY_SUPPORTED
1691+
bool
1692+
default y
1693+
1694+
config SOC_BLE_POWER_CONTROL_SUPPORTED
1695+
bool
1696+
default y
1697+
1698+
config SOC_BLE_MULTI_CONN_OPTIMIZATION
1699+
bool
1700+
default y
1701+
1702+
config SOC_BLE_PERIODIC_ADV_ENH_SUPPORTED
1703+
bool
1704+
default y
1705+
16701706
config SOC_LP_CORE_SINGLE_INTERRUPT_VECTOR
16711707
bool
16721708
default y

‎components/soc/esp32c5/include/soc/soc_caps.h‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
#define SOC_ECC_EXTENDED_MODES_SUPPORTED 1
6060
#define SOC_FLASH_ENC_SUPPORTED 1
6161
#define SOC_SECURE_BOOT_SUPPORTED 1
62-
// #define SOC_IEEE802154_SUPPORTED 1 // TODO: [ESP32C5 ECO2] IDF-12824
62+
#define SOC_IEEE802154_SUPPORTED 1
6363
#define SOC_BOD_SUPPORTED 1
6464
#define SOC_APM_SUPPORTED 1 /*!< Support for APM peripheral */
6565
#define SOC_PMU_SUPPORTED 1
@@ -83,7 +83,7 @@
8383
#define SOC_PM_SUPPORTED 1
8484

8585
#define SOC_SPIRAM_SUPPORTED 1
86-
// #define SOC_BT_SUPPORTED 1 // TODO: [ESP32C5 ECO2] IDF-12822
86+
#define SOC_BT_SUPPORTED 1
8787
#define SOC_PHY_SUPPORTED 1
8888
#define SOC_BITSCRAMBLER_SUPPORTED 1
8989

@@ -664,14 +664,14 @@
664664
#define SOC_WIFI_NAN_SUPPORT (1) /*!< Support WIFI Aware (NAN) */
665665

666666
/*---------------------------------- Bluetooth CAPS ----------------------------------*/
667-
// #define SOC_BLE_SUPPORTED (1) /*!< Support Bluetooth Low Energy hardware */ // TODO: [ESP32C5 ECO2] IDF-12822
667+
#define SOC_BLE_SUPPORTED (1) /*!< Support Bluetooth Low Energy hardware */
668668
// #define SOC_BLE_MESH_SUPPORTED (1) /*!< Support BLE MESH */
669-
// #define SOC_ESP_NIMBLE_CONTROLLER (1) /*!< Support BLE EMBEDDED controller V1 */
670-
// #define SOC_BLE_50_SUPPORTED (1) /*!< Support Bluetooth 5.0 */
671-
// #define SOC_BLE_DEVICE_PRIVACY_SUPPORTED (1) /*!< Support BLE device privacy mode */
672-
// #define SOC_BLE_POWER_CONTROL_SUPPORTED (1) /*!< Support Bluetooth Power Control */
673-
// #define SOC_BLE_MULTI_CONN_OPTIMIZATION (1) /*!< Support multiple connections optimization */
674-
// #define SOC_BLE_PERIODIC_ADV_ENH_SUPPORTED (1) /*!< Support For BLE Periodic Adv Enhancements */
669+
#define SOC_ESP_NIMBLE_CONTROLLER (1) /*!< Support BLE EMBEDDED controller V1 */
670+
#define SOC_BLE_50_SUPPORTED (1) /*!< Support Bluetooth 5.0 */
671+
#define SOC_BLE_DEVICE_PRIVACY_SUPPORTED (1) /*!< Support BLE device privacy mode */
672+
#define SOC_BLE_POWER_CONTROL_SUPPORTED (1) /*!< Support Bluetooth Power Control */
673+
#define SOC_BLE_MULTI_CONN_OPTIMIZATION (1) /*!< Support multiple connections optimization */
674+
#define SOC_BLE_PERIODIC_ADV_ENH_SUPPORTED (1) /*!< Support For BLE Periodic Adv Enhancements */
675675

676676
/*------------------------------------- PHY CAPS -------------------------------------*/
677677
// #define SOC_PHY_COMBO_MODULE (1) /*!< Support Wi-Fi, BLE and 15.4*/

‎docs/doxygen/Doxyfile_esp32c5‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,5 @@ INPUT += \
1414
$(PROJECT_PATH)/components/ulp/lp_core/lp_core/include/ulp_lp_core_interrupts.h \
1515
$(PROJECT_PATH)/components/ulp/ulp_common/include/ulp_common.h \
1616
$(PROJECT_PATH)/components/ulp/lp_core/shared/include/ulp_lp_core_lp_uart_shared.h \
17-
# TODO: [ESP32C5 ECO2] IDF-12822 Add back bt docs
18-
# $(PROJECT_PATH)/components/bt/include/esp32c5/include/esp_bt.h
19-
# $(PROJECT_PATH)/components/bt/include/$(IDF_TARGET)/include/esp_bt_vs.h
17+
$(PROJECT_PATH)/components/bt/include/esp32c5/include/esp_bt.h \
18+
$(PROJECT_PATH)/components/bt/include/$(IDF_TARGET)/include/esp_bt_vs.h \

‎examples/bluetooth/ble_get_started/bluedroid/Bluedroid_Beacon/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-S3 |
2-
| ----------------- | ----- | -------- | -------- | -------- | --------- | -------- | -------- |
1+
| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-S3 |
2+
| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | -------- |
33

44
# Bluedroid Beacon Example
55

‎examples/bluetooth/ble_get_started/bluedroid/Bluedroid_Connection/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-S3 |
2-
| ----------------- | ----- | -------- | -------- | -------- | --------- | -------- | -------- |
1+
| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-S3 |
2+
| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | -------- |
33

44
# Bluedroid Connection Example
55

‎examples/bluetooth/ble_get_started/bluedroid/Bluedroid_GATT_Server/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-S3 |
2-
| ----------------- | ----- | -------- | -------- | -------- | --------- | -------- | -------- |
1+
| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-S3 |
2+
| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | -------- |
33

44
# Bluedroid GATT Server Example
55

‎examples/bluetooth/ble_get_started/nimble/NimBLE_Beacon/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-S3 |
2-
| ----------------- | ----- | -------- | -------- | -------- | --------- | -------- | -------- |
1+
| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-S3 |
2+
| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | -------- |
33

44
# NimBLE Beacon Example
55

‎examples/bluetooth/ble_get_started/nimble/NimBLE_Connection/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-S3 |
2-
| ----------------- | ----- | -------- | -------- | -------- | --------- | -------- | -------- |
1+
| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-S3 |
2+
| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | -------- |
33

44
# NimBLE Connection Example
55

‎examples/bluetooth/ble_get_started/nimble/NimBLE_GATT_Server/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-S3 |
2-
| ----------------- | ----- | -------- | -------- | -------- | --------- | -------- | -------- |
1+
| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-S3 |
2+
| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | -------- |
33

44
# NimBLE GATT Server Example
55

‎examples/bluetooth/ble_get_started/nimble/NimBLE_Security/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-S3 |
2-
| ----------------- | ----- | -------- | -------- | -------- | --------- | -------- | -------- |
1+
| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-S3 |
2+
| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | -------- |
33

44
# NimBLE Security Example
55

0 commit comments

Comments
 (0)