alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
30,184 Commits 20 Branches 148 Tags 384 MiB
093bb5cab6
Commit Graph

20179 Commits

Author SHA1 Message Date
laokaiyao
382059699e i2s_std: fixed mclk check for 24-bit data 2023-05-09 17:51:33 +08:00
Sudeep Mohanty
662e0812f4 ulp-riscv-i2c: Add ULP RISC-V I2C read/write timeout config option 
The commit 88e4c06028 introduced a loop timeout for all ULP RISC-V I2C
transactions to avoid getting stuck in a forever loop. The loop timeout
was set to 500 msec by default. This commit improves on the concept by
making the loop timeout configurable via a Kconfig option in terms of
CPU ticks. If the timeout is set to -1 value then the transaction loops
will never timeout, therefore restoring the driver behavior before the
timeout was introduced.

The commit also updates the I2C Fast mode timings for esp32s2 which need
to be adjusted due to bus timing constraints.

Closes https://github.com/espressif/esp-idf/issues/11154
 2023-05-09 11:17:01 +02:00
Zim Kalinowski
3947688d54 Merge branch 'bugfix/make_clean_files' into 'master' 
build-system: replace ADDITIONAL_MAKE_CLEAN_FILES with ADDITIONAL_CLEAN_FILES

Closes IDF-2444

See merge request espressif/esp-idf!23628
 2023-05-09 16:53:18 +08:00
Sudeep Mohanty
abe5311a22 freertos: Updated vTaskRemoveFromUnorderedEventList() to consider scheduler state before adding task to ready list 
vTaskRemoveFromUnorderedEventList() runs under the assumption that the
scheduler is suspended during the call. However, for IDF FreeRTOS, this
is not true. When dual-core system is active, this API call is made in
a critical section but without suspending the scheduler. This commit
updates the vTaskRemoveFromUnorderedEventList() function to now consider
the scheduler state on either cores before adding a task to the ready list.
 2023-05-09 10:47:24 +02:00
morris
06b1e10273 Merge branch 'feature/reset_mcpwm_in_restart' into 'master' 
mcpwm: reset peripheral in restart, panic and halt

Closes IDFGH-10047

See merge request espressif/esp-idf!23591
 2023-05-09 16:44:55 +08:00
morris
72d0f5b35b mcpwm: can't apply the same delay module to multiple generators 
This is a hardware limitation, one delay module can only be used by one generator at one time.

Closes https://github.com/espressif/esp-idf/issues/11327
 2023-05-09 16:41:47 +08:00
Sudeep Mohanty
1acd2b5ce7 freertos-idf: Fixed incorrect scheduler suspension check in xTaskRemoveFromEventList() 
This commit fixes a bug in xTaskRemoveFromEvenetList() where in the
check for scheduler suspension did not account for nested suspensions.
Additionally, this commit updates all checks for scheduler
suspension to follow a uniform way.
 2023-05-09 10:28:02 +02:00
morris
2b707decfc Merge branch 'feature/rgb_lcd_pclk_gpio_optional' into 'master' 
rgb_lcd: make pclk gpio setting optional

Closes IDFGH-10021

See merge request espressif/esp-idf!23626
 2023-05-09 14:47:37 +08:00
Rahul Tank
732c921c65 Nimble: Fix compilation issues seen while enabling -O2 optimization 2023-05-09 04:57:28 +00:00
Marius Vikhammer
a300b3eb81 ci: fix invalid kconfig options in system test apps 2023-05-09 11:27:55 +08:00
Zim Kalinowski
75d00928f5 Merge branch 'feature/migrate-newlib-to-pytest' into 'master' 
newlib: move test to pytest

Closes IDF-5595 and IDF-6961

See merge request espressif/esp-idf!20984
 2023-05-08 23:40:50 +08:00
Darian
e1dba0fa9e Merge branch 'refactor/freertos_component_structure' into 'master' 
FreeRTOS: Refactor copmonent structure

See merge request espressif/esp-idf!23367
 2023-05-08 21:18:37 +08:00
Darian Leung
66499f17a5 freertos: Refactor component structure 
This commit refactors the "freertos" component's structure as follows:

- "FreeRTOSConfig.h" related files moved to "./config" directory
- Refactored CMakeLists.txt file in preparation for v10.5.1 upgrade
    - Grouped list appends based on component organization
    - Removed some unecessarily public "include_dirs"
- Removed FreeRTOS-openocd.c
    - uxTopUsedPriority has been added back to tasks.c since v10.4.2
    - Thus the workaround in FreeRTOS-openocd.c is no longer needed and can
      be removed.
 2023-05-08 18:40:03 +08:00
Zim Kalinowski
a825dde9c0 newlib: move test to pytest 2023-05-08 12:31:48 +02:00
Mahavir Jain
17451f1fb3 Merge branch 'fix/sha512_block_mode' into 'master' 
mbedtls: fix sha-512 block mode build error

See merge request espressif/esp-idf!23569
 2023-05-08 16:09:50 +08:00
Marius Vikhammer
d17248ecdf build-system: replace ADDITIONAL_MAKE_CLEAN_FILES with ADDITIONAL_CLEAN_FILES 
ADDITIONAL_MAKE_CLEAN_FILES is deprecated and only worked with make.
Replaced with the new ADDITIONAL_CLEAN_FILES (CMake 3.15) which also works with ninja.
 2023-05-08 15:51:48 +08:00
Armando
8e4974d66f mspi: modified mspi 80mhz octal psram timing tuning point fallback id on s3 2023-05-08 14:57:12 +08:00
morris
5ba53c9294 rgb_lcd: make pclk gpio setting optional 
PCLK may not be necessary in VGA use case.
Closes https://github.com/espressif/esp-idf/issues/11298
 2023-05-08 14:55:26 +08:00
Wang Meng Yang
9652d8ed6f Merge branch 'bugfix/fix_idfgh_9931' into 'master' 
Fixed remote mic error during encryption procedure

See merge request espressif/esp-idf!23609
 2023-05-08 14:44:40 +08:00
harshal.patil
9a87b26294 mbedtls: fix sha-512 block mode build error 2023-05-08 10:27:34 +05:30
Kevin (Lao Kaiyao)
e9e5f1b90f Merge branch 'feature/add_default_config_for_i2s_pdm_dac_mode' into 'master' 
i2s: public bclk_div and add a default config for PDM TX DAC

Closes IDF-7289

See merge request espressif/esp-idf!23466
 2023-05-08 12:36:05 +08:00
Armando (Dou Yiwen)
38e84bdd4f Merge branch 'refactor/mspi_timing_tuning_compatible_on_all_chips' into 'master' 
mspi: timing tuning driver framework

Closes IDF-7004

See merge request espressif/esp-idf!22786
 2023-05-08 10:27:29 +08:00
Armando (Dou Yiwen)
4fd45f2483 Merge branch 'bugfix/fix_adc_filter_acquire_logic' into 'master' 
adc: fix adc filter acquire logic

Closes IDF-7311

See merge request espressif/esp-idf!23566
 2023-05-08 10:10:35 +08:00
Michael (XIAO Xufeng)
4e24516ee2 Merge branch 'feat/i2s_ng_stailq' into 'master' 
driver: use STAILQ_NEXT instead empty to improve readability

See merge request espressif/esp-idf!23528
 2023-05-06 22:30:23 +08:00
WanqQixiang
a61b937577 openthread: Add menuconfig to set the default dns server address 2023-05-06 17:44:27 +08:00
morris
083d9e7c0f mcpwm: reset peripheral in restart, panic and halt 
mcpwm is commonly used in power eletronic area, when restart happens,
make sure the mcpwm generator is not working.

closes https://github.com/espressif/esp-idf/issues/11324
 2023-05-06 15:58:58 +08:00
chenjianhua
b87f96e115 bluedroid: fix ble ext adv rand addr setting for NRPA 2023-05-06 15:26:45 +08:00
chenjianhua
7593466dc6 bluedroid: fix ble adv data construct for device name 2023-05-06 15:26:45 +08:00
chenjianhua
f7ff6b127e bluedroid: fix ble smp key distribution setting 2023-05-06 15:26:45 +08:00
cjin
7a708c35cb pau: fix logic error in extra link retention 2023-05-06 14:58:02 +08:00
Li Shuai
2e22491b02 sleep retention: implement the extra linked list retention for modules with retention clock bugs 2023-05-06 14:58:00 +08:00
laokaiyao
bf8419fd6e i2s: public bclk_div and add a default config for PDM TX DAC 2023-05-06 14:19:48 +08:00
Marius Vikhammer
3ced7b12e8 ulp: add support for using lp timer with lp core on C6 2023-05-06 14:13:14 +08:00
Marius Vikhammer
97aab3bedc Merge branch 'bugfix/gdma_log_nano' into 'master' 
gdma: fixed crash from logging when using newlib nano

Closes IDFGH-8134

See merge request espressif/esp-idf!23579
 2023-05-06 13:46:50 +08:00
Marius Vikhammer
e806d9c9cb gdma: fixed crash from logging when using newlib nano 
Newlib nano printf formatting do not support %z, and will crash if such an identifier
is followed by a %s indentifier.

Closes https://github.com/espressif/esp-idf/issues/9631
 2023-05-06 10:51:03 +08:00
Armando
d7cbd04d43 adc: added adc filter exhausted allocation test 2023-05-06 10:31:19 +08:00
Armando
108ce25750 adc: fix adc filter acquire logic 2023-05-06 10:31:19 +08:00
chenjianhua
6c10a7f60d Update bt lib for ESP32-C3 and ESP32-S3 
- Fixed remote mic error during encryption procedure
 2023-05-05 21:54:01 +08:00
David Čermák
292d16b440 Merge branch 'bugfix/linux_target_with_out_lwip' into 'master' 
linux: Add lwip support to networking components under linux

See merge request espressif/esp-idf!23053
 2023-05-05 17:26:45 +08:00
morris
eaa4ad502a Merge branch 'bugfix/check_filter_range' into 'master' 
rmt: check filter and idle threashold

Closes IDFGH-9977

See merge request espressif/esp-idf!23518
 2023-05-05 17:19:45 +08:00
Jiang Jiang Jian
05d1104d28 Merge branch 'bugfix/reduce_logging_for_SAE_master' into 'master' 
Modify log level for SAE

See merge request espressif/esp-idf!23548
 2023-05-05 17:00:50 +08:00
Armando (Dou Yiwen)
313f8cdbb7 Merge branch 'bugfix/add_len_check_per_spi_master_transaction' into 'master' 
spi master: added transaction length check to refuse longer than hardware supported length

Closes IDF-7236

See merge request espressif/esp-idf!23199
 2023-05-05 16:25:05 +08:00
Jiang Jiang Jian
5c4ffe47d6 Merge branch 'bugfix/c6_tx_callback_issue' into 'master' 
esp_wifi: Fix tx_callback issue for ESP32C6

See merge request espressif/esp-idf!23531
 2023-05-05 15:57:40 +08:00
Michael (XIAO Xufeng)
120d848ef8 Merge branch 'bugfix/fix_wrong_hp_ldo_h2' into 'master' 
ESP32H2: Fix wrong hp ldo

See merge request espressif/esp-idf!23501
 2023-05-05 14:39:54 +08:00
Alexey Lapshin
dfcab42a01 pthread: fix restrict keyword usage in function declarations 
See https://gcc.gnu.org/onlinedocs/gcc/Restricted-Pointers.html
 2023-05-05 13:35:19 +08:00
David Cermak
b2af4d9689 lwip/linux: Add lwip support for networking component under linux 
linux/lwip: Wrap some IO posix functions
* to workaourd the FreeRTOS EINTR issue (when building without lwip)
* to correctly choose the sub-system based on fd (when building with
lwip) -- passing control to either linux/system or to lwip
This commit also addapts tapio-if to provide DHCP client by default and
configurable settings for static IP
 2023-05-05 05:03:39 +00:00
jgujarathi
e803554654 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-05 10:13:17 +05:30
jgujarathi
00c0bf683f 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-05 10:12:29 +05:30
Rahul Tank
ef232423dd Merge branch 'bugfix/add_event_cb_for_pcl' into 'master' 
Nimble: Add support to send power control event in registered callback

See merge request espressif/esp-idf!23522
 2023-05-05 11:59:36 +08:00
Xiao Xufeng
b24ce390c0 dac: use STQILA instead empty to improve readability 2023-05-05 01:18:49 +08:00
Zim Kalinowski
4ba38c2105 Merge branch 'fix/console-build-error' into 'master' 
console: Fix building issue when serial JTAG is set

Closes IDFGH-9327

See merge request espressif/esp-idf!23311
 2023-05-04 20:15:42 +08:00
morris
d0258a57d0 Merge branch 'refactor/use_ccomp_timer_for_dma_performance_test' into 'master' 
dma: use ccomp_timer in the test_app by component manager

See merge request espressif/esp-idf!23526
 2023-05-04 18:42:06 +08:00
morris
6f749ae038 Merge branch 'test/enlarge_gptimer_test_threshold' into 'master' 
gptimer: enlarge test threshold

Closes IDFCI-1702

See merge request espressif/esp-idf!23511
 2023-05-04 18:40:22 +08:00
Armando
dbf3612d6d spi_flash: replace flash clock src change API with mspi timing API 2023-05-04 17:05:35 +08:00
Armando
8eec6558d1 mspi: refactor timing tuning driver to make it compatible with p4 2023-05-04 17:05:35 +08:00
Sarvesh Bodakhe
bb88774286 esp_wifi: Fix tx_callback issue for ESP32C6 2023-05-04 14:13:39 +05:30
Jiang Jiang Jian
39e93a95a3 Merge branch 'bugfix/sae_pk_improvements' into 'master' 
wpa_supplicant: fixes in mbedtls porting to parse compressed EC public key and remove unnecessary code

See merge request espressif/esp-idf!23440
 2023-05-04 16:06:51 +08:00
xiongweichao
a7519e17c8 bt: Deleted some redundant variables in HFP_AG 2023-05-04 15:36:23 +08:00
morris
da3b3cf4a4 dma: use ccomp_timer component for testing performance metric 
ccomp_timer now becomes a standalone component, located in the component registry.
we can use that in the test app by component manager.
 2023-05-04 14:09:36 +08:00
Shyamal Khachane
032305a74f wpa_supplicant: Reduce logging for SAE 2023-05-04 11:21:57 +05:30
wuzhenghui
dcab6368ce feature: support configuration of sleep clock calibration frequency 2023-05-04 12:09:26 +08:00
wuzhenghui
dd4d1bbe90 bugfix: fix esp32c6eco1 fosc calibration cycles during sleep 2023-05-04 11:46:21 +08:00
Armando
0e72940001 spi: added an API to get max transaction length and use in spi lcd driver 2023-05-04 11:37:23 +08:00
Armando
ea10aac4f0 spi: added transaction length check to refuse longer than hardware supported length 2023-05-04 11:37:23 +08:00
morris
1438d9a02c Merge branch 'bugfix/bootloader_support/flash' into 'master' 
bootloader_support: fix register backup

See merge request espressif/esp-idf!23507
 2023-05-04 10:52:28 +08:00
Jakob Hasse
0a3cfce671 Merge branch 'contrib/github_pr_10895' into 'master' 
Fix possible conversion errors by using __builtin_ffsll (GitHub PR)

Closes IDFGH-9541

See merge request espressif/esp-idf!23429
 2023-05-04 10:41:46 +08:00
Chen Jian Hua
3aa1ac99c7 Merge branch 'bugfix/fix_ble_hop_sel' into 'master' 
Fixed BLE connection failed to be established when disabled 5.0 feature

See merge request espressif/esp-idf!23516
 2023-05-04 10:16:07 +08:00
Marek Matej
d1a447f6c0 bootloader_support: fix register backup 
By storing the 'user2' register during the early init
we fix the flash access issue, which occurs in the
Zephyr/MCUboot ports for ESP32.

Signed-off-by: Marek Matej <marek.matej@espressif.com>
 2023-05-03 15:11:10 +02:00
Ivan Grokhotkov
3775ce8bd8 Merge branch 'feature/sdmmc_test_app' into 'master' 
sdmmc: new component test app

Closes IDF-7108

See merge request espressif/esp-idf!19699
 2023-05-03 03:07:06 +08:00
Ivan Grokhotkov
500b5b2103 Merge branch 'contrib/github_pr_11215' into 'master' 
improve thread safety in esp_timer (GitHub PR)

Closes IDFGH-9920

See merge request espressif/esp-idf!23295
 2023-05-03 02:21:07 +08:00
Ivan Grokhotkov
1f7c4b5690 Merge branch 'bugfix/xtensa_cmake_stderr_message' into 'master' 
xtensa: don't print debug messages to stderr

See merge request espressif/esp-idf!23439
 2023-05-02 18:51:22 +08:00
Ivan Grokhotkov
a0f4664625 Merge branch 'contrib/github_pr_11245' into 'master' 
app_trace: fix out of bounds array write (GitHub PR)

Closes IDFGH-9952

See merge request espressif/esp-idf!23345
 2023-05-02 18:10:00 +08:00
Rahul Tank
1f92c349a2 Nimble: Add support to send power control event in registered callback 2023-05-02 12:14:23 +05:30
Rahul Tank
329eec289b Merge branch 'feature/services_health_therm' into 'master' 
NimBLE: Added health thermometer profile

See merge request espressif/esp-idf!23065
 2023-05-02 13:28:08 +08:00
morris
9ae742eb85 rmt: check filter and idle threashold 
Closes https://github.com/espressif/esp-idf/issues/11262
 2023-04-29 06:51:35 +00:00
Darian Leung
76d4c9f592 freertos: Refactor port_systick 
This commit refactors port_systick.c so that all ports (RISC-V vs Xtensa) of
all FreeRTOS implementations (IDF vs Amazon SMP FreeRTOS) use the same set of
tick interrupt functions. Thus, these funcitons are now common:

- vPortSetupTimer() to setup the tick interrupt's timer
- xPortSysTickHandler() that is called on each tick interrupt
 2023-04-28 23:03:00 +08:00
Darian Leung
cf595293af freertos: Move port_systick to common directory 
This commit moves port_systick to a directory that ia accessible to both
IDF FreeRTOS and Amazon SMP FreeRTOS.
 2023-04-28 23:03:00 +08:00
Sarvesh Bodakhe
cd0d42d43b wpa_supplicant: Use 'mbedtls_pk_parse_public_key' to parse compressed EC public key and remove unnecessary code 
Support to parse compressed EC public key is added from 'mbedtls-3.4.0'
 2023-04-28 18:23:42 +05:30
Sarvesh Bodakhe
9e4915b81b esp-wifi: add station SAE-PK (Public Key) configuration note 2023-04-28 18:23:42 +05:30
Darian
1a5249d7e7 Merge branch 'bugfix/ana_cmpr_negative_enum' into 'master' 
driver: Fix ana_cmpr negative enum comparison and bad test

See merge request espressif/esp-idf!23508
 2023-04-28 20:05:53 +08:00
isha.pardikar@espressif.com
8c3ba9e2dc NimBLE: Added health thermometer profile 2023-04-28 17:20:16 +05:30
Xiao Xufeng
7dd054fe6b i2s: use STAILQ_NEXT instead empty to improve readability 2023-04-28 18:49:10 +08:00
Jiang Jiang Jian
cac7a5c9cb Merge branch 'bugfix/fix_bleqabr23_28' into 'master' 
Bluedroid: report disconnect event after BLE link closed

See merge request espressif/esp-idf!23156
 2023-04-28 17:59:29 +08:00
Jiang Jiang Jian
968ef8c24f Merge branch 'bugfix/fix_esp32_ble_disconnect_failed' into 'master' 
Fixed BLE disconnection failure on ESP32

See merge request espressif/esp-idf!23450
 2023-04-28 17:57:41 +08:00
Jiang Jiang Jian
b0d595d057 Merge branch 'bugfix/hf_cind_ind_index' into 'master' 
bt: Fixed the inconsistency between the indicator event received by the HF application layer and the actually received indicator

Closes IDFGH-4674

See merge request espressif/esp-idf!23431
 2023-04-28 17:48:14 +08:00
Island
d6b7fc9c55 Merge branch 'bugfix/fixed_ble_mic_error' into 'master' 
ble: [ESP32C6][ESP32H2][ESP32C2] updata libble to 182858c1

Closes BLEQABR23-108, BLEQABR23-121, BLEQABR23-132, BLEQABR23-152, BLEQABR23-166, WIFI-5739, WIFI-5755, and COEX823-22

See merge request espressif/esp-idf!23327
 2023-04-28 17:13:06 +08:00
Darian Leung
03ce2fbaf0 driver: Fix ana_cmpr negative enum comparison 
The C17 standard (sec 6.7.2.2) indicates that the underlying type of an enum is
implementation defined (i.e., can be signed or unsigned). Thus, comparing
"-1 >= some_enum" where "some_enum" is always 0 or largert can return true if
the compiler uses unsigned for enums.

This commit fixes the following issues with ana_cmpr:

- Fixed incorrect comparison in ana_cmpr_del_unit() that relied on enums being
signed, thus would always return true.
- Fixed incorrect expected argument in the "ana_cmpr_unit_install_uninstall"
test. This was not picked up due to the incorrect enum comparison above.
 2023-04-28 14:52:50 +08:00
Wang Meng Yang
00687a1fb6 Merge branch 'bugfix/fix_ble_battery_profile_error' into 'master' 
Fixed battery profile wrong condition in bluedroid host

Closes IDFGH-9937

See merge request espressif/esp-idf!23358
 2023-04-28 14:50:03 +08:00
chenjianhua
5908cd968f Update bt lib for ESP32-C3 and ESP32-S3 
- Fixed ble hopping selection for connection when disabled 5.0 feature
 2023-04-28 14:17:37 +08:00
Mahavir Jain
b5055b9bfa Merge branch 'feature/add_mbedtls_ciphersuites_set_get_api' into 'master' 
esp-tls: Add config and api to set and get ciphersuites list

Closes IDF-7183

See merge request espressif/esp-idf!23320
 2023-04-28 13:01:59 +08:00
morris
542c705282 Merge branch 'bugfix/lcd_cam_reg_clk_sel' into 'master' 
soc: fix lcd_cam clock selection description

Closes IDFGH-9972

See merge request espressif/esp-idf!23391
 2023-04-28 12:22:32 +08:00
morris
36c134bdc3 gptimer: enlarge test threshold 2023-04-28 11:43:50 +08:00
Shen Weilong
64c9dfd7d2 ble: [ESP32C6][ESP32H2][ESP32C2] updata libble 
Fixed the occasional mic error caused by wrong tx cnt
Fixed the BLE connection timeout issue
 2023-04-28 11:21:39 +08:00
Marius Vikhammer
47dda378ca Merge branch 'bugfix/pm_trace_pins_c6' into 'master' 
pm: fix invalid trace pins for C6 and H2

Closes IDFCI-1697

See merge request espressif/esp-idf!23496
 2023-04-28 09:17:58 +08:00
morris
de72ac217c Merge branch 'bugfix/rmt_one-wire' into 'master' 
rmt_onewire: refactor example with component registry

Closes IDFGH-9422

See merge request espressif/esp-idf!23288
 2023-04-28 04:51:32 +08:00
Jiang Jiang Jian
25222163b9 Merge branch 'bugfix/fix_softap_pairwise_cipher_issue' into 'master' 
esp_wifi: update pairwise cipher in softAP

Closes WIFI-5768 and WIFI-5779

See merge request espressif/esp-idf!23270
 2023-04-27 21:31:19 +08:00
yuanjianmin
f74447103f esp-tls: Add config and api to set and get ciphersuites list 2023-04-27 19:22:27 +08:00
Mahavir Jain
cba923788e Merge branch 'feature/tls1_3_support' into 'master' 
esp-tls: add initial support for TLS1.3 connections (client mode)

Closes IDF-7251 and IDF-7252

See merge request espressif/esp-idf!23442
 2023-04-27 18:13:43 +08:00
hongshuqing
430776fc46 fix wrong hp ldo for h2 2023-04-27 17:29:10 +08:00
morris
fb3d24739a soc: sync lcd_cam register description with TRM 
Closes https://github.com/espressif/esp-idf/issues/11257
 2023-04-27 16:28:05 +08:00
Guillaume Souchere
c84f0b25ac console: Fix building issue when serial JTAG is set 
Closes https://github.com/espressif/esp-idf/issues/10707
 2023-04-27 15:28:23 +08:00
Marius Vikhammer
220bb4452f pm: fix invalid trace pins for C6 and H2 2023-04-27 15:19:17 +08:00
morris
af2085b789 rmt_onewire: refactor example with component manager 
Closes https://github.com/espressif/esp-idf/issues/10790
 2023-04-27 15:02:55 +08:00
Jiang Jiang Jian
afd0e384db Merge branch 'feature/support_fosc_calibration_h2_eco2' into 'master' 
ESP32H2: Fix fosc calibration fail bug for ECO2 & Above

See merge request espressif/esp-idf!23464
 2023-04-27 14:37:38 +08:00
Marius Vikhammer
68088c6371 Merge branch 'ci/fix_overwrite_pytest_configs' into 'master' 
ci: fixed test apps overriding idf_build_apps configs

See merge request espressif/esp-idf!23387
 2023-04-27 14:32:18 +08:00
Chen Jian Hua
b2906d412d Merge branch 'feature/support_periodic_adv_sync_trans' into 'master' 
Bluedroid: add periodic adv sync transfer API and EVT

See merge request espressif/esp-idf!22146
 2023-04-27 14:19:43 +08:00
Chen Jian Hua
809bd5a52c Merge branch 'feature/support_gatt_read_multi_variable' into 'master' 
Bluedroid: add GATT read multi variable API and EVT

See merge request espressif/esp-idf!21990
 2023-04-27 14:18:22 +08:00
muhaidong
bd77a74c9d esp_wifi: update pairwise cipher in softAP 2023-04-27 14:08:28 +08:00
Rahul Tank
aaefc8ce46 Merge branch 'feature/expose_addr_resolv_out_stack' into 'master' 
Nimble:Added change to expose addr resolution API outside stack

See merge request espressif/esp-idf!23183
 2023-04-27 13:02:59 +08:00
Jiang Jiang Jian
670c086807 Merge branch 'bugfix/pmkid_sha256_bug' into 'master' 
wpa_supplicant: Fix PMKID SHA__256 related regression

Closes WIFI-5741 and WIFI-5740

See merge request espressif/esp-idf!23476
 2023-04-27 12:47:04 +08:00
Shu Chen
8fd6e7311e Merge branch 'bugfix/border_router_connect_with_SSED' into 'master' 
OpenThread BR: support link metrics registration and csl.

See merge request espressif/esp-idf!23441
 2023-04-27 11:19:10 +08:00
muhaidong
bd16d6feeb esp_supplicant: When the softAP authentication mode is set to WPA2_PSK, WPA2_WPA3_PSK, or WPA3_PSK, the pairwise cipher will be overwritten with WIFI_CIPHER_TYPE_CCMP 2023-04-27 10:56:36 +08:00
muhaidong
76ac4add53 esp_supplicant: wpa pmf should be disabled 2023-04-27 10:56:25 +08:00
Jiang Jiang Jian
ef91be6a71 Merge branch 'bugfix/reject_tkip_in_owe' into 'master' 
Reject TKIP cipher incase of OWE connection

See merge request espressif/esp-idf!23457
 2023-04-27 10:21:01 +08:00
xiongweichao
f04b663ac4 bt: Fixed the inconsistency between the indicator event received by the HF application layer and the actually received indicator. 
Closes https://github.com/espressif/esp-idf/issues/6486
 2023-04-27 10:06:18 +08:00
Xu Si Yu
fc1fdca416 OpenThread border router: support border router to connect with SSED 2023-04-27 01:13:41 +00:00
Almir Okato
8d84a5315a Merge branch 'fix/bootloader_missing_include' into 'master' 
bootloader_support: add missing header to bootloader_flash.c

See merge request espressif/esp-idf!23221
 2023-04-27 06:26:49 +08:00
Xu Si Yu
55c3bbed85 Merge branch 'bugfix/increase_timeout_for_ieee802154_ci' into 'master' 
ieee802154: increase the timeout for ieee802.15.4 CI test

See merge request espressif/esp-idf!23463
 2023-04-27 06:17:05 +08:00
Sarvesh Bodakhe
0518d2eb65 wpa_supplicant: Fix PMKID SHA-256 related regression 
Fixed regression caused by commit 38e9c8b4
 2023-04-26 18:00:32 +05:30
Laukik Hase
56123c52aa Merge branch 'ci/migrate_nvs_flash_to_component_test_apps' into 'master' 
nvs_flash: Migrate UTs to component test-apps

Closes IDF-5596

See merge request espressif/esp-idf!23411
 2023-04-26 20:23:25 +08:00
Rahul Tank
10e93dc1f4 Nimble:Added change to expose addr resolution API outside stack 2023-04-26 17:47:47 +05:30
Zhi Wei Jian
0b5b9520ba Merge branch 'bugfix/fix_own_addr_is_rap_random_err' into 'master' 
Fixed no error report when own address type is rpa_random and no random address setting

Closes BLEQABR23-159

See merge request espressif/esp-idf!23363
 2023-04-26 20:15:53 +08:00
xiongweichao
481034060a bt: Fixed the problem of out-of-bounds access caused by the variable-length array introduced in 3268075231 
Closes https://github.com/espressif/esp-idf/issues/11264
 2023-04-26 19:31:07 +08:00
Jakob Hasse
ca44fc3847 cxx/esp_hw_support: added build test, changed parameter types 
Changed rv_utils_intr_edge_ack and esp_cpu_intr_edge_ack to
take uint32_t instead of int to avoid build errors.

The test is to test in particular that __builtin_ffsll, used in
xt_utils.h, which is included via esp_cpu.h, compiles fine
in C++20 with -Wsign-conversion enabled.

Closes https://github.com/espressif/esp-idf/pull/10895
 2023-04-26 19:06:39 +08:00
xiongweichao
de24e9b86e bt: Fixed codec mode error in ESP_HF_WBS_RESPONSE_EVT 2023-04-26 17:51:16 +08:00
Marius Vikhammer
9357f0977c Merge branch 'ci/chip_support_network_invalid_kconfigs' into 'master' 
ci: remove redundant ci configs for chip support and network components

See merge request espressif/esp-idf!23430
 2023-04-26 17:26:05 +08:00
hongshuqing
cbc5a38e26 support h2 eco2 fosc calibration 2023-04-26 15:31:18 +08:00
Xu Si Yu
c985267ccf ieee802154: increase the timeout for ieee802.15.4 CI test 2023-04-26 15:06:33 +08:00
Shyamal Khachane
e16b6f9369 esp_wifi: Reject TKIP cipher incase of OWE connection 2023-04-26 11:24:11 +05:30
Laukik Hase
4ac95a33fd
nvs_flash: Migrate UTs to component test-apps 2023-04-26 10:21:03 +05:30
zhiweijian
025fe44edb Fixed BLE disconnection failure on ESP32 2023-04-26 11:20:09 +08:00
Marius Vikhammer
1a5e47bd07 ci: fixed test apps overriding pytest configs 2023-04-26 11:07:35 +08:00
Shu Chen
5d222db12f Merge branch 'support/ieee802154_driver_opensrc' into 'master' 
ieee802154: Support driver code open src

See merge request espressif/esp-idf!22857
 2023-04-26 10:35:42 +08:00
Marius Vikhammer
bca026455c ci: remove redundent ci configs for chip support and network components 
CI would build psram config test apps even for target with no psram.
 2023-04-26 09:54:29 +08:00
Martin Vychodil
668521dfe7 Merge branch 'feature/vfs_test_app' into 'master' 
VFS: move tests from unit-test-app to a component test app

See merge request espressif/esp-idf!23145
 2023-04-26 09:23:28 +08:00
Kapil Gupta
f73bd61ebe Merge branch 'bugfix/dpp_retry_start_listening_issue' into 'master' 
esp_dpp: Fix retry with esp_supp_dpp_start_listen after failure

See merge request espressif/esp-idf!23369
 2023-04-26 01:07:03 +08:00
Zim Kalinowski
4a647d08de Merge branch 'feature/c6_ulp_sleep' into 'master' 
ulp: added sleep support for lp core

Closes IDF-7012

See merge request espressif/esp-idf!23103
 2023-04-25 22:40:52 +08:00
Jakob Hasse
af2d326a95 Merge branch 'feature/freertos_plus_posix_SMP' into 'master' 
[FreeRTOS/Linux] POSIX/Linux and SMP

Closes IDF-6087

See merge request espressif/esp-idf!21818
 2023-04-25 20:21:26 +08:00
Mahavir Jain
3fd171f092
mbedtls: fix small typo in the config file 2023-04-25 17:44:28 +05:30
Mahavir Jain
7fd1378fbb
esp_tls: add initial support for TLS 1.3 connection 2023-04-25 17:40:01 +05:30
Sonika Rathi
d83c681078 VFS: move tests from unit-test-app to a component test app 2023-04-25 17:24:20 +05:30
Mahavir Jain
a8b6a70620 Merge branch 'feature/add_bignum_ll_layer' into 'master' 
bignum: added bignum hal and ll layer

Closes IDF-7071

See merge request espressif/esp-idf!22823
 2023-04-25 19:50:25 +08:00
Song Ruo Jing
e2a5c092f7 Merge branch 'refactor/rename_to_esp_clk_tree_prefix' into 'master' 
esp_clk_tree: Rename clk_tree_xxx to esp_clk_tree_xxx

See merge request espressif/esp-idf!23362
 2023-04-25 19:41:39 +08:00
Ivan Grokhotkov
9d82d6bf7f
xtensa: don't print debug messages to stderr 
By default, CMake message() commands prints to stderr.
IDEs like Eclipse show stderr output in red, which looks as if this is
some kind of error.

Use message(STATUS) instead.
 2023-04-25 12:59:41 +02:00
Isha Pardikar
08a21e3e26 Merge branch 'bugfix/wifi_prov_deinit_github' into 'master' 
wifi_prov_mgr: Fixed memory leak after bluetooth stack was stopping.

See merge request espressif/esp-idf!23413
 2023-04-25 18:22:02 +08:00
Jiang Jiang Jian
58272a70b4 Merge branch 'esp32c6/bugfix_for_memory_leak_cause_by_timer' into 'master' 
esp_wifi: bugfix for esp32c6 memory leak

See merge request espressif/esp-idf!23401
 2023-04-25 18:04:36 +08:00
Radek Tandler
d8f2c0e715 Merge branch 'feature/storage_host_test_ffs' into 'master' 
fatfs: host test migrated to CMake and esp_partition emulation for linux

See merge request espressif/esp-idf!23265
 2023-04-25 15:30:09 +08:00
Song Ruo Jing
a4e8960ab4 esp_clk_tree: Rename clk_tree_xxx to esp_clk_tree_xxx, add compilation warning to clk_tree.h 2023-04-25 14:12:06 +08:00
C.S.M
7d9d27a060 Merge branch 'refactor/driver_ut_to_test_app' into 'master' 
CI: Move all UT in driver to test_app

See merge request espressif/esp-idf!23343
 2023-04-25 14:10:11 +08:00
Jakob Hasse
550ecbe37a feat(freertos): added POSIX/Linux simulator port to FreeRTOS SMP 
* Added a POSIX/Linux simulator that is compatible with the Amazon
  FreeRTOS SMP API. Note that the simulator itself is still
  single core, like the IDF FreeRTOS POSIX/Linux simulator.
 2023-04-25 13:58:57 +08:00
Roman Leonov
36a09e957f Merge branch 'feature/usb_host_interface_claim_debug_info' into 'master' 
usb_host: better debugging information during usb_host_interface_claim()

Closes IDF-6314

See merge request espressif/esp-idf!22882
 2023-04-25 13:15:58 +08:00
Shu Chen
2905dbaa79 Merge branch 'bugfix/SPI-conflict-between-OT-SPINEL-and-Ethernet' into 'master' 
openthread: fix the spi conflict between ot-spinel and ethernet

See merge request espressif/esp-idf!23344
 2023-04-25 12:09:30 +08:00
Marius Vikhammer
266229ea34 Merge branch 'bugfix/esp32_pico_v3_2_chip_info' into 'master' 
system: fix esp32 chip info not listing esp32 pico v3-02 as having embedded spiram

Closes IDFGH-9938

See merge request espressif/esp-idf!23383
 2023-04-25 11:53:38 +08:00
Marius Vikhammer
359b237cc5 ulp: added sleep support for lp core 
Added support for running LP core while hp core sleeps, as well
as waking up the hp core.
 2023-04-25 11:51:35 +08:00
zhangwenxu
c8c1cd1c55 ieee802154: support driver opensrc 2023-04-25 11:48:13 +08:00
Cao Sen Miao
8882ba2ba1 CI: Move all UT in driver to test_app 2023-04-25 10:40:32 +08:00
Martin Vychodil
e1a20bf7f0 Merge branch 'fix/sdio_sd_cards_not_detected_correctly' into 'master' 
sdmmc: sdio combination cards correct setup

Closes IDFGH-8856 and IDFGH-8348

See merge request espressif/esp-idf!23416
 2023-04-25 06:36:46 +08:00
Kevin (Lao Kaiyao)
6b5077f2d7 Merge branch 'refactor/remove_esp32h4_target' into 'master' 
esp32h4: removed esp32h4 target (stage 2)

Closes IDF-7237, IDF-7238, and IDF-7239

See merge request espressif/esp-idf!23179
 2023-04-24 23:34:19 +08:00
Adam Múdry
84bac4e38f sdmmc: sdio combination cards correct setup 
Co-authored-by: Mau Abata <mauabata@gmail.com>
Closes https://github.com/espressif/esp-idf/issues/9822
Closes https://github.com/espressif/esp-idf/issues/10280
 2023-04-24 17:03:09 +02:00
xuxiao
8df3e461f0 esp_wifi: bugfix for esp32c6 memory leak 2023-04-24 20:41:22 +08:00
isha.pardikar@espressif.com
f29430239c wifi_prov_mgr: Fixed memory leak after bluetooth stack was stopping. 2023-04-24 17:45:41 +05:30
harshal.patil
fbb8937758 bignum: bare-metal mpi peripheral verification application 2023-04-24 16:15:11 +05:30
harshal.patil
56327452ce esp_hw_support: add crypto lock layer for esp32 2023-04-24 16:15:11 +05:30
harshal.patil
4ae1ea7b9f bignum: refactored the hardware abstraction of the mpi peripheral 
- `<target>/bignum.c` is replaced by mpi_ll.h ll layer.
- added the mpi hal layer.
 2023-04-24 16:15:11 +05:30
Ondrej Kosta
22caec278f Merge branch 'feature/emac_hal_cleanup' into 'master' 
wrapped emac_ll functions to emac_hal

Closes IDFGH-8474

See merge request espressif/esp-idf!23078
 2023-04-24 15:47:29 +08:00
Konstantin Kondrashov
6132abe970 Merge branch 'feature/add_missed_settings_for_bootloader_reserve_rtc_mem_for_c6_h2' into 'master' 
esp_system (C6 & H2): Enables BOOTLOADER_RESERVE_RTC_MEM feature for bootloader

See merge request espressif/esp-idf!23347
 2023-04-24 14:50:47 +08:00
Roman Leonov
1be6977a9d usb_host: better debugging information during hcd_pipe_alloc() when usb_host_interface_claim() is being fulfiled. 2023-04-24 08:37:57 +02:00
Shu Chen
8b422cbfa0 Merge branch 'fix/openthread_platform_udp_send_rules' into 'master' 
openthread: fix platform udp send rules for OT netif

See merge request espressif/esp-idf!23206
 2023-04-24 14:02:21 +08:00
Marius Vikhammer
895c21cc6b system: fix esp32 chip info not listing esp32 pico v3-02 as having embedded spiram 
Closes https://github.com/espressif/esp-idf/issues/11233
 2023-04-24 11:23:15 +08:00
Jiang Jiang Jian
269ff98449 Merge branch 'feature/support_ble_gatts_show_local_db' into 'master' 
Bluedroid: support gatts show local database

See merge request espressif/esp-idf!23341
 2023-04-24 10:36:12 +08:00
Wan Lei
06a40598bf Merge branch 'feature/spi_hal_move_out_iram' into 'master' 
spi: change linker file to move spi hal out from iram

Closes IDF-7163

See merge request espressif/esp-idf!23036
 2023-04-24 10:15:10 +08:00
Ivan Grokhotkov
ca807ae9a0
Merge branch 'version/v5.2.0' into 'master' 
version: update to v5.2.0

See merge request espressif/esp-idf!23286
 2023-04-23 23:16:27 +02:00
Ivan Grokhotkov
39580dd08c
version: update to v5.2.0 
Starting IDF v5.2 development
 2023-04-23 21:52:21 +02:00
jasta
1885379ae3 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-04-23 20:27:20 +05:30
zhangwenxu
1d101f67e4 esp_phy: remove esp32h4 phylib 2023-04-23 12:03:07 +00:00
zhangwenxu
c05b9403f7 ieee802154: remove libieee802154.a for target esp32h4 2023-04-23 12:03:07 +00:00
laokaiyao
49f16eefbb esp32h4: checked all the corner stuffs of the removal 2023-04-23 12:03:07 +00:00
laokaiyao
bf2a7b2df6 esp32h4: removed esp32h4 related codes 2023-04-23 12:03:07 +00:00
laokaiyao
b16ed57b2e esp32h4: removed esp32h4 related files 2023-04-23 12:03:07 +00:00
Michael (XIAO Xufeng)
59a899230c Merge branch 'feature/support_fosc_calibration_c6_eco1' into 'master' 
ESP32C6: Fix fosc calibration fail bug for ECO1 & Above

Closes IDF-7093

See merge request espressif/esp-idf!23215
 2023-04-23 18:04:28 +08:00
chenjianhua
0f7446f93f bluedroid: support gatts show local database 2023-04-23 17:22:04 +08:00
Song Ruo Jing
6700630ccb Merge branch 'refactor/ledc_driver_refactor' into 'master' 
ledc: Improvement made on the LEDC driver

See merge request espressif/esp-idf!22971
 2023-04-23 16:43:52 +08:00
zwj
7d1e7d2766 Fixed no error report when own address type is rpa_random and no random address setting 2023-04-23 16:15:39 +08:00
hongshuqing
e3148369f3 support c6 eco1 fosc calibration 
support c6 eco1 fosc calibration

support c6 eco1 fosc calibration

support c6 eco1 fosc calibration

Apply suggestion

Apply

support c6 eco1 fosc calibration

support c6 eco1 fosc calibration
 2023-04-23 13:36:20 +08:00
C.S.M
e1149f018a Merge branch 'contrib/github_pr_10811' into 'master' 
i2c: I2c cmdnum fix (GitHub PR)

Closes IDFGH-9444

See merge request espressif/esp-idf!22473
 2023-04-23 11:29:46 +08:00
zhiweijian
1d548ae1f2 Fixed battery profile wrong condition 2023-04-23 11:15:57 +08:00
Zhang Xiao Yan
2c24513d86 Merge branch 'docs/update_components_log_readme' into 'master' 
add description related to thread safety to component/log/readme

See merge request espressif/esp-idf!23162
 2023-04-23 11:11:25 +08:00
Zhang Xiao Yan
9ba5004dab add description related to thread safety to component/log/readme 2023-04-23 11:11:24 +08:00
Darian
2fdba8ec19 Merge branch 'feature/freertos_add_create_task_with_caps' into 'master' 
FreeRTOS: Add xTaskCreateWithCaps()

Closes IDFGH-9922

See merge request espressif/esp-idf!23191
 2023-04-21 22:33:03 +08:00
KonstantinKondrashov
a622ac43eb esp_system (C6 & H2): Enables BOOTLOADER_RESERVE_RTC_MEM feature for bootloader 
This option reserves an area in RTC FAST memory for the following features:
- "Skip image validation when exiting deep sleep"
- "Reserve RTC FAST memory for custom purposes"
- "GPIO triggers factory reset"
 2023-04-21 21:09:10 +08:00
Roland Dobai
1bf382a3e1 Merge branch 'monitor_win_color' into 'master' 
bug(idf_monitor, hints): fix monitor colors on windows with hints

Closes IDF-5863

See merge request espressif/esp-idf!22070
 2023-04-21 20:15:38 +08:00
Hanno
8f1cf01ec8 i2c: introduce chip specific cmd register number 
Merges https://github.com/espressif/esp-idf/pull/10811
 2023-04-21 19:22:53 +08:00
xieqinan
f4446d8819 openthread: fix the spi conflict between ot-spinel and ethernet 2023-04-21 19:12:47 +08:00
wanlei
15e8c04f7b spi: change linker file let spi hal able to out from iram 2023-04-21 18:58:36 +08:00
wanlei
b519eed230 spi_flash: fix config SPI_FLASH_SHARE_SPI1_BUS dependency 2023-04-21 18:57:06 +08:00
wen13245
ffa79a4b4e
Modifies the argument of the sizeof statement to a legitimate array name 2023-04-21 18:44:06 +08:00
Kapil Gupta
a189bdbc7d Merge branch 'bugfix/init_wpsreg_in_APSTA_mode' into 'master' 
esp_wifi:Enable wpsreg to initialize in APSTA mode

Closes WIFI-5436

See merge request espressif/esp-idf!23034
 2023-04-21 17:15:00 +08:00
radek.tandler
13a305656d host_test: cleanup of make based obsolete code in wl, fatfs and spi_flash 2023-04-21 10:45:17 +02:00
radek.tandler
0078025d7b fatfs: host test migrated to CMake and esp_partition emulation for linux 2023-04-21 10:45:07 +02:00
Song Ruo Jing
fcc6514dde ledc: Add an all-in-one HAL function to set fade parameters, and refactor ledc_ll_get_max_duty function 2023-04-21 16:40:54 +08:00
Song Ruo Jing
64aec54308 ledc: Add timer selection check to the driver, and leave space for future clk tree management 2023-04-21 16:40:54 +08:00
Darian Leung
948010dc0b freertos: Add task creation with caps functions 
This commit adds the corresponding CreateWithCaps functions for tasks:

- xTaskCreatePinnedToCoreWithCaps()
- xTaskCreateWithCaps()
- vTaskDeleteWithCaps()

Documentation and migraiton guide have been updated accordingly.

Closes https://github.com/espressif/esp-idf/issues/11216
 2023-04-21 15:43:08 +08:00
C.S.M
a97d480f1f Merge branch 'bugfix/bod_intr' into 'master' 
brownout: Disable the hardware BOD reset when BOD interrupt is enabled

Closes IDF-7234

See merge request espressif/esp-idf!23192
 2023-04-21 14:44:29 +08:00
Darian
836755679e Merge branch 'feature/bt_uses_creationg_with_caps_functions' into 'master' 
BT: Remove "create static" calls from OSI

See merge request espressif/esp-idf!23187
 2023-04-21 12:39:10 +08:00
Zhi Wei Jian
a2b2cdadf8 Merge branch 'bugfix/fix_disable_controller_50_feature' into 'master' 
Disable controller 5.0 feature bits if host 5.0 feature is not enabled on ESP32C3  and ESP32S3

See merge request espressif/esp-idf!23307
 2023-04-21 12:11:11 +08:00
Zhi Wei Jian
89bf31f458 Merge branch 'bugfix/fix_disconnect_due_to_consecutive_crc_error_in_first_6_intervals' into 'master' 
Fixed disconnection due to consecutive CRC errors in first 6 intervals on ESP32

Closes CBLE50Y23-4

See merge request espressif/esp-idf!23207
 2023-04-21 12:01:14 +08:00
zhangwenxu
1a73ff1db1 openthread: fix platform udp send rules for OT netif 2023-04-21 10:52:02 +08:00
Cao Sen Miao
a3d962d89a brownout: Disable the hardware BOD when BOD interrupt is enabled 2023-04-21 10:22:59 +08:00
Ivan Grokhotkov
2a28061eaa Merge branch 'contrib/github_pr_11117' into 'master' 
test_nvs_host: fix asan reported bugs (GitHub PR)

Closes IDFGH-9860

See merge request espressif/esp-idf!23172
 2023-04-20 22:37:42 +08:00
Kevin (Lao Kaiyao)
4fd62bce13 Merge branch 'refacor/remove_esp32h4_target_stage1' into 'master' 
esp32h4: remove esp32h4 target (stage 1)

See merge request espressif/esp-idf!23237
 2023-04-20 20:29:58 +08:00
David Čermák
e888bb0cf8 Merge branch 'bugfix/esp_netif_recieve_returns' into 'master' 
esp_netif: Report error if esp_netif_receive() fails

Closes IDFGH-9398

See merge request espressif/esp-idf!22936
 2023-04-20 17:47:28 +08:00
Shreyas Sheth
5524aad43f esp_wifi:Enable wpsreg to initialize in APSTA mode 2023-04-20 14:48:14 +05:30
Tomas Rezucha
197c888611 Merge branch 'fix/usb/host/pytests' into 'master' 
usb_host: Use up-to-date syntax in pytest

See merge request espressif/esp-idf!23280
 2023-04-20 16:45:09 +08:00
laokaiyao
b7053b46ef esp32h4: remove esp32h4 target from peripherals 2023-04-20 15:19:45 +08:00
zhiweijian
f10de13df7 Disable controller 5.0 feature bits if host 5.0 feature is not enabled 2023-04-20 14:55:35 +08:00
Island
2300982af9 Merge branch 'bugfix/esp32c6_conn_lost_packet' into 'master' 
Ble: bugfix for packet loss issue during connection on ESP32C6

Closes BLEQABR23-63 and BLEQABR23-55

See merge request espressif/esp-idf!23223
 2023-04-20 12:00:29 +08:00
morris
d2473d0662 Merge branch 'feature/esp_rom_update_cpu_freq' into 'master' 
esp_rom: add common ROM API to update CPU tick rate

See merge request espressif/esp-idf!23266
 2023-04-20 10:59:16 +08:00
Zim Kalinowski
5d0838506a Merge branch 'bugfix/adds_iram_attr_for_some_esp_timer_apis' into 'master' 
esp_timer: Adds IRAM_ATTR for esp_timer_restart and esp_timer_is_active

Closes IDFGH-9122 and IDFGH-9500

See merge request espressif/esp-idf!22566
 2023-04-20 04:54:11 +08:00
Zim Kalinowski
db6ba5155c Merge branch 'feature/heap-trace-perf-improvment' into 'master' 
heap: Allow for hashmap placement in external memory

Closes IDFGH-9845

See merge request espressif/esp-idf!23184
 2023-04-20 04:37:52 +08:00
Jens Gutermuth
3ba70490c9 improve thread safety in esp_timer 
Inadequate locking in the esp_timer component allowed corruption
of the s_timers linked list:

1. timer_armed(timer) returns false
2. another task arms the timer and adds it to s_timers
3. the list is locked
4. the timer is inserted into s_timers again

The last step results in a loop in the s_timers list, which causes
an infinite loop when iterated. This change always locks the
list before checking if the timer is already armed avoiding
the data race.
 2023-04-19 16:59:43 +02:00
Ondrej Kosta
c231c79fc8 HAL: wrapped emac_ll functions to emac_hal 
Closes #9934
 2023-04-19 12:46:45 +00:00
Mahavir Jain
359da9ce63 Merge branch 'bugfix/efuse_hal_api_update' into 'master' 
efuse: add efuse hal api

Closes IDF-7215

See merge request espressif/esp-idf!23217
 2023-04-19 18:45:13 +08:00
KonstantinKondrashov
91fcced0fb esp_timer: Adds IRAM_ATTR for esp_timer_restart and esp_timer_is_active 
Closes https://github.com/espressif/esp-idf/issues/10522
Closes https://github.com/espressif/esp-idf/issues/10859
 2023-04-19 17:42:38 +08:00
Tomas Rezucha
f2f6278ba6 usb_host: Use up-to-date syntax in pytest 2023-04-19 11:06:25 +02:00
Guillaume Souchere
6ce1ccd964 heap: Add trace configuration to allow hash map placement in external RAM bss section when possible 
- Remove the size limit for the hash_map array from the CONFIG_HEAP_TRACE_HASH_MAP_SIZE
- Add test case for heap tracing using hashmap
- Update heap_debug.rst to document the newly added configurations in the heap component

Closes https://github.com/espressif/esp-idf/issues/11172
 2023-04-19 10:30:59 +02:00
Jakob Hasse
d82eb6942c Merge branch 'contrib/github_pr_11025' into 'master' 
Enable support for C++23 in esp-idf (GitHub PR)

Closes IDFGH-9684

See merge request espressif/esp-idf!23144
 2023-04-19 15:53:46 +08:00
Jakob Hasse
852c60fee0 Merge branch 'refactor/pthread_iram' into 'master' 
pthread: removed IRAM code from pthread

Closes IDF-7147

See merge request espressif/esp-idf!23213
 2023-04-19 15:31:19 +08:00
morris
cae3ef45e1 Merge branch 'contrib/github_pr_10950' into 'master' 
esp_system: Add reset reasons for USB_UART and USB_JTAG (GitHub PR)

Closes IDFGH-9601

See merge request espressif/esp-idf!22675
 2023-04-19 15:30:01 +08:00
Darian
0bb3342491 Merge branch 'refactor/xtensa_move_common_source_files' into 'master' 
Xtensa: Separate files according to Xtensa RTOS porting layer

See merge request espressif/esp-idf!21672
 2023-04-19 15:15:21 +08:00
Jiang Jiang Jian
5a603a6612 Merge branch 'bugfix/improve_scan_performance_when_scan_and_sync_coexist' into 'master' 
improve scan performance when scan and sync coexist on ESP32-C3 and ESP32-S3

Closes CBLE50Y23-5, BLEQABR23-57, and BT-3094

See merge request espressif/esp-idf!23211
 2023-04-19 13:52:55 +08:00
morris
4123e611dc esp_rom: add common ROM API to update CPU tick rate 2023-04-19 13:21:26 +08:00
Nebojsa Cvetkovic
67e9db7cf5 esp_system: Add reset reasons for USB_UART and USB_JTAG 
Merges https://github.com/espressif/esp-idf/pull/10950
 2023-04-19 10:09:19 +08:00
Ivan Grokhotkov
690aa433a2 Merge branch 'contrib/github_pr_10987' into 'master' 
Allow to config the maximum number of VFS entries. (GitHub PR)

Closes IDFGH-9641

See merge request espressif/esp-idf!23171
 2023-04-19 04:52:50 +08:00
Ivan Grokhotkov
9adafb0f26 Merge branch 'feature/newlib_fsync_without_vfs' into 'master' 
newlib: implement fsync for the case of CONFIG_VFS_SUPPORT_IO=0

See merge request espressif/esp-idf!21390
 2023-04-19 02:47:53 +08:00
Darian
f93bb3a63c Merge branch 'contrib/github_pr_11113' into 'master' 
Fix usb enumeration stage error for some device (GitHub PR)

Closes IDFGH-9778

See merge request espressif/esp-idf!23233
 2023-04-19 02:19:26 +08:00
Jiang Jiang Jian
c8983219b9 Merge branch 'feature/esp32c6_espnow_support_11ax_rate' into 'master' 
esp_wifi: espnow support using 11ax rate to send frame

See merge request espressif/esp-idf!22754
 2023-04-19 02:05:14 +08:00
Aditya Patwardhan
823322f988 Merge branch 'feature/update_mbedtls_v3.4.0' into 'master' 
mbedtls: Update to release/v3.4.0

Closes IDF-7158

See merge request espressif/esp-idf!23058
 2023-04-18 21:29:28 +08:00
zwj
9d9252acbc Fixed disconnection due to consecutive CRC errors in first 6 intervals 2023-04-18 20:36:04 +08:00
Roland Dobai
a05b306782 Merge branch 'esptool_extra' into 'master' 
feat(esptool): allow to force flash chip

Closes IDF-6838 and IDF-5381

See merge request espressif/esp-idf!23097
 2023-04-18 19:35:32 +08:00
xuxiao
0848938868 esp_wifi: espnow support using 11ax rate to send frame 2023-04-18 18:06:52 +08:00
Xu Xiao
ddb57be1bc Merge branch 'bugfix/store_softap_nvs_authmode_wpa3' into 'master' 
esp_wifi: Bugfix softAP store wpa3 sae authmode in nvs

Closes WIFI-5749

See merge request espressif/esp-idf!23203
 2023-04-18 17:56:31 +08:00
Ivan Grokhotkov
35ea136d5a
newlib: implement fsync for the case of CONFIG_VFS_SUPPORT_IO=0 
This feature allows calling fsync even if the vfs component is not
used.
The second part of the commit adds an fsync call in the panic test app
enabling it to be used over usb-serial-jtag.
 2023-04-18 11:19:36 +02:00
Martin Vychodil
81d814b42f Merge branch 'bugfix/fatfs_open_O_CREAT_fails' into 'master' 
fatfs: fix "open("xx",O_CREAT|O_WRONLY,0666)" call failure

See merge request espressif/esp-idf!23045
 2023-04-18 16:33:00 +08:00
Ivan Grokhotkov
274fa56e71 Merge branch 'bugfix/esp32s3_usb_otg_console' into 'master' 
system: support USB_OTG CDC console on ESP32-S3

Closes IDF-2048, IDF-2987, IDFGH-7134, IDFGH-7291, and IDFGH-7835

See merge request espressif/esp-idf!19312
 2023-04-18 16:28:49 +08:00
Armando (Dou Yiwen)
4adef05163 Merge branch 'test/temporarily_removed_emmc_esp32_ut' into 'master' 
emmc: temporarily removed esp32 emmc ut_017

See merge request espressif/esp-idf!23244
 2023-04-18 16:18:07 +08:00
Sachin Billore
c3e701588e efuse: add efuse hal api 
Closes IDF-7215
 2023-04-18 13:47:00 +05:30
Darian Leung
6587e75251 xtensa: Add bare metal port stub functions for G0 build test 
This commit adds "bare metal stubs" xtensa_rtos.h glue layer to mimic a bare
metal OS port. The bare metal stubs don't access any components outside of the
G0 group.
 2023-04-18 15:51:38 +08:00
Darian Leung
5fde889a3d xtensa: Remove OS agnostic files from Amazon SMP FreeRTOS port 
The previous commit moved the OS agnostic files from the IDF FreeRTOS port to
the xtensa component, thus can be accessed by both IDF and Amazon SMP FreeRTOS.

This commit removes the redudant copies in the Amazon SMP FreeRTOS port.
 2023-04-18 15:51:38 +08:00
Darian Leung
b2c074bb70 xtensa: Move Xtensa RTOS porting layer files to xtensa component 
When porting an RTOS to the Xtensa architecture, there are a few files that
are common to all Xtensa RTOS ports. These files form the Xtensa RTOS porting
layer (e.g., "xtensa_vectors.S", "xtensa_context.S"). An Xtensa RTOS port is
expected to provide an RTOS specific "xtensa_rtos.h" header to interface with
the Xtensa RTOS porting layer.

Previously, the Xtensa RTOS porting layer files were placed in the FreeRTOS
component. This commit does the following:

1. Moves the Xtensa RTOS porting layer files from the `freertos` component to
the `xtensa` component. The following files were moved:

    - xtensa_asm_utils.h
    - xtensa_context.S
    - xtensa_loadstore_handler.S
    - xtensa_vectors.S

2. Refactored xtensa component include paths to separate Xtensa RTOS porting
layer headers.

- Xtensa HAL headers included via `#include <xtensa/...h>`
- Xtensa RTOS porting layer headers included via `#include <...h>`

Note: The xtensa files in the Amazon SMP FreeRTOS port are not moved/deleted in
this commit to ensure the moved files retain a clean diff history.
 2023-04-18 15:28:05 +08:00
Shu Chen
e033d34baa Merge branch 'openthread/add_lock_check' into 'master' 
openthread: Add check for lock acquire and release

See merge request espressif/esp-idf!23204
 2023-04-18 15:17:38 +08:00
Zim Kalinowski
05cbd19f25 Merge branch 'feature/pthread_rwlock_try_functions' into 'master' 
pthread: added pthread_rwlock_tryrd/rwlock()

Closes IDFGH-7685

See merge request espressif/esp-idf!23228
 2023-04-18 14:43:54 +08:00
Ivan Grokhotkov
f64ac33554
nvs: fix string/blob comparison lengths in host tests 2023-04-18 08:02:38 +02:00
Sonika Rathi
b31b68fc68 bugfix: fix for fatfs "open("xx",O_CREAT|O_WRONLY,0666)" call failure 
fatfs 'open' with only O_CREAT flag fails to creat new file

Closes https://github.com/espressif/esp-idf/issues/1817
 2023-04-18 09:57:44 +05:30
Song Ruo Jing
9cfc9757b9 Merge branch 'bugfix/allow_no_specify_uart_clk_src' into 'master' 
uart: Allow omitting source_clk parameter to uart_param_config

Closes IDF-6951

See merge request espressif/esp-idf!23208
 2023-04-18 11:34:11 +08:00
Armando
2225087756 emmc: temporarily removed esp32 emmc ut_017 2023-04-18 10:11:36 +08:00
Mahavir Jain
6773ad6431 Merge branch 'fix/esp32s3_ununsed_dcache_as_dram' into 'master' 
esp_hw_support: Update the memory ptr location/property checks to include the unused DCACHE added to DRAM

Closes IDF-7103

See merge request espressif/esp-idf!22904
 2023-04-18 02:16:30 +08:00
morris
90c2786803 Merge branch 'bugfix/rmt_encode_state_init' into 'master' 
rmt: define RMT_ENCODING_RESET in rmt_encode_state_t

Closes IDFGH-9881 and IDFGH-9882

See merge request espressif/esp-idf!23222
 2023-04-17 21:22:20 +08:00
WanqQixiang
3ac08425f2 openthread: Add check for lock acquire and release 2023-04-17 19:56:49 +08:00
zwl
c4ec33e7ef Ble: bugfix for packet loss issue during connection on ESP32C6 2023-04-17 19:37:00 +08:00
Peter Dragun
faa82b060c feat(esptool): allow to set force for write_flash 2023-04-17 12:53:01 +02:00
Shreyas Sheth
1a0633646e esp_wifi: Bugfix store authmode security in NVS 2023-04-17 15:16:21 +05:30
Peter Dragun
bebd2cec4a bug(idf_monitor): fix color on windows with hints 
Closes https://github.com/espressif/esp-idf/issues/9610
 2023-04-17 11:18:42 +02:00
Darian Leung
525de5bd21 usb_host: Update docs and comments regarding first configuration enumeration 
This commit updates some comments and documentation regarding changes made in
PR https://github.com/espressif/esp-idf/pull/11113.
 2023-04-17 17:06:54 +08:00
Kevin (Lao Kaiyao)
96f2d215a2 Merge branch 'bugfix/i2s_output_wrong_freq_after_switch' into 'master' 
i2s: workaround for inaccurate PLL frequency after switching

Closes IDF-6705 and IDFCI-1669

See merge request espressif/esp-idf!22975
 2023-04-17 16:26:18 +08:00
Jakob Hasse
e7312cccea pthread: added pthread_rwlock_tryrd/wrlock() 
Closes https://github.com/espressif/esp-idf/issues/9229
 2023-04-17 16:16:11 +08:00
morris
2a5ee5c3e2 Merge branch 'bugfix/spi_lcd_max_trans_size' into 'master' 
spi_lcd: maximum transfer size should respect bus configuration

Closes IDF-6901 and IDF-4829

See merge request espressif/esp-idf!23149
 2023-04-17 16:13:57 +08:00
Song Ruo Jing
3f2bed1f5c uart: Allow the users to not specify the source_clk in uart_config_t when calling uart_param_config 2023-04-17 15:43:06 +08:00
harshal.patil
c403affd98 mbedtls: fix ci failures for update v3.4.0 
- While updating to mbedtls release/v3.4.0, building mbedtls/library/psa_crypto.c,
clang produced an unreachable-code warning, so added `-Wno-unreachable-code` compile option for clang.
- In `mbedtls/v3.4.0`, the ECDSA restartable sign and verify functions (`ecdsa.c`) were made public.
- But the `mbedtls_ecdsa_sign_det_restartable` function prototype was declared in the file `ecdsa.h`,
only when `MBEDTLS_ECDSA_SIGN_ALT` was not defined.
- added a patch in mbedtls library to fix it.
 2023-04-17 12:55:04 +05:30
harshal.patil
9c3a6c4f53 mbedtls: replace low-level sha apis with md apis in esp_ssl_tls 2023-04-17 12:50:15 +05:30
harshal.patil
f30b58f665 mbedtls: Update config options as per release/v3.4.0 
- Added a Kconfig option for the newly added mbedtls option MBEDTLS_PKCS7_C
 2023-04-17 12:50:15 +05:30
harshal.patil
002a451bf8 mbedtls: Update to release/v3.4.0 
- Release Notes: https://github.com/Mbed-TLS/mbedtls/releases/tag/v3.4.0
 2023-04-17 12:50:15 +05:30
Wan Lei
029b56dc1c Merge branch 'ci/pytest_case_tester_script_fix' into 'master' 
ci: pytest automation script increase timeout time

See merge request espressif/esp-idf!23201
 2023-04-17 15:03:23 +08:00
Omar Chebib
3bc3f87209 Merge branch 'bugfix/i2c_timing_wrong' into 'master' 
i2c: fix a bug in sda sample timing

Closes IDFGH-8295

See merge request espressif/esp-idf!23185
 2023-04-17 15:00:42 +08:00
morris
b19a3e3e56 rmt: define RMT_ENCODING_RESET in rmt_encode_state_t 
Closes https://github.com/espressif/esp-idf/issues/11200
 2023-04-17 14:50:51 +08:00
Laukik Hase
11d5550da3
soc/esp32s3: Fix the SOC_MEM_INTERNAL_HIGH value 
- As per the memory block diagram for ESP32-S3, the
  internal memory address ranges as follows:
  DRAM: 0x3FC88000 (== SOC_MEM_INTERNAL_LOW) <-> 0x3FCF0000
  IRAM: 0x40378000 <-> 0x403E0000 (== SOC_MEM_INTERNAL_HIGH)
 2023-04-17 10:49:06 +05:30
Laukik Hase
f6aadd1e39
esp_hw_support: Update memory ptr location/property checks 
- to acknowledge the unused DCACHE added to DRAM for ESP32-S3

- For ESP32-S3, when the DCACHE size is set to 16 kB, the unused 48 kB is added to
  the heap in 2 blocks of 32 kB (from 0x3FCF0000) and 16 kB (from 0x3C000000).
- But, if we try allocating memory from the 16 kB block and run an `esp_ptr_internal`
  check on that memory pointer, it fails as the address block from 0x3C000000
  corresponds to the external memory symbols SOC_DROM_LOW and SOC_EXTRAM_DATA_LOW.
  (E.g. freertos - If the IDLE task stack buffer gets allocated from this region,
  the firmware will abort due to this failure).
- Thus, the checks `esp_ptr_internal`, `esp_ptr_in_drom` and `esp_ptr_byte_accessible`
  have been updated to acknowledge this memory as a part of the DRAM.

Co-authored-by: Mahavir Jain <mahavir@espressif.com>
 2023-04-17 10:42:04 +05:30
zwj
feb5edf8b0 improve scan performance when scan and sync coexist on ESP32-C3 and ESP32-S3 2023-04-17 12:27:08 +08:00
Armando (Dou Yiwen)
ef64e4e5b3 Merge branch 'feature/emmc_example' into 'master' 
SDMMC Host: added an example to communicate with an eMMC chip

Closes IDF-7157, IDF-4739, and IDFGH-6901

See merge request espressif/esp-idf!21760
 2023-04-17 11:53:55 +08:00
Marius Vikhammer
6acd082cc8 Merge branch 'docs/iram_sram_config' into 'master' 
docs: update CONFIG_ESP_SYSTEM_ESP32_SRAM1_REGION_AS_IRAM docs to better reflect the limitations

See merge request espressif/esp-idf!23158
 2023-04-17 11:51:05 +08:00
laokaiyao
a143a85822 i2s: workaround for inacurate PLL frequency after switching 2023-04-17 03:15:55 +00:00
Zhi Wei Jian
bc216802c6 Merge branch 'bugfix/fix_bleqabr23_98' into 'master' 
Bluedroid: fix GATTC cache address saving

Closes BLEQABR23-98 and BLEQABR23-34

See merge request espressif/esp-idf!22970
 2023-04-17 10:54:31 +08:00
Zhi Wei Jian
e58e271230 Merge branch 'bugfix/fix_bleqabr23_137' into 'master' 
Fixed non-connectable and non-scannable directed adv can't be scanned

See merge request espressif/esp-idf!23198
 2023-04-17 10:52:11 +08:00
wanlei
ad1ba78129 sdio: test_sdio add unity sync signals 2023-04-17 10:51:46 +08:00
Jakob Hasse
999fa28187 pthread: removed IRAM code from pthread 
* Currently, the underlying FreeRTOS API functions
  used for the pthread implementation are not
  ISR-safe, hence the removal of IRAM placement.
 2023-04-17 10:19:33 +08:00
Mahavir Jain
225be9a6ce Merge branch 'feature/esp_tls_add_getter_setter' into 'master' 
esp-tls: Added getter/setter function for the conn_state.

Closes IDFGH-9514

See merge request espressif/esp-idf!23128
 2023-04-16 22:15:28 +08:00
Almir Okato
4b910ffa68 bootloader_support: add missing esp_rom_sys.h to bootloader_flash.c bootloader build 
Missing esp_rom_sys.h header could cause declaration issues.

Signed-off-by: Almir Okato <almir.okato@espressif.com>
 2023-04-15 16:49:12 -03:00
Ondrej Kosta
34850de22b Merge branch 'bugfix/eth_l2_test_switch' into 'master' 
LAN8720 & IP101 L2 Test Fix

Closes IDFCI-1624 and IDFCI-1567

See merge request espressif/esp-idf!22907
 2023-04-14 20:53:08 +08:00
Armando
920ecff168 sdmmc: in/out phase adapted to esp32 and esp32s3 2023-04-14 18:18:54 +08:00
Ivan Grokhotkov
e9badf51c7 sdmmc: I/O phase adjustments 
1. Fix incorrect meaning of SDMMC.clock bits, synchronize the names
   with the TRM.
2. Choose input and output phases to satisfy typical timing
   requirements.
3. Move use_hold_reg setting into the host driver, since it is related
   to timing.

Closes https://github.com/espressif/esp-idf/issues/8521
Related to https://github.com/espressif/esp-idf/issues/8257
 2023-04-14 18:18:54 +08:00
Jakob Hasse
6991a92895 docs: added new C++ language standard 2023-04-14 17:57:01 +08:00
morris
c49c165bca Merge branch 'bugfix/lcd_align_before_cache_write_back' into 'master' 
manually align the color buffer before cache write back

See merge request espressif/esp-idf!23143
 2023-04-14 16:36:19 +08:00
C.S.M
247cc7dd87 Merge branch 'feature/cache_32M_map' into 'master' 
spi_flash: 32M bits address flash cache map

Closes IDF-7119 and IDF-4693

See merge request espressif/esp-idf!23021
 2023-04-14 16:01:25 +08:00
chenjianhua
056ae5dd21 Update bt lib for ESP32-C3 and ESP32-S3 
- Fixed non-connectable and non-scannable directed adv can't be scanned
 2023-04-14 15:44:17 +08:00
Kevin (Lao Kaiyao)
d635fc0f32 Merge branch 'bugfix/i2s_tdm_multi_dev_on_h2' into 'master' 
i2s: fixed tdm multi dev test on h2

See merge request espressif/esp-idf!23054
 2023-04-14 15:02:31 +08:00
Wu Zheng Hui
98849634b3 Merge branch 'bugfix/fix_wrong_frame_ptr_after_wake_restore' into 'master' 
bugfix: fix wrong RvCoreCriticalSleepFrame ptr value after wake restore

See merge request espressif/esp-idf!23113
 2023-04-14 13:22:24 +08:00
Mahavir Jain
6da2eb97fa Merge branch 'contrib/github_pr_11116' into 'master' 
nvs_host_test: replace sprintf with snprintf (GitHub PR)

Closes IDFGH-9781

See merge request espressif/esp-idf!23173
 2023-04-14 11:56:29 +08:00
Cao Sen Miao
c7053641bc spi_flash: 32M bits address flash map, (for customer use only) 2023-04-14 11:37:09 +08:00
Aditya Patwardhan
2dd280f126
esp-tls: Added getter/setter function for the conn_state. 
* Added the setter function to set the connection sockfd value
Closes https://github.com/espressif/esp-idf/issues/10871
 2023-04-13 20:03:50 +05:30
Ivan Grokhotkov
fee3082d88
vfs: VFS_MAX_COUNT should be non-zero even without IO support 2023-04-13 15:37:37 +02:00
Jiang Jiang Jian
7da760dbd3 Merge branch 'bugfix/install_keys_after_successful_4_of_4_tx' into 'master' 
esp_wifi: Install keys after successful transmission of EAPOL 4/4 Message

Closes WIFI-5678

See merge request espressif/esp-idf!23141
 2023-04-13 19:02:20 +08:00