gongyantao
e5899f6a70
resolve the conflicts
2023-06-25 15:37:41 +08:00
Mahavir Jain
c570f67461
Merge branch 'ci/fix_extra_backslash' into 'release/v5.1'
...
build_template_app: Remove extra backslash
See merge request espressif/esp-idf!24374
2023-06-23 19:39:05 +08:00
Sachin Parekh
2fb799c52e
build_template_app: Remove extra backslash
2023-06-23 15:01:53 +05:30
Roland Dobai
79e12a1840
Merge branch 'ci/ignore_pkg_resources_deprecation_warning_v5.1' into 'release/v5.1'
...
ci: ignore pkg_resources deprecation warning (v5.1)
See merge request espressif/esp-idf!24339
2023-06-21 15:37:40 +08:00
Fu Hanxi
3cad4ca937
ci: ignore pkg_resources deprecation warning
2023-06-21 07:27:15 +08:00
Jiang Jiang Jian
4bc762621d
Merge branch 'bugfix/fix_bleqabr23_222_v5.1' into 'release/v5.1'
...
Revert "bluedroid: report disconnect event after BLE link closed" (backport 5.1)
See merge request espressif/esp-idf!24036
2023-06-03 08:43:09 +08:00
Jiang Jiang Jian
42592552b5
Merge branch 'feature/itwt_add_setup_timeout_timer_backport_v5.1' into 'release/v5.1'
...
esp_wifi: itwt add setup timeout timer to track response frame (backport v5.1)
See merge request espressif/esp-idf!24040
2023-06-03 08:40:41 +08:00
xuxiao
5a21bea309
esp_wifi: itwt add setup timeout timer to track response frame
2023-06-02 19:46:15 +08:00
Jiang Jiang Jian
cb88d20f9e
Merge branch 'bugfix/fix_wakeup_failed_if_powerdown_flash_in_lightsleep_v5.1' into 'release/v5.1'
...
Power Management: fixed flash funcs called in sleep wakeup process (backport v5.1)
See merge request espressif/esp-idf!24009
2023-06-02 19:18:36 +08:00
zhangyanjiao
d28cb4a954
esp_wifi:
...
1. mesh: layer2 node will scan all channels when fixed root leave
2. show warning info when setting max connection num for softAP
2023-06-02 17:27:28 +08:00
chenjianhua
c5e580e522
Revert "bluedroid: report disconnect event after BLE link closed"
...
This reverts commit d751960b27
.
2023-06-02 16:51:07 +08:00
Jiang Jiang Jian
ddc16a47fe
Merge branch 'bugfix/wpsreg_ap_assoc_respone_v5.1' into 'release/v5.1'
...
esp_wifi: Bugfix wpsreg AP not responding to assoc req (v5.1)
See merge request espressif/esp-idf!24027
2023-06-02 13:30:22 +08:00
wuzhenghui
03832dbd5e
bugfix: fix some flash funcs called in sleep wakeup process
2023-06-02 02:53:51 +00:00
Jiang Jiang Jian
ecf46dd5da
Merge branch 'docs/update_esp32c6_wifi_api_guides_backport_v5.1' into 'release/v5.1'
...
docs: update esp32c6 api guides about wifi part (backport v5.1)
See merge request espressif/esp-idf!24020
2023-06-01 19:24:50 +08:00
Shreyas Sheth
e8d9104953
esp_wifi: Bugfix wpsreg AP not responding to assoc req
...
Fixed regression caused by 2b8e40e7
2023-06-01 15:36:54 +05:30
liuning
6cd76ba321
docs: update for esp32c6
2023-06-01 14:27:19 +08:00
xuxiao
5a9cff0d34
docs: update esp32c6 api guides about wifi part
2023-06-01 14:26:37 +08:00
Marius Vikhammer
aa741b90ad
Merge branch 'docs/c6_misc_updates_v5.1' into 'release/v5.1'
...
Docs: c6 misc updates (v5.1)
See merge request espressif/esp-idf!23999
2023-06-01 11:03:42 +08:00
Aditya Patwardhan
22adf838c9
Merge branch 'bugfix/c6_h2_decrease_rng_frequency_v5.1' into 'release/v5.1'
...
esp_hw_support: decrease RNG read frequency for C6 and H2 (v5.1)
See merge request espressif/esp-idf!24001
2023-06-01 00:54:49 +08:00
Jakob Hasse
f4f45345ee
esp_hw_support: decrease RNG read frequency on C6 and H2
...
* The RNG reading frequency of 200 KHz has been too high for
C6 and H2 since on these chips the RNG output is combined
with the RTC slow clock which is only 150KHz. Reduced the max
reading frequency via esp_random() from 200KHz to 62.5KHz,
which show best results in tests.
Also updated the bootloader_fill_random() max frequency to the
same value to be in line, even though it was just 83KHz.
2023-05-31 16:16:25 +00:00
Aditya Patwardhan
7b09d12c89
Merge branch 'bugfix/efuse_summary_v5.1' into 'release/v5.1'
...
system-hardware/efuse: fixed efuse summary description containing ; breaking efuse-summary (v5.1)
See merge request espressif/esp-idf!23979
2023-05-31 22:57:37 +08:00
Michael (XIAO Xufeng)
30f8f83d52
Merge branch 'bugfix/add_warning_for_rc_fast_calibration_h2_v5.1' into 'release/v5.1'
...
clk: Add warning log if RC_FAST clock calibration is needed on esp32h2 (v5.1)
See merge request espressif/esp-idf!23935
2023-05-31 20:21:11 +08:00
Jiang Jiang Jian
5cd24826bb
Merge branch 'bugfix/fix_rc_fast_calibration_v5.1' into 'release/v5.1'
...
rtc_clk: fix esp32c6/esp32h2 eco chip `RC_FAST` bad calibration value (backport v5.1)
See merge request espressif/esp-idf!23940
2023-05-31 17:40:28 +08:00
Jiang Jiang Jian
0d13f6f09d
Merge branch 'bugfix/fix_hang_during_sleep_process_v5.1' into 'release/v5.1'
...
bugfix: fix hang on pd_top sleep process (backport v5.1)
See merge request espressif/esp-idf!23852
2023-05-31 17:40:02 +08:00
Marius Vikhammer
871dd9e21a
docs: updated misc C6 programming guide docs with minor changes.
2023-05-31 15:47:26 +08:00
Martin Vychodil
273d973489
idocs: updated Storage API reference documents for ESP32H2
2023-05-31 15:46:42 +08:00
Martin Vychodil
8df4a852f5
docs: updated Storage API reference documents for ESP32C6
2023-05-31 15:46:41 +08:00
Marius Vikhammer
bb4218285b
system-hardware/efuse: fixed efuse summary description containing ; breaking efuse-summary
...
If the efuse description from esptool contained semi-colons it would be interpretted as
a list delimiter in CMake. Summary is now passed as in quotes to escape this behavior.
2023-05-30 14:07:50 +08:00
Jiang Jiang Jian
ea5e0ff298
Merge branch 'backport/fix_matter_commissioning_ble_disconnect_issue' into 'release/v5.1'
...
openthread: Add some backports related to openthread(Backport v5.1)
See merge request espressif/esp-idf!23893
2023-05-26 15:37:14 +08:00
Jiang Jiang Jian
125d00c0f7
Merge branch 'feature/c6_bootloader_rng_v5.1' into 'release/v5.1'
...
Feature/c6 bootloader rng (v5.1)
See merge request espressif/esp-idf!23896
2023-05-26 15:36:45 +08:00
wuzhenghui
8c714acfb5
bugfix: fix rc_fast bad calibration value
2023-05-26 13:59:25 +08:00
Song Ruo Jing
702afbb0f7
clk: Add warning log if RC_FAST clock calibration is needed on esp32h2
2023-05-26 11:45:00 +08:00
Jakob Hasse
b0e2f33082
esp_hw_support/bootloader: made ESP32-C6 and ESP32-H2 RNG available
2023-05-24 09:43:21 +05:30
zhangwenxu
7eb9af5806
openthread: fix frame counter when re-transmition
2023-05-24 10:43:16 +08:00
zhangwenxu
2016bddbda
openthread: add kconfig for enabling mac filter
2023-05-24 10:42:52 +08:00
zhangwenxu
d9e289a5fb
esp_phy: updating lib phy to adapt the voltage changes
2023-05-24 10:35:39 +08:00
Jiang Jiang Jian
6ad6fb9755
Merge branch 'feature/update_ble_doc_for_esp32c6_esp32h2_v5.1' into 'release/v5.1'
...
ble docs: Update ble doc for esp32c6 and esp32h2
See merge request espressif/esp-idf!23801
2023-05-23 15:33:51 +08:00
Jiang Jiang Jian
56677dabe8
Merge branch 'add_c6_in_supported_targets_in_prov_example_v5.1' into 'release/v5.1'
...
Add ESP32-C6 in supported targets (v5.1)
See merge request espressif/esp-idf!23846
2023-05-20 07:41:54 +08:00
Jiang Jiang Jian
9310ed608e
Merge branch 'contrib/github_pr_10532_v5.1' into 'release/v5.1'
...
[SDMMC Mount] fix infinite loop when SD card is not responsive (GitHub PR) (v5.1)
See merge request espressif/esp-idf!23527
2023-05-20 07:35:38 +08:00
Jiang Jiang Jian
057cf2b8ee
Merge branch 'bugfix/wifi_backport_v5.1' into 'release/v5.1'
...
esp_wifi: backport some wifi fixes to v5.1
See merge request espressif/esp-idf!23847
2023-05-20 07:34:41 +08:00
Zim Kalinowski
829fdd172c
Merge branch 'feature/add_support_for_lp_i2c_v5.1' into 'release/v5.1'
...
lp-i2c: Added support for LP I2C peripheral to LP core (v5.1)
See merge request espressif/esp-idf!23850
2023-05-20 04:38:59 +08:00
Jiang Jiang Jian
8cecbafe18
Merge branch 'bugfix/close_phy_tsens_before_sleep_v5.1' into 'release/v5.1'
...
sleep: fix deepsleep current leakage caused by phy_tsens (backport v5.1)
See merge request espressif/esp-idf!23843
2023-05-19 20:29:22 +08:00
Marius Vikhammer
786faa3cac
Merge branch 'doc/update_efuse_info_v5.1' into 'release/v5.1'
...
doc: Update all efuse info files (v5.1)
See merge request espressif/esp-idf!23853
2023-05-19 20:28:15 +08:00
Adam Múdry
6477500cf1
sdmmc: incrementally increase delay of vTaskDelay
...
Prevents unnecessary slowdown in polling functions
2023-05-19 14:01:43 +02:00
jasta
3ef8c77588
esp_dpp: Fix retry with esp_supp_dpp_start_listen after failure
...
This fixes a subtle bug in which ESP_ERR_DPP_TX_FAILURE errors would
call esp_supp_dpp_stop_listen which sets the s_dpp_stop_listening flag
to true. Subsequent attempts to restart listening with
esp_supp_dpp_start_listen then only attempt to listen once more for
500ms before reading the s_dpp_stop_listening flag again and giving up.
This contributes greatly to #10615 , but the fix here is still largely
a work-around as it sometimes requires manually retrying a couple times
before it works. Without this fix, any number of retries by
deinit/init again will seemingly not work as the retries for currently
unknown reasons.
Signed-off-by: Shreyas Sheth <shreyas.sheth@espressif.com>
Closes https://github.com/espressif/esp-idf/pull/10865
2023-05-19 17:17:18 +08:00
jgujarathi
9aedb4bd83
wpa_supplicant : Fix scan results for GCMP and GCMP-256 cipher.
...
Add support for recognising GCMP and GCMP-256 ciphers if used by AP.
Update the scan example to show the correct cipher.
2023-05-19 16:58:51 +08:00
jgujarathi
576489f8cf
wpa_supplicant : Add MBO ie in probe request.
...
Adds the MBO information element in the probe request frame by resetting
scan_ie after set_config is done.
2023-05-19 16:58:40 +08:00
Jiang Jiang Jian
a32201f6ec
Merge branch 'bugfix/fix_compilation_error_optimization_v5.1' into 'release/v5.1'
...
Nimble: Fix compilation issues seen while enabling -O2 optimization (v5.1)
See merge request espressif/esp-idf!23717
2023-05-19 16:48:18 +08:00
Jiang Jiang Jian
774696285d
Merge branch 'bugfix/fix_lp_bod_if_bt_i154_init_phy_before_wifi_v5.1' into 'release/v5.1'
...
fix(phy): fix lp_bod reset if bt/i154 init phy before wifi
See merge request espressif/esp-idf!23831
2023-05-19 16:25:11 +08:00
Aditya Patwardhan
d345beb02a
Merge branch 'contrib/github_pr_11402_v5.1' into 'release/v5.1'
...
esp_ds: ignore releasing mutex if not called from same task (GitHub PR) (v5.1)
See merge request espressif/esp-idf!23840
2023-05-19 16:11:15 +08:00