Skip to content

Commit fa3f6ac

Browse files
Isl2017Isl2017
committed
Merge branch 'feat/ble_mesh_esp32c61_support' into 'master'
Feat/ble mesh esp32c61 support Closes BLERP-1098 and IDF-10364 See merge request espressif/esp-idf!34100
2 parents 3867689 + c7a4c1c commit fa3f6ac

Some content is hidden

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

55 files changed

+235
-28
lines changed

‎components/bt/CMakeLists.txt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -907,6 +907,9 @@ if(CONFIG_BLE_MESH_V11_SUPPORT)
907907
elseif(CONFIG_IDF_TARGET_ESP32C6)
908908
add_prebuilt_library(ble_mesh "esp_ble_mesh/lib/lib/esp32c6/libble_mesh.a")
909909
target_link_libraries(${COMPONENT_LIB} PRIVATE ble_mesh)
910+
elseif(CONFIG_IDF_TARGET_ESP32C61)
911+
add_prebuilt_library(ble_mesh "esp_ble_mesh/lib/lib/esp32c61/libble_mesh.a")
912+
target_link_libraries(${COMPONENT_LIB} PRIVATE ble_mesh)
910913
elseif(CONFIG_IDF_TARGET_ESP32H2)
911914
add_prebuilt_library(ble_mesh "esp_ble_mesh/lib/lib/esp32h2/libble_mesh.a")
912915
target_link_libraries(${COMPONENT_LIB} PRIVATE ble_mesh)

‎components/bt/esp_ble_mesh/lib/lib‎

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1067,6 +1067,10 @@ config SOC_BLE_SUPPORTED
10671067
bool
10681068
default y
10691069

1070+
config SOC_BLE_MESH_SUPPORTED
1071+
bool
1072+
default y
1073+
10701074
config SOC_ESP_NIMBLE_CONTROLLER
10711075
bool
10721076
default y

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

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

482482
/*---------------------------------- Bluetooth CAPS ----------------------------------*/
483483
#define SOC_BLE_SUPPORTED (1) /*!< Support Bluetooth Low Energy hardware */
484-
// #define SOC_BLE_MESH_SUPPORTED (1) /*!< Support BLE MESH */
484+
#define SOC_BLE_MESH_SUPPORTED (1) /*!< Support BLE MESH */
485485
#define SOC_ESP_NIMBLE_CONTROLLER (1) /*!< Support BLE EMBEDDED controller V1 */
486486
#define SOC_BLE_50_SUPPORTED (1) /*!< Support Bluetooth 5.0 */
487487
#define SOC_BLE_DEVICE_PRIVACY_SUPPORTED (1) /*!< Support BLE device privacy mode */

‎examples/bluetooth/esp_ble_mesh/aligenie_demo/README.md‎

Lines changed: 2 additions & 2 deletions

‎examples/bluetooth/esp_ble_mesh/aligenie_demo/sdkconfig.defaults.esp32c61‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# Override some defaults so BT stack is enabled
2+
# by default in this example
3+
CONFIG_IDF_TARGET="esp32c61"
4+
CONFIG_BT_LE_SCAN_DUPL_TYPE_DATA_DEVICE=y
5+
CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y
6+
CONFIG_BT_BLE_50_FEATURES_SUPPORTED=n
7+
CONFIG_BT_LE_50_FEATURE_SUPPORT=n
8+
9+
#
10+
# light driver config
11+
#
12+
CONFIG_LIGHT_GPIO_RED=4
13+
CONFIG_LIGHT_GPIO_GREEN=5
14+
CONFIG_LIGHT_GPIO_BLUE=6
15+
CONFIG_LIGHT_GPIO_COLD=7
16+
CONFIG_LIGHT_GPIO_WARM=10
17+
# end of light driver config

‎examples/bluetooth/esp_ble_mesh/directed_forwarding/README.md‎

Lines changed: 2 additions & 2 deletions

‎examples/bluetooth/esp_ble_mesh/directed_forwarding/df_client/main/Kconfig.projbuild‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,10 @@ menu "Example Configuration"
3838
bool "ESP32C5-DevKitC"
3939
depends on IDF_TARGET_ESP32C5
4040

41+
config BLE_MESH_ESP32C61_DEV
42+
bool "ESP32C61-DevKitC"
43+
depends on IDF_TARGET_ESP32C61
44+
4145
endchoice
4246

4347
endmenu

‎examples/bluetooth/esp_ble_mesh/directed_forwarding/df_client/main/board.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ extern "C" {
3535
#define LED_B GPIO_NUM_47
3636
#elif defined(CONFIG_BLE_MESH_ESP32C6_DEV)
3737
#define BLE_MESH_LED_STRIP_IO GPIO_NUM_8
38+
#elif defined(CONFIG_BLE_MESH_ESP32C61_DEV)
39+
#define BLE_MESH_LED_STRIP_IO GPIO_NUM_8
3840
#elif defined(CONFIG_BLE_MESH_ESP32H2_DEV)
3941
#define LED_R GPIO_NUM_8
4042
#define LED_G GPIO_NUM_8

‎examples/bluetooth/esp_ble_mesh/directed_forwarding/df_client/sdkconfig.defaults.esp32c61‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# Override some defaults so BT stack is enabled
2+
# by default in this example
3+
CONFIG_IDF_TARGET="esp32c61"
4+
CONFIG_BT_LE_SCAN_DUPL_TYPE_DATA_DEVICE=y
5+
CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y
6+
CONFIG_BT_BLE_50_FEATURES_SUPPORTED=n
7+
CONFIG_BT_LE_50_FEATURE_SUPPORT=n

0 commit comments

Comments
 (0)