Skip to content

Commit 99ccbc5

Browse files
Jason2866Jason2866
authored
Merge branch 'espressif:release/v5.3' into release/v5.3
2 parents 1cbe6e6 + dc7fb34 commit 99ccbc5

File tree

488 files changed

+15544
-6549
lines changed

Some content is hidden

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

488 files changed

+15544
-6549
lines changed

‎.gitlab/ci/common.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ variables:
3939
GIT_FETCH_EXTRA_FLAGS: "--no-recurse-submodules --prune --prune-tags"
4040
# we're using .cache folder for caches
4141
GIT_CLEAN_FLAGS: -ffdx -e .cache/
42-
LATEST_GIT_TAG: v5.3-dev
42+
LATEST_GIT_TAG: v5.3
4343

4444
SUBMODULE_FETCH_TOOL: "tools/ci/ci_fetch_submodule.py"
4545
# by default we will fetch all submodules

‎Kconfig‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,6 @@ mainmenu "Espressif IoT Development Framework Configuration"
7575
string
7676
default "$IDF_INIT_VERSION"
7777

78-
config IDF_TARGET_LINUX
79-
bool
80-
default "y" if IDF_TARGET="linux"
81-
8278
config IDF_TARGET_ESP32
8379
bool
8480
default "y" if IDF_TARGET="esp32"

‎components/bootloader_support/src/bootloader_mem.c‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,10 @@ void bootloader_init_mem(void)
3333
* So, at boot disabling these filters. They will enable as per the
3434
* use case by TEE initialization code.
3535
*/
36+
#ifdef SOC_APM_CTRL_FILTER_SUPPORTED
3637
apm_hal_apm_ctrl_filter_enable_all(false);
3738
#endif
39+
#endif
3840

3941
#if CONFIG_IDF_TARGET_ESP32C5 // TODO: IDF-8615 Remove the workaround when APM supported on C5!
4042
// disable apm filter

‎components/bt/CMakeLists.txt‎

Lines changed: 42 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,7 @@ if(CONFIG_BT_ENABLED)
117117
common/btc/include
118118
common/include
119119
porting/mem/
120+
porting/include
120121
)
121122
list(APPEND include_dirs ${common_include_dirs})
122123

@@ -573,29 +574,51 @@ if(CONFIG_BT_ENABLED)
573574

574575

575576
if(CONFIG_BT_LE_CONTROLLER_NPL_OS_PORTING_SUPPORT)
577+
list(APPEND srcs
578+
"porting/npl/freertos/src/npl_os_freertos.c"
579+
"porting/mem/os_msys_init.c"
580+
"porting/transport/src/hci_transport.c"
581+
)
582+
583+
if(CONFIG_BT_CONTROLLER_DISABLED)
576584
list(APPEND srcs
577-
"porting/npl/freertos/src/npl_os_freertos.c"
578-
"porting/mem/os_msys_init.c"
585+
"host/nimble/nimble/porting/nimble/src/hal_uart.c"
579586
)
580-
581-
if(CONFIG_BT_CONTROLLER_DISABLED)
587+
elseif(CONFIG_BT_LE_HCI_INTERFACE_USE_RAM)
588+
if(CONFIG_BT_NIMBLE_ENABLED)
582589
list(APPEND srcs
583-
"host/nimble/nimble/porting/nimble/src/hal_uart.c"
584-
)
590+
"porting/transport/driver/vhci/hci_driver_nimble.c"
591+
"host/nimble/nimble/nimble/transport/esp_ipc/src/hci_esp_ipc.c"
592+
)
593+
else()
594+
list(APPEND srcs
595+
"porting/transport/driver/vhci/hci_driver_standard.c"
596+
)
585597
endif()
586-
list(APPEND include_dirs
587-
porting/include
588-
porting/npl/freertos/include
589-
porting/transport/include
590-
)
591-
592-
if(CONFIG_BT_LE_HCI_INTERFACE_USE_UART)
598+
elseif(CONFIG_BT_LE_HCI_INTERFACE_USE_UART)
593599
list(APPEND srcs
594-
"porting/transport/uart/hci_uart.c"
595-
)
600+
"porting/transport/driver/common/hci_driver_util.c"
601+
"porting/transport/driver/common/hci_driver_h4.c"
602+
"porting/transport/driver/common/hci_driver_mem.c"
603+
"porting/transport/driver/uart/hci_driver_uart_config.c"
604+
)
605+
if(CONFIG_BT_LE_UART_HCI_DMA_MODE)
606+
list(APPEND srcs
607+
"porting/transport/driver/uart/hci_driver_uart_dma.c"
608+
)
609+
else()
610+
list(APPEND srcs
611+
"porting/transport/driver/uart/hci_driver_uart.c"
612+
)
596613
endif()
597-
endif()
614+
endif()
598615

616+
list(APPEND include_dirs
617+
porting/include
618+
porting/npl/freertos/include
619+
porting/transport/include
620+
)
621+
endif()
599622

600623
if(NOT (CONFIG_BT_LE_CRYPTO_STACK_MBEDTLS OR CONFIG_BT_NIMBLE_CRYPTO_STACK_MBEDTLS))
601624
list(APPEND include_dirs
@@ -621,7 +644,6 @@ if(CONFIG_BT_ENABLED)
621644
if(CONFIG_BT_NIMBLE_ENABLED)
622645

623646
list(APPEND include_dirs
624-
625647
host/nimble/nimble/nimble/host/include
626648
host/nimble/nimble/nimble/include
627649
host/nimble/nimble/nimble/host/services/ans/include
@@ -725,10 +747,12 @@ if(CONFIG_BT_ENABLED)
725747
"host/nimble/nimble/porting/npl/freertos/src/nimble_port_freertos.c"
726748
"host/nimble/port/src/nvs_port.c"
727749
)
750+
728751
list(APPEND include_dirs
729752
host/nimble/nimble/porting/nimble/include
730753
host/nimble/port/include
731754
host/nimble/nimble/nimble/transport/include
755+
host/nimble/nimble/nimble/include
732756
)
733757

734758
if(CONFIG_BT_CONTROLLER_DISABLED)
@@ -762,6 +786,7 @@ if(CONFIG_BT_ENABLED)
762786
if(CONFIG_BT_NIMBLE_LEGACY_VHCI_ENABLE AND CONFIG_BT_CONTROLLER_ENABLED)
763787
list(APPEND srcs
764788
"host/nimble/esp-hci/src/esp_nimble_hci.c"
789+
"host/nimble/nimble/nimble/transport/esp_ipc_legacy/src/hci_esp_ipc_legacy.c"
765790
)
766791
list(APPEND include_dirs ${nimble_hci_include_dirs})
767792
endif()

‎components/bt/controller/esp32c2/Kconfig.in‎

Lines changed: 81 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
menu "HCI Config"
33

44
choice BT_LE_HCI_INTERFACE
5-
prompt "Select HCI interface"
5+
prompt "HCI mode"
66
default BT_LE_HCI_INTERFACE_USE_RAM
77

88
config BT_LE_HCI_INTERFACE_USE_RAM
9-
bool "ram"
9+
bool "VHCI"
1010
help
1111
Use RAM as HCI interface
1212
config BT_LE_HCI_INTERFACE_USE_UART
13-
bool "uart"
13+
bool "UART(H4)"
1414
help
1515
Use UART as HCI interface
1616
endchoice
@@ -73,12 +73,26 @@ menu "HCI Config"
7373
UART_PARITY_ODD
7474
endchoice
7575

76-
config BT_LE_HCI_UART_TASK_STACK_SIZE
77-
int "HCI uart task stack size"
78-
depends on BT_LE_HCI_INTERFACE_USE_UART
79-
default 1000
76+
config BT_LE_HCI_UART_RX_BUFFER_SIZE
77+
int "The size of rx ring buffer memory"
78+
depends on !BT_LE_HCI_INTERFACE_USE_RAM
79+
default 512
80+
help
81+
The size of rx ring buffer memory
82+
83+
config BT_LE_HCI_UART_TX_BUFFER_SIZE
84+
int "The size of tx ring buffer memory"
85+
depends on !BT_LE_HCI_INTERFACE_USE_RAM
86+
default 256
87+
help
88+
The size of tx ring buffer memory
89+
90+
config BT_LE_HCI_TRANS_TASK_STACK_SIZE
91+
int "HCI transport task stack size"
92+
depends on !BT_LE_HCI_INTERFACE_USE_RAM
93+
default 1024
8094
help
81-
Set the size of uart task stack
95+
This configures stack size of hci transport task
8296
endmenu
8397

8498
config BT_LE_CONTROLLER_NPL_OS_PORTING_SUPPORT
@@ -526,3 +540,62 @@ config BT_LE_ROLE_OBSERVER_ENABLE
526540
default y
527541
help
528542
Enable observer role function.
543+
544+
choice BT_LE_DFT_TX_POWER_LEVEL_DBM
545+
prompt "BLE default Tx power level(dBm)"
546+
default BT_LE_DFT_TX_POWER_LEVEL_P9
547+
help
548+
Specify default Tx power level(dBm).
549+
config BT_LE_DFT_TX_POWER_LEVEL_N24
550+
bool "-24dBm"
551+
config BT_LE_DFT_TX_POWER_LEVEL_N21
552+
bool "-21dBm"
553+
config BT_LE_DFT_TX_POWER_LEVEL_N18
554+
bool "-18dBm"
555+
config BT_LE_DFT_TX_POWER_LEVEL_N15
556+
bool "-15dBm"
557+
config BT_LE_DFT_TX_POWER_LEVEL_N12
558+
bool "-12dBm"
559+
config BT_LE_DFT_TX_POWER_LEVEL_N9
560+
bool "-9dBm"
561+
config BT_LE_DFT_TX_POWER_LEVEL_N6
562+
bool "-6dBm"
563+
config BT_LE_DFT_TX_POWER_LEVEL_N3
564+
bool "-3dBm"
565+
config BT_LE_DFT_TX_POWER_LEVEL_N0
566+
bool "0dBm"
567+
config BT_LE_DFT_TX_POWER_LEVEL_P3
568+
bool "+3dBm"
569+
config BT_LE_DFT_TX_POWER_LEVEL_P6
570+
bool "+6dBm"
571+
config BT_LE_DFT_TX_POWER_LEVEL_P9
572+
bool "+9dBm"
573+
config BT_LE_DFT_TX_POWER_LEVEL_P12
574+
bool "+12dBm"
575+
config BT_LE_DFT_TX_POWER_LEVEL_P15
576+
bool "+15dBm"
577+
config BT_LE_DFT_TX_POWER_LEVEL_P18
578+
bool "+18dBm"
579+
config BT_LE_DFT_TX_POWER_LEVEL_P20
580+
bool "+20dBm"
581+
endchoice
582+
583+
config BT_LE_DFT_TX_POWER_LEVEL_DBM_EFF
584+
int
585+
default -24 if BT_LE_DFT_TX_POWER_LEVEL_N24
586+
default -21 if BT_LE_DFT_TX_POWER_LEVEL_N21
587+
default -18 if BT_LE_DFT_TX_POWER_LEVEL_N18
588+
default -15 if BT_LE_DFT_TX_POWER_LEVEL_N15
589+
default -12 if BT_LE_DFT_TX_POWER_LEVEL_N12
590+
default -9 if BT_LE_DFT_TX_POWER_LEVEL_N9
591+
default -6 if BT_LE_DFT_TX_POWER_LEVEL_N6
592+
default -3 if BT_LE_DFT_TX_POWER_LEVEL_N3
593+
default 0 if BT_LE_DFT_TX_POWER_LEVEL_N0
594+
default 3 if BT_LE_DFT_TX_POWER_LEVEL_P3
595+
default 6 if BT_LE_DFT_TX_POWER_LEVEL_P6
596+
default 9 if BT_LE_DFT_TX_POWER_LEVEL_P9
597+
default 12 if BT_LE_DFT_TX_POWER_LEVEL_P12
598+
default 15 if BT_LE_DFT_TX_POWER_LEVEL_P15
599+
default 18 if BT_LE_DFT_TX_POWER_LEVEL_P18
600+
default 20 if BT_LE_DFT_TX_POWER_LEVEL_P20
601+
default 0

0 commit comments

Comments
 (0)