Skip to content

Commit 22ae972

Browse files
author
Jiang Jiang Jian
committed
Merge branch 'feat/resupport_esp32c61eco3_ble' into 'master'
change(ble): resupport ble for ESP32C61ECO3 Closes BLERP-1948, IDF-10360, IDF-10361, IDF-10363, IDF-10365, and IDF-10362 See merge request espressif/esp-idf!39601
2 parents ede834d + 56130d0 commit 22ae972

File tree

74 files changed

+202
-156
lines changed

Some content is hidden

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

74 files changed

+202
-156
lines changed

‎components/esp_phy/lib‎

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

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@ config SOC_GPTIMER_SUPPORTED
3131
bool
3232
default y
3333

34+
config SOC_BT_SUPPORTED
35+
bool
36+
default y
37+
3438
config SOC_USB_SERIAL_JTAG_SUPPORTED
3539
bool
3640
default y
@@ -43,6 +47,10 @@ config SOC_TEMP_SENSOR_SUPPORTED
4347
bool
4448
default y
4549

50+
config SOC_PHY_SUPPORTED
51+
bool
52+
default y
53+
4654
config SOC_SUPPORTS_SECURE_DL_MODE
4755
bool
4856
default y
@@ -1230,3 +1238,43 @@ config SOC_TEMPERATURE_SENSOR_SUPPORT_SLEEP_RETENTION
12301238
config SOC_TEMPERATURE_SENSOR_UNDER_PD_TOP_DOMAIN
12311239
bool
12321240
default y
1241+
1242+
config SOC_BLE_SUPPORTED
1243+
bool
1244+
default y
1245+
1246+
config SOC_ESP_NIMBLE_CONTROLLER
1247+
bool
1248+
default y
1249+
1250+
config SOC_BLE_50_SUPPORTED
1251+
bool
1252+
default y
1253+
1254+
config SOC_BLE_DEVICE_PRIVACY_SUPPORTED
1255+
bool
1256+
default y
1257+
1258+
config SOC_BLE_POWER_CONTROL_SUPPORTED
1259+
bool
1260+
default y
1261+
1262+
config SOC_BLE_PERIODIC_ADV_ENH_SUPPORTED
1263+
bool
1264+
default y
1265+
1266+
config SOC_BLUFI_SUPPORTED
1267+
bool
1268+
default y
1269+
1270+
config SOC_BLE_MULTI_CONN_OPTIMIZATION
1271+
bool
1272+
default y
1273+
1274+
config SOC_BLE_CTE_SUPPORTED
1275+
bool
1276+
default y
1277+
1278+
config SOC_PHY_COMBO_MODULE
1279+
bool
1280+
default y

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

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@
2424
#define SOC_GDMA_SUPPORTED 1
2525
#define SOC_AHB_GDMA_SUPPORTED 1
2626
#define SOC_GPTIMER_SUPPORTED 1
27-
// #define SOC_BT_SUPPORTED 1 // TODO: IDF-13139, re-enable for c61 eco3
27+
#define SOC_BT_SUPPORTED 1
2828
// \#define SOC_IEEE802154_SUPPORTED 1
2929
#define SOC_USB_SERIAL_JTAG_SUPPORTED 1
3030
#define SOC_ASYNC_MEMCPY_SUPPORTED 1
3131
#define SOC_TEMP_SENSOR_SUPPORTED 1
32-
// #define SOC_PHY_SUPPORTED 1 //TODO: IDF-13141, re-open for c61 eco3
32+
#define SOC_PHY_SUPPORTED 1
3333
// #define SOC_WIFI_SUPPORTED 1 //TODO: IDF-13138, re-open on c61 eco3
3434
#define SOC_SUPPORTS_SECURE_DL_MODE 1
3535
#define SOC_EFUSE_KEY_PURPOSE_FIELD 1
@@ -521,20 +521,19 @@
521521
// #define SOC_WIFI_NAN_SUPPORT (1) /*!< Support WIFI Aware (NAN) */
522522

523523
// /*---------------------------------- Bluetooth CAPS ----------------------------------*/
524-
// TODO: IDF-13139, re-enable for c61 eco3
525-
// #define SOC_BLE_SUPPORTED (1) /*!< Support Bluetooth Low Energy hardware */
524+
#define SOC_BLE_SUPPORTED (1) /*!< Support Bluetooth Low Energy hardware */
526525
// #define SOC_BLE_MESH_SUPPORTED (1) /*!< Support BLE MESH */
527-
// #define SOC_ESP_NIMBLE_CONTROLLER (1) /*!< Support BLE EMBEDDED controller V1 */
528-
// #define SOC_BLE_50_SUPPORTED (1) /*!< Support Bluetooth 5.0 */
529-
// #define SOC_BLE_DEVICE_PRIVACY_SUPPORTED (1) /*!< Support BLE device privacy mode */
530-
// #define SOC_BLE_POWER_CONTROL_SUPPORTED (1) /*!< Support Bluetooth Power Control */
531-
// #define SOC_BLE_PERIODIC_ADV_ENH_SUPPORTED (1) /*!< Support For BLE Periodic Adv Enhancements */
532-
// #define SOC_BLUFI_SUPPORTED (1) /*!< Support BLUFI */
533-
// #define SOC_BLE_MULTI_CONN_OPTIMIZATION (1) /*!< Support multiple connections optimization */
534-
// #define SOC_BLE_CTE_SUPPORTED (1) /*!< Support Bluetooth LE Constant Tone Extension (CTE) */
526+
#define SOC_ESP_NIMBLE_CONTROLLER (1) /*!< Support BLE EMBEDDED controller V1 */
527+
#define SOC_BLE_50_SUPPORTED (1) /*!< Support Bluetooth 5.0 */
528+
#define SOC_BLE_DEVICE_PRIVACY_SUPPORTED (1) /*!< Support BLE device privacy mode */
529+
#define SOC_BLE_POWER_CONTROL_SUPPORTED (1) /*!< Support Bluetooth Power Control */
530+
#define SOC_BLE_PERIODIC_ADV_ENH_SUPPORTED (1) /*!< Support For BLE Periodic Adv Enhancements */
531+
#define SOC_BLUFI_SUPPORTED (1) /*!< Support BLUFI */
532+
#define SOC_BLE_MULTI_CONN_OPTIMIZATION (1) /*!< Support multiple connections optimization */
533+
#define SOC_BLE_CTE_SUPPORTED (1) /*!< Support Bluetooth LE Constant Tone Extension (CTE) */
535534

536535
/*------------------------------------- PHY CAPS -------------------------------------*/
537-
// #define SOC_PHY_COMBO_MODULE (1) /*!< Support Wi-Fi, BLE and 15.4*/
536+
#define SOC_PHY_COMBO_MODULE (1) /*!< Support Wi-Fi, BLE and 15.4*/
538537

539538
/*------------------------------------- No Reset CAPS -------------------------------------*/
540539
// \#define SOC_CAPS_NO_RESET_BY_ANA_BOD (1) //TODO: [ESP32C61] IDF-9254

‎docs/conf_common.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@
287287

288288
ESP32C5_DOCS = ['api-guides/phy.rst', 'api-reference/peripherals/sd_pullup_requirements.rst']
289289

290-
ESP32C61_DOCS = [] # TODO: IDF-13141, re-open for c61 eco3
290+
ESP32C61_DOCS = ['api-guides/phy.rst']
291291

292292
ESP32C6_DOCS = [
293293
'api-guides/RF_calibration.rst',

‎docs/doxygen/Doxyfile_esp32c61‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
INPUT += \
22
$(PROJECT_PATH)/components/esp_wifi/include/esp_wifi_he_types.h \
33
$(PROJECT_PATH)/components/esp_wifi/include/esp_wifi_he.h \
4-
# //TODO: IDF-13141, re-open for c61 eco3
5-
# $(PROJECT_PATH)/components/bt/include/esp32c6/include/esp_bt.h \
6-
# $(PROJECT_PATH)/components/bt/include/esp32c6/include/esp_bt_vs.h \
4+
$(PROJECT_PATH)/components/bt/include/esp32c6/include/esp_bt.h \
5+
$(PROJECT_PATH)/components/bt/include/esp32c6/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-C5 | ESP32-C6 | 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-C5 | ESP32-C6 | 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-C5 | ESP32-C6 | 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-C5 | ESP32-C6 | 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-C5 | ESP32-C6 | 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

0 commit comments

Comments
 (0)