Zhang Hai Peng
b13f63fd7f
fix(ble/bluedroid): report conn param update failure for unknown BD_ADDR
...
Route unknown BD_ADDR and other immediate failures through the existing
need_cb path so ESP_GAP_BLE_UPDATE_CONN_PARAMS_EVT is always delivered.
(cherry picked from commit f9eaeb5e84 )
Co-authored-by: zhanghaipeng <zhanghaipeng@espressif.com >
2026-06-29 19:04:29 +08:00
Zhang Hai Peng
0217c922fe
fix(ble/bluedroid): preserve ATT error on prepare write completion
...
Skip prepare-write echo validation when the GATT stack reports a
non-success status. ATT Error Response carries no prepare-write echo
body (rsp_len=0), so the check incorrectly overwrote errors such as
GATT_INSUF_AUTHENTICATION (0x05) with GATT_INVALID_PDU (0x04).
(cherry picked from commit d5b9350d0f )
Co-authored-by: zhanghaipeng <zhanghaipeng@espressif.com >
2026-06-29 19:04:29 +08:00
Zhang Hai Peng
a8ee33b38f
fix(ble/bluedroid): preserve HCI status on BLE 4.2 GAP failures
...
Return BTM_HCI_ERROR | hci_status from legacy BLE 4.2 GAP HCI command
paths instead of mapping failures to BTM_ILLEGAL_VALUE or
BTM_NO_RESOURCES. Add btm_ble_status_from_hci() helper and propagate
real status through scan start/stop completion callbacks.
(cherry picked from commit 47dd785a18 )
Co-authored-by: zhanghaipeng <zhanghaipeng@espressif.com >
2026-06-29 19:04:29 +08:00
Zhang Hai Peng
005e8029a9
feat(ble/bluedroid): Optimize Bluedroid memory usage
...
- Delete unused device records (~356B each)
(cherry picked from commit 7d1c0e9a32 )
Co-authored-by: zhanghaipeng <zhanghaipeng@espressif.com >
2026-06-29 19:04:29 +08:00
Zhang Hai Peng
ad3a325cc9
fix(ble/bluedroid): cap Read By Type response length at ATT maximum
...
Read By Type Response Length is one octet (max 255). When MTU was
large enough to return a long characteristic value in one pair, the
server wrote (UINT8)(value_len + 2) and overflowed (e.g. 513 -> 1),
so the client rejected the PDU as GATT_INVALID_PDU (0x04).
Cap server value to 253 bytes per pair, clamp the length byte, and
continue long reads via Read Blob when the capped size is returned.
(cherry picked from commit 97905afccc )
Co-authored-by: zhanghaipeng <zhanghaipeng@espressif.com >
2026-06-29 19:04:29 +08:00
Zhang Hai Peng
50b98393c6
fix(ble/bluedroid): Fixed potential double Execute Write Response
...
(cherry picked from commit 0a93ccd3b3 )
Co-authored-by: zhanghaipeng <zhanghaipeng@espressif.com >
2026-06-29 19:04:29 +08:00
Zhang Hai Peng
be3b2cf56b
fix(ble/bluedroid): unblock sync HCI cmd on Command Status error
...
Release the BLE sync semaphore and record HCI status when a
synchronous command is rejected via Command Status, since no
Command Complete event follows.
(cherry picked from commit 29ae92f4ef )
Co-authored-by: zhanghaipeng <zhanghaipeng@espressif.com >
2026-06-29 19:04:29 +08:00
Zhang Hai Peng
78f1bd2ccf
fix(ble/bluedroid): set REQ_WAITING before GATTC service-change rediscovery
...
When service change cancels in-progress discovery, bta_gattc_disc_cmpl()
re-triggers discovery without marking auto_update as REQ_WAITING. If a
client command is queued in p_q_cmd, bta_gattc_start_discover() refuses
to restart and the command is never dispatched.
(cherry picked from commit 13926bb9bc )
Co-authored-by: zhanghaipeng <zhanghaipeng@espressif.com >
2026-06-29 19:04:29 +08:00
Zhang Hai Peng
702972227d
fix(ble/bluedroid): reject adv data on legacy directed ext adv
...
(cherry picked from commit c339cec380 )
Co-authored-by: zhanghaipeng <zhanghaipeng@espressif.com >
2026-06-29 19:04:29 +08:00
Zhang Hai Peng
3a0344e321
fix(ble/bluedroid): skip identity conversion for static random direct connect
...
Do not rewrite static or non-resolvable random peer addresses to
identity type 0x03 when CONFIG_BT_BLE_RPA_SUPPORTED is enabled.
(cherry picked from commit 2ef10ef488 )
Co-authored-by: zhanghaipeng <zhanghaipeng@espressif.com >
2026-06-29 19:04:29 +08:00
Island
0ced163703
Merge branch 'feat/add_ble_core_6x_feature_for_bluedroid_v6.0' into 'release/v6.0'
...
Feat/add ble core 6x feature for bluedroid (6.0)
See merge request espressif/esp-idf!50053
2026-06-29 17:59:32 +08:00
Ashish Sharma
72041a1e79
Merge branch 'fix/sb_digest_revocation_workflow_v6.0' into 'release/v6.0'
...
change(bootloader): honor SECURE_BOOT_ALLOW_UNUSED_DIGEST_SLOTS during first boot (v6.0)
See merge request espressif/esp-idf!49713
2026-06-29 17:46:30 +08:00
Jiang Jiang Jian
a4a6bc9a78
Merge branch 'feat/optimize_154_debug_v6.0' into 'release/v6.0'
...
feat(802.15.4): avoid missing abort reason for multievents in 154 debug (v6.0)
See merge request espressif/esp-idf!50111
2026-06-29 15:44:33 +08:00
Jiang Jiang Jian
f02fad8ce1
Merge branch 'bugfix/ai_review_avrcp_v6.0' into 'release/v6.0'
...
fix(bt): Fix the critical and high issues related to AVRCP from AI review report (v6.0)
See merge request espressif/esp-idf!50020
2026-06-29 15:43:53 +08:00
Jiang Jiang Jian
965ebfce03
Merge branch 'bugfix/ai_review_hfp_v6.0' into 'release/v6.0'
...
fix(bt): Fix the critical issues related to HFP from AI review report (v6.0)
See merge request espressif/esp-idf!50007
2026-06-29 15:43:38 +08:00
Jiang Jiang Jian
0ad95fbb97
Merge branch 'fix/httpd_clang_tidy_missing_close_v6.0' into 'release/v6.0'
...
fix(network/http_server): fix clang-tidy warnings for missing close (v6.0)
See merge request espressif/esp-idf!49864
2026-06-29 15:42:34 +08:00
Jiang Jiang Jian
543395fb87
Merge branch 'fix/use_unilock_for_sleep_process_v6.0' into 'release/v6.0'
...
fix(esp_hw_support): use same lock for lightsleep/deepsleep process (v6.0)
See merge request espressif/esp-idf!49847
2026-06-29 15:42:06 +08:00
Jiang Jiang Jian
777411abb9
Merge branch 'feat/ble-smp-multi-adv-static-random-address_v6.0' into 'release/v6.0'
...
feat(ble/bluedroid): Add BLE SMP support for multi-ADV with static random addresses (6.0)
See merge request espressif/esp-idf!49789
2026-06-29 15:41:49 +08:00
Jiang Jiang Jian
76c727dfdf
Merge branch 'bugfix/ag_unknown_codec_vv6.0' into 'release/v6.0'
...
fix(bt): skip unknown codecs when parsing AT+BAC(v6.0)
See merge request espressif/esp-idf!49840
2026-06-29 15:41:42 +08:00
Jiang Jiang Jian
87d6d58dc8
Merge branch 'fix/move_system_retention_to_esp_hw_support_v6.0' into 'release/v6.0'
...
refactor(esp_hw_support): move system_periph_retention from soc to esp_hw_support (v6.0)
See merge request espressif/esp-idf!49750
2026-06-29 15:41:21 +08:00
Jiang Jiang Jian
e8fe4def62
Merge branch 'fix-malloc_pm_lock_in_internal_mem_v6.0' into 'release/v6.0'
...
fix(esp_pm): malloc pm_lock in internal mem (v6.0)
See merge request espressif/esp-idf!49689
2026-06-29 15:40:29 +08:00
Jiang Jiang Jian
d82a2d4af2
Merge branch 'fix/vfs_fatfs_unregister_path_possible_leak_v6.0' into 'release/v6.0'
...
Fix esp_vfs_fat_unregister_path possible leak, incorrect check in esp_vfs_register_fs_common and optimize memory usage (v6.0)
See merge request espressif/esp-idf!49638
2026-06-29 15:40:19 +08:00
Jiang Jiang Jian
97ccc904c5
Merge branch 'bugfix/bbp_isses_v6.0' into 'release/v6.0'
...
Bugfix/bbp isses v6.0
See merge request espressif/esp-idf!49624
2026-06-29 15:40:16 +08:00
Jiang Jiang Jian
c1aeac2888
Merge branch 'bugfix/fix_bluedroid_ai_review_bugs_20260427_v6.0' into 'release/v6.0'
...
Bugfix/fix bluedroid ai review bugs 20260427 (6.0)
See merge request espressif/esp-idf!49541
2026-06-29 15:39:47 +08:00
Jiang Jiang Jian
ca1bcb0c72
Merge branch 'fix/adc_monitor_error_on_ch8_9_on_s3_v6.0' into 'release/v6.0'
...
Fix ADC Continuous Monitor Callback Failure for ADC1 Channels 8/9 on ESP32-S3 (v6.0)
See merge request espressif/esp-idf!49505
2026-06-29 15:39:32 +08:00
Jiang Jiang Jian
e3ef21aa13
Merge branch 'feat/support_usb_wakeup_v6.0' into 'release/v6.0'
...
feat: support usb as wakeup source from light sleep (v6.0)
See merge request espressif/esp-idf!49502
2026-06-29 15:39:20 +08:00
Jiang Jiang Jian
f881254b0f
Merge branch 'fix/esp_idf_lp_uart_wakeup_muti_times_v6.0' into 'release/v6.0'
...
fix(ulp): fix lp uart keep wakeup triggered v6.0
See merge request espressif/esp-idf!49399
2026-06-29 15:38:47 +08:00
Jiang Jiang Jian
834bb54d3c
Merge branch 'fix/newlib-nano-nosys-linking_v6.0' into 'release/v6.0'
...
fix(libc): nano: add -lnosys to linking to avoid CMake configuration issues (v6.0)
See merge request espressif/esp-idf!49378
2026-06-29 15:38:27 +08:00
Jiang Jiang Jian
1331f17ad1
Merge branch 'feat/adds_ds_qemu_test_v6.0' into 'release/v6.0'
...
feat: adds mutual auth example (v6.0)
See merge request espressif/esp-idf!49341
2026-06-29 15:38:21 +08:00
Jiang Jiang Jian
4cc49bd9b7
Merge branch 'fix/ble_mesh_bug_report_v2_v6.0' into 'release/v6.0'
...
fix(ble_mesh): Miscellaneous bugfixes according to our internal bug report (v2) (v6.1)
See merge request espressif/esp-idf!49321
2026-06-29 15:37:24 +08:00
Jiang Jiang Jian
870760093f
Merge branch 'bugfix/acl_conn_state_error_v6.0' into 'release/v6.0'
...
fix: Fix missing handling for HCI_ERR_CONNECTION_EXISTS (v6.0)
See merge request espressif/esp-idf!49313
2026-06-29 15:37:20 +08:00
Jiang Jiang Jian
08f007f68d
Merge branch 'fix-bind_int_wdt_to_cache_livelock_fix_v6.0' into 'release/v6.0'
...
fix(esp_system): bind int_wdt to cache livelock workaround (v6.0)
See merge request espressif/esp-idf!49169
2026-06-29 15:36:59 +08:00
Jiang Jiang Jian
340b3aaa65
Merge branch 'change/esp_idf_ulp_add_int_api_6.0' into 'release/v6.0'
...
change(ulp): add lp periph intr enable apis v6.0
See merge request espressif/esp-idf!49143
2026-06-29 15:36:10 +08:00
Jiang Jiang Jian
e1b8106e92
Merge branch 'doc-fix_sleep_mode_doc_v6.0' into 'release/v6.0'
...
docs(system): update GPIO wakeup section for clarity on EXT0 and EXT1 support (v6.0)
See merge request espressif/esp-idf!49113
2026-06-29 15:36:02 +08:00
Jiang Jiang Jian
dcbeafd594
Merge branch 'feat/esp_trace_example_v6.0' into 'release/v6.0'
...
esp_trace example library integration (v6.0)
See merge request espressif/esp-idf!49092
2026-06-29 15:35:30 +08:00
Jiang Jiang Jian
2ffe474494
Merge branch 'fix/vfs_incorect_deprecation_v6.0' into 'release/v6.0'
...
fix(storage/vfs): Mark the correct version of function deprecated (v6.0)
See merge request espressif/esp-idf!49017
2026-06-29 15:33:12 +08:00
Jiang Jiang Jian
bf2aed1697
Merge branch 'fix/sdmmc_reinit_error_v6.0' into 'release/v6.0'
...
fix(sdmmc): fix sdmmc re-init error (v6.0)
See merge request espressif/esp-idf!49010
2026-06-29 15:33:05 +08:00
Jiang Jiang Jian
4ebe898101
Merge branch 'feat/ble-log-iram-optim_v6.0' into 'release/v6.0'
...
opt(bt): Move SPI Tx Callback to Flash When SPI ISR IN IRAM Disabled (6.0)
See merge request espressif/esp-idf!48924
2026-06-29 15:32:59 +08:00
Jiang Jiang Jian
0855c331d7
Merge branch 'fix/esp32c5_usj_console_stuck_v6.0' into 'release/v6.0'
...
fix(esp32c5): Do not disable UART0 sclk when USB Serial/JTAG is primary console (v6.0)
See merge request espressif/esp-idf!48874
2026-06-29 15:32:15 +08:00
Jiang Jiang Jian
b84f9a72b5
Merge branch 'bugfix/idfci-10775-fatfs-wl-dyn-buffers-ci-timeout_v6.0' into 'release/v6.0'
...
fix(storage): mark storage pytest apps flaky in CI (v6.0)
See merge request espressif/esp-idf!48807
2026-06-29 15:31:58 +08:00
Jiang Jiang Jian
667244d9d7
Merge branch 'fix/ws_transport_reject_oversize_v6.0' into 'release/v6.0'
...
fix(ws_transport): reject oversized 64-bit WebSocket payload length (v6.0)
See merge request espressif/esp-idf!48799
2026-06-29 15:31:50 +08:00
Jiang Jiang Jian
ec50de41d2
Merge branch 'bugfix/nvs-blockdev-skip-nvs-ram-test_v6.0' into 'release/v6.0'
...
fix(nvs_flash): skip SPIRAM heap test on non-spiram configs (v6.0)
See merge request espressif/esp-idf!48784
2026-06-29 15:31:29 +08:00
Marius Vikhammer
3b286227e8
Merge branch 'bugfix/int_wdt_default_psram_v6.0' into 'release/v6.0'
...
fix(iwdt): increased default timeout if using PSRAM (v6.0)
See merge request espressif/esp-idf!49481
2026-06-29 15:07:05 +08:00
Marius Vikhammer
837628688e
Merge branch 'contrib/github_pr_18664_v6.0' into 'release/v6.0'
...
ulp_riscv: prioritize error bits over data flags in I2C interrupt wait (GitHub PR) (v6.0)
See merge request espressif/esp-idf!49717
2026-06-29 14:42:18 +08:00
Island
608c9495a4
Merge branch 'bugfix/fix_ble_reg_notify_no_fail_v6.0' into 'release/v6.0'
...
validate handle in esp_ble_gattc_register_for_notify (6.0)
See merge request espressif/esp-idf!48546
2026-06-29 14:39:34 +08:00
Island
760495e0b2
Merge branch 'fix/ble_funcs_reset_default_enabled_v6.0' into 'release/v6.0'
...
fix(bt): Add default BLE controller funcs reset enable (6.0)
See merge request espressif/esp-idf!49138
2026-06-29 14:39:15 +08:00
Mahavir Jain
e038ca923c
Merge branch 'fix/esp_tee_buffer_overflow_v6.0' into 'release/v6.0'
...
fix(esp_tee): fix buffer overflow (v6.0)
See merge request espressif/esp-idf!49303
2026-06-29 11:38:05 +05:30
Mahavir Jain
96008173aa
Merge branch 'fix/rsa_ds_driver_constant_time_v6.0' into 'release/v6.0'
...
Fix/rsa ds driver constant time (v6.0)
See merge request espressif/esp-idf!49699
2026-06-29 11:23:54 +05:30
Mahavir Jain
4163417ff1
Merge branch 'feat/support_rom_psa_mbedtls_v6.0' into 'release/v6.0'
...
feat(mbedtls): enable ESP32-C2(Rev2.0) ROM mbedTLS crypto for PSA (v6.0)
See merge request espressif/esp-idf!48843
2026-06-29 11:22:33 +05:30
Mahavir Jain
ce7b803aac
Merge branch 'fix/esp_tee_heap_poison_v6.0' into 'release/v6.0'
...
fix(esp_tee): Prevent TEE from dispatching the REE heap poisoning callback (v6.0)
See merge request espressif/esp-idf!49911
2026-06-29 11:21:31 +05:30