Skip to content

Commit 014a776

Browse files
committed
Merge branch 'feat/ble_mesh_log_enh_v5.2' into 'release/v5.2'
Feat/ble mesh log enh v5.2 See merge request espressif/esp-idf!43214
2 parents 5c20dc1 + 5a00a2b commit 014a776

Some content is hidden

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

42 files changed

+5874
-1428
lines changed

components/bt/CMakeLists.txt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -626,19 +626,17 @@ if(CONFIG_BT_ENABLED)
626626
"esp_ble_mesh/v1.1/btc/btc_ble_mesh_sar_model.c"
627627
"esp_ble_mesh/v1.1/btc/btc_ble_mesh_srpl_model.c"
628628
"esp_ble_mesh/lib/ext.c")
629+
629630
if(CONFIG_BLE_MESH_SAR_ENHANCEMENT)
630631
list(APPEND srcs "esp_ble_mesh/core/transport.enh.c")
631632
else()
632633
list(APPEND srcs "esp_ble_mesh/core/transport.c")
633634
endif()
634635
else()
635-
list(APPEND srcs
636-
"esp_ble_mesh/core/transport.c")
636+
list(APPEND srcs "esp_ble_mesh/core/transport.c")
637637
endif()
638638
endif()
639639

640-
641-
642640
if(CONFIG_BT_LE_CONTROLLER_NPL_OS_PORTING_SUPPORT)
643641
list(APPEND srcs
644642
"porting/npl/freertos/src/npl_os_freertos.c"

0 commit comments

Comments
 (0)