Skip to content

Commit 19ebb57

Browse files
Jason2866Jason2866
authored
Merge branch 'espressif:release/v5.3' into release/v5.3
2 parents 27cbb4c + 5955059 commit 19ebb57

File tree

315 files changed

+5755
-1436
lines changed

Some content is hidden

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

315 files changed

+5755
-1436
lines changed

‎Kconfig‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -644,6 +644,5 @@ mainmenu "Espressif IoT Development Framework Configuration"
644644
- CONFIG_ESPTOOLPY_FLASHFREQ_120M && CONFIG_ESPTOOLPY_FLASH_SAMPLE_MODE_DTR
645645
- CONFIG_SPIRAM_SPEED_120M && CONFIG_SPIRAM_MODE_OCT
646646
- CONFIG_BOOTLOADER_CACHE_32BIT_ADDR_QUAD_FLASH
647-
- CONFIG_MBEDTLS_USE_CRYPTO_ROM_IMPL
648647
- CONFIG_ESP_WIFI_EAP_TLS1_3
649648
- CONFIG_ESP_WIFI_ENABLE_ROAMING_APP

‎components/bt/CMakeLists.txt‎

Lines changed: 43 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,20 @@ set(ble_mesh_include_dirs
4949
"esp_ble_mesh/api/core/include"
5050
"esp_ble_mesh/api/models/include"
5151
"esp_ble_mesh/api"
52+
)
53+
54+
set(ble_mesh_v11_include_dirs
5255
"esp_ble_mesh/lib/include"
5356
"esp_ble_mesh/v1.1/api/core/include"
5457
"esp_ble_mesh/v1.1/api/models/include"
5558
"esp_ble_mesh/v1.1/btc/include"
5659
)
5760

61+
if(CONFIG_IDF_DOC_BUILD)
62+
list(APPEND ble_mesh_include_dirs
63+
${ble_mesh_v11_include_dirs})
64+
endif()
65+
5866
set(bluedroid_include_dirs host/bluedroid/api/include/api)
5967

6068
if(CONFIG_BT_CONTROLLER_ENABLED OR CONFIG_IDF_DOC_BUILD)
@@ -540,34 +548,41 @@ if(CONFIG_BT_ENABLED)
540548
"esp_ble_mesh/models/server/server_common.c"
541549
"esp_ble_mesh/models/server/state_binding.c"
542550
"esp_ble_mesh/models/server/state_transition.c"
543-
"esp_ble_mesh/models/server/time_scene_server.c"
544-
"esp_ble_mesh/v1.1/api/core/esp_ble_mesh_agg_model_api.c"
545-
"esp_ble_mesh/v1.1/api/core/esp_ble_mesh_brc_model_api.c"
546-
"esp_ble_mesh/v1.1/api/core/esp_ble_mesh_cm_data_api.c"
547-
"esp_ble_mesh/v1.1/api/core/esp_ble_mesh_df_model_api.c"
548-
"esp_ble_mesh/v1.1/api/core/esp_ble_mesh_lcd_model_api.c"
549-
"esp_ble_mesh/v1.1/api/core/esp_ble_mesh_odp_model_api.c"
550-
"esp_ble_mesh/v1.1/api/core/esp_ble_mesh_prb_model_api.c"
551-
"esp_ble_mesh/v1.1/api/core/esp_ble_mesh_rpr_model_api.c"
552-
"esp_ble_mesh/v1.1/api/core/esp_ble_mesh_sar_model_api.c"
553-
"esp_ble_mesh/v1.1/api/core/esp_ble_mesh_srpl_model_api.c"
554-
"esp_ble_mesh/v1.1/api/models/esp_ble_mesh_mbt_model_api.c"
555-
"esp_ble_mesh/v1.1/btc/btc_ble_mesh_agg_model.c"
556-
"esp_ble_mesh/v1.1/btc/btc_ble_mesh_brc_model.c"
557-
"esp_ble_mesh/v1.1/btc/btc_ble_mesh_df_model.c"
558-
"esp_ble_mesh/v1.1/btc/btc_ble_mesh_lcd_model.c"
559-
"esp_ble_mesh/v1.1/btc/btc_ble_mesh_mbt_model.c"
560-
"esp_ble_mesh/v1.1/btc/btc_ble_mesh_odp_model.c"
561-
"esp_ble_mesh/v1.1/btc/btc_ble_mesh_prb_model.c"
562-
"esp_ble_mesh/v1.1/btc/btc_ble_mesh_rpr_model.c"
563-
"esp_ble_mesh/v1.1/btc/btc_ble_mesh_sar_model.c"
564-
"esp_ble_mesh/v1.1/btc/btc_ble_mesh_srpl_model.c"
565-
"esp_ble_mesh/lib/ext.c")
566-
567-
if(CONFIG_BLE_MESH_SAR_ENHANCEMENT)
568-
list(APPEND srcs "esp_ble_mesh/core/transport.enh.c")
551+
"esp_ble_mesh/models/server/time_scene_server.c")
552+
if(CONFIG_BLE_MESH_V11_SUPPORT)
553+
list(APPEND include_dirs ${ble_mesh_v11_include_dirs})
554+
555+
list(APPEND srcs
556+
"esp_ble_mesh/v1.1/api/core/esp_ble_mesh_agg_model_api.c"
557+
"esp_ble_mesh/v1.1/api/core/esp_ble_mesh_brc_model_api.c"
558+
"esp_ble_mesh/v1.1/api/core/esp_ble_mesh_cm_data_api.c"
559+
"esp_ble_mesh/v1.1/api/core/esp_ble_mesh_df_model_api.c"
560+
"esp_ble_mesh/v1.1/api/core/esp_ble_mesh_lcd_model_api.c"
561+
"esp_ble_mesh/v1.1/api/core/esp_ble_mesh_odp_model_api.c"
562+
"esp_ble_mesh/v1.1/api/core/esp_ble_mesh_prb_model_api.c"
563+
"esp_ble_mesh/v1.1/api/core/esp_ble_mesh_rpr_model_api.c"
564+
"esp_ble_mesh/v1.1/api/core/esp_ble_mesh_sar_model_api.c"
565+
"esp_ble_mesh/v1.1/api/core/esp_ble_mesh_srpl_model_api.c"
566+
"esp_ble_mesh/v1.1/api/models/esp_ble_mesh_mbt_model_api.c"
567+
"esp_ble_mesh/v1.1/btc/btc_ble_mesh_agg_model.c"
568+
"esp_ble_mesh/v1.1/btc/btc_ble_mesh_brc_model.c"
569+
"esp_ble_mesh/v1.1/btc/btc_ble_mesh_df_model.c"
570+
"esp_ble_mesh/v1.1/btc/btc_ble_mesh_lcd_model.c"
571+
"esp_ble_mesh/v1.1/btc/btc_ble_mesh_mbt_model.c"
572+
"esp_ble_mesh/v1.1/btc/btc_ble_mesh_odp_model.c"
573+
"esp_ble_mesh/v1.1/btc/btc_ble_mesh_prb_model.c"
574+
"esp_ble_mesh/v1.1/btc/btc_ble_mesh_rpr_model.c"
575+
"esp_ble_mesh/v1.1/btc/btc_ble_mesh_sar_model.c"
576+
"esp_ble_mesh/v1.1/btc/btc_ble_mesh_srpl_model.c"
577+
"esp_ble_mesh/lib/ext.c")
578+
if(CONFIG_BLE_MESH_SAR_ENHANCEMENT)
579+
list(APPEND srcs "esp_ble_mesh/core/transport.enh.c")
580+
else()
581+
list(APPEND srcs "esp_ble_mesh/core/transport.c")
582+
endif()
569583
else()
570-
list(APPEND srcs "esp_ble_mesh/core/transport.c")
584+
list(APPEND srcs
585+
"esp_ble_mesh/core/transport.c")
571586
endif()
572587
endif()
573588

@@ -890,7 +905,7 @@ if(CONFIG_BT_ENABLED)
890905
target_compile_options(${COMPONENT_LIB} PRIVATE "-Wno-format")
891906
endif()
892907

893-
if(CONFIG_BLE_MESH)
908+
if(CONFIG_BLE_MESH_V11_SUPPORT)
894909
if(CONFIG_IDF_TARGET_ESP32)
895910
add_prebuilt_library(ble_mesh "esp_ble_mesh/lib/lib/esp32/libble_mesh.a")
896911
target_link_libraries(${COMPONENT_LIB} PRIVATE ble_mesh)

‎components/bt/common/btc/core/btc_task.c‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,12 @@
6969
#include "btc_ble_mesh_prov.h"
7070
#include "btc_ble_mesh_health_model.h"
7171
#include "btc_ble_mesh_config_model.h"
72+
#include "btc_ble_mesh_generic_model.h"
73+
#include "btc_ble_mesh_lighting_model.h"
74+
#include "btc_ble_mesh_sensor_model.h"
75+
#include "btc_ble_mesh_time_scene_model.h"
76+
#if CONFIG_BLE_MESH_V11_SUPPORT
77+
#include "btc_ble_mesh_mbt_model.h"
7278
#include "btc_ble_mesh_agg_model.h"
7379
#include "btc_ble_mesh_brc_model.h"
7480
#include "btc_ble_mesh_df_model.h"
@@ -78,11 +84,7 @@
7884
#include "btc_ble_mesh_rpr_model.h"
7985
#include "btc_ble_mesh_sar_model.h"
8086
#include "btc_ble_mesh_srpl_model.h"
81-
#include "btc_ble_mesh_generic_model.h"
82-
#include "btc_ble_mesh_lighting_model.h"
83-
#include "btc_ble_mesh_sensor_model.h"
84-
#include "btc_ble_mesh_time_scene_model.h"
85-
#include "btc_ble_mesh_mbt_model.h"
87+
#endif /* CONFIG_BLE_MESH_V11_SUPPORT */
8688
#endif /* #if CONFIG_BLE_MESH */
8789

8890
#define BTC_TASK_PINNED_TO_CORE (TASK_PINNED_TO_CORE)

‎components/bt/controller/esp32/bt.c‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1638,7 +1638,10 @@ esp_err_t esp_bt_controller_init(esp_bt_controller_config_t *cfg)
16381638

16391639
btdm_cfg_mask = btdm_config_mask_load();
16401640

1641-
if (btdm_controller_init(btdm_cfg_mask, cfg) != 0) {
1641+
err = btdm_controller_init(btdm_cfg_mask, cfg);
1642+
1643+
if (err != 0) {
1644+
ESP_LOGE(BTDM_LOG_TAG, "%s %d\n",__func__,err);
16421645
err = ESP_ERR_NO_MEM;
16431646
goto error;
16441647
}

‎components/bt/controller/esp32c3/bt.c‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -781,7 +781,8 @@ static void btdm_sleep_enter_phase1_wrapper(uint32_t lpcycles)
781781
// allow a maximum time uncertainty to be about 488ppm(1/2048) at least as clock drift
782782
// and set the timer in advance
783783
uint32_t uncertainty = (us_to_sleep >> 11);
784-
#if CONFIG_FREERTOS_USE_TICKLESS_IDLE
784+
#if CONFIG_BT_CTRL_MAIN_XTAL_PU_DURING_LIGHT_SLEEP
785+
// recalculate clock drift when Bluetooth using main XTAL during light sleep
785786
if (rtc_clk_slow_src_get() == SOC_RTC_SLOW_CLK_SRC_RC_SLOW) {
786787
uncertainty = us_to_sleep * BTDM_RTC_SLOW_CLK_RC_DRIFT_PERCENT / 100;
787788
}
@@ -1437,7 +1438,10 @@ esp_err_t esp_bt_controller_init(esp_bt_controller_config_t *cfg)
14371438
periph_module_enable(PERIPH_BT_MODULE);
14381439
periph_module_reset(PERIPH_BT_MODULE);
14391440

1440-
if (btdm_controller_init(cfg) != 0) {
1441+
err = btdm_controller_init(cfg);
1442+
1443+
if (err != 0) {
1444+
ESP_LOGE(BT_LOG_TAG, "%s %d\n",__func__,err);
14411445
err = ESP_ERR_NO_MEM;
14421446
goto error;
14431447
}
@@ -1753,7 +1757,7 @@ esp_power_level_t esp_ble_tx_power_get(esp_ble_power_type_t power_type)
17531757
handle = power_type;
17541758
}
17551759

1756-
lvl = (esp_power_level_t)ble_txpwr_get(power_type, handle);
1760+
lvl = (esp_power_level_t)ble_txpwr_get(enh_pwr_type, handle);
17571761

17581762
return lvl;
17591763
}

‎components/bt/controller/lib_esp32‎

‎components/bt/controller/lib_esp32c3_family‎

0 commit comments

Comments
 (0)