Commit Graph

4857 Commits

Author SHA1 Message Date
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
Fu Hanxi
55870f379d ci: fix build script when no test script found 2023-04-23 14:53:58 +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
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
Fu Hanxi
fc329fa80f ci: remove unknown target, add H4 for check back 2023-04-21 14:43:31 +08:00
Fu Hanxi
3554c6e571 ci: run readme check when constants.py or check script updated 2023-04-21 14:43:21 +08:00
Roland Dobai
d75b7a7470 Tools: Improve the flashing instructions printed after "idf.py build"
Closes https://github.com/espressif/esp-idf/issues/11181
2023-04-20 15:30:34 +02: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
laokaiyao
1f84f6c6ed esp32h4: remove esp32h4 target from ci 2023-04-20 15:19:47 +08:00
Ondrej Kosta
c231c79fc8 HAL: wrapped emac_ll functions to emac_hal
Closes #9934
2023-04-19 12:46:45 +00: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
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
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
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
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
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
Darian Leung
9509c14510 build: Add --longcalls option to clang builds of xtensa targets
This commit adds the --longcalls option to UNIQ_CMAKE_ASM_FLAGS for clang
builds of xtensa targets to prevent "dangerous relocation" errors.
2023-04-18 15:51:38 +08:00
Peter Dragun
faa82b060c feat(esptool): allow to set force for write_flash 2023-04-17 12:53:01 +02:00
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
Jakob Hasse
8f7a076619 cmake: C++23 only when not using clang 2023-04-14 17:57:01 +08:00
wanlei
c34ea9cef6 ci: pytest automation script increase timeout time 2023-04-14 12:03:38 +08:00
Ivan Grokhotkov
79a9615022
ci: add build test for CONFIG_ESP_CONSOLE_USB_CDC_SUPPORT_ETS_PRINTF 2023-04-12 11:17:41 +02:00
Ivan Grokhotkov
8e85fc8571
esp_rom: convert USB related headers to SPDX, update COPYRIGHTS.rst 2023-04-12 11:17:41 +02:00
Ivan Grokhotkov
80c9ef7b89
esp_rom: sync changes for ESP32-S3 USB related files, minor fix for S2
Used esp-rom tag esp32s3-20210327 and did manual cleanup.
Rename s_usb_osglue to rom_usb_osglue like it was done for esp32s2.
Some comments in esp32s2 headers are synced from esp32s3.
2023-04-12 11:07:56 +02:00
Ondrej Kosta
eb17a9d6e0 network_examples: added LwIP bridge test 2023-04-12 09:14:12 +02:00
Alexey Lapshin
e7d28e4277 Merge branch 'feature/esp32c6_esp32h2_enable_panic_tests' into 'master'
tests: panic: esp32c6/esp32h2 enable

Closes IDF-5662, IDF-6863, IDF-6865, IDF-6866, and IDF-6868

See merge request espressif/esp-idf!22943
2023-04-12 10:20:05 +08:00
Roland Dobai
f57e8eed78 Merge branch 'feature/hfp_ag_hints' into 'master'
tools: Update idf-py hints with Bluedriod HFP AG info

Closes IDF-5671

See merge request espressif/esp-idf!23089
2023-04-11 13:48:15 +08:00
Alexey Lapshin
2b6de209c8 tests: panic: add esp32c6 esp32h2 2023-04-10 17:49:51 +08:00
Marius Vikhammer
03c2c8db77 Merge branch 'feature/esp_sys_iram_cleanup' into 'master'
esp-system: move uncessary IRAM functions to flash

Closes IDF-7138 and IDF-7148

See merge request espressif/esp-idf!23121
2023-04-10 17:24:14 +08:00
Marius Vikhammer
7108ff093d Merge branch 'feature/sram1_iram' into 'master'
system: add kconfig option for using parts of SRAM1 for IRAM

Closes IDFGH-8351 and IDF-942

See merge request espressif/esp-idf!21214
2023-04-10 13:58:40 +08:00
Marius Vikhammer
db059b155a esp-system: move uncessary IRAM functions to flash 2023-04-10 11:10:28 +08:00
Marius Vikhammer
5cbd311ecf system: add kconfig option for using parts of SRAM1 for IRAM
Using parts of SRAM1 for IRAM allows apps with more statically allocated IRAM

Closes https://github.com/espressif/esp-idf/issues/9824
2023-04-07 07:12:58 +00:00
Marius Vikhammer
ff7fce9739 ci: fixed custom partition table subtype test not compiling for linux 2023-04-07 12:29:30 +08:00
Fu Hanxi
9153f9c927 ci: don't run idf-size for linux target 2023-04-07 12:29:30 +08:00
Fu Hanxi
01fd87bd05 ci: remove ttfw related info in tools/test_apps 2023-04-07 12:29:30 +08:00
Fu Hanxi
0f2a0058a3 ci: fix pytest build system 2023-04-07 10:42:12 +08:00
Wan Lei
b6d57a26ca Merge branch 'feature/spi_flash_enable_counters_on_esp_flash_driver' into 'master'
spi_flash: support  SPI_FLASH_ENABLE_COUNTERS on esp_flash driver and test this feature

Closes IDF-5623

See merge request espressif/esp-idf!19554
2023-04-06 15:48:42 +08:00
Roland Dobai
05a8d0b58a Merge branch 'bugfix/asyncio_progress_term_width' into 'master'
tools: fix progress output in asyncio.run with zero terminal width

Closes IDF-6646

See merge request espressif/esp-idf!22986
2023-04-06 15:23:39 +08:00
Roland Dobai
7d4835e817 Merge branch 'feature/rewrite_build_sys_tests_v3' into 'master'
Rewrite build system unit tests to python v3

Closes IDF-6842

See merge request espressif/esp-idf!22280
2023-04-06 15:21:32 +08:00
liqigan
fcc6ea1336 tools: Update idf-py hints with Bluedroid HFP AG info 2023-04-06 14:18:27 +08:00
gaoxu
542a61b6cb support SPI_FLASH_ENABLE_COUNTERS feature on esp_flash driver and rename the functions to esp_flash_xx 2023-04-06 11:40:40 +08:00
David Cermak
7d6241e761 esp_netif: Make esp_netif_receive() return value configurable 2023-04-05 12:18:21 +02:00
Zim Kalinowski
ab5d8d0008 Merge branch 'refactor/esp_partition_host_test_build_dir' into 'master'
esp_partition: partition_linux.c does not use hard-coded file anymore

Closes IDF-6644

See merge request espressif/esp-idf!22759
2023-04-04 18:35:24 +08:00
Roland Dobai
b3a54cf643 Merge branch 'bugfix/sdkconfig_abspath' into 'master'
ci: add build test for sdkconfig specified with abspath

Closes IDF-764

See merge request espressif/esp-idf!23020
2023-04-03 16:33:47 +08:00
Roland Dobai
775f8e7a49 Merge branch 'bugfix/set_target_with_stale_config' into 'master'
tools: fix set-target if IDF_TARGET env is set and stale sdkconfig exists

Closes IDF-7154

See merge request espressif/esp-idf!22950
2023-03-31 17:31:59 +08:00
Frantisek Hrbata
f6af455f57 ci: add build test for sdkconfig specified with abspath
On Windows, when path is specified as absolute for cmdl argument, cmake can
interpret parts of the path as invalid escape chars. For example "C:\Users\..."
will result in "Invalid character escape '\U'." Externally specified
paths should be converted into cmake's representation, which uses '/'.
This can be done e.g. by using 'get_filename_component()'. Currently
there doesn't seem to be any problem with this, but let's add a test for
this.

Suggested-by: Ivan Grokhotkov <ivan@espressif.com>
Signed-off-by: Frantisek Hrbata <frantisek.hrbata@espressif.com>
2023-03-31 09:55:25 +02:00
Fu Hanxi
9295aef934 ci: remove linux build dir workaround 2023-03-31 15:07:07 +08:00
Rocha Euripedes
610d5ea0ae Merge branch 'ci/mqtt_test_app' into 'master'
ci: Migrate unit test for mqtt test to unit test app

Closes IDF-5594

See merge request espressif/esp-idf!22814
2023-03-30 15:33:07 +08:00
Frantisek Hrbata
84deb34035 tools: fix progress output in asyncio.run with zero terminal width
Currently the forced progress in RunTool is trying to fit the output
line into a terminal width, but it doesn't take into an account a
situation when the terminal width is reported as zero. This manifests
when running in docker image with redirected output and can be seen
in the github workflow output for esp-idf-ci-action.

docker run --rm -t my_ubuntu_esp python3 -c 'import os,sys; print(os.get_terminal_size(), sys.stdout.isatty())'
os.terminal_size(columns=238, lines=59) True

vs

docker run --rm -t my_ubuntu_esp python3 -c 'import os,sys; print(os.get_terminal_size(), sys.stdout.isatty())' | tee
os.terminal_size(columns=0, lines=0) True

Since the output is reported as tty and the terminal width as 0, the
fit_text_in_terminal() function returns empty string. I also verified this
by running idf.py build inside a testing docker image.

This fix adjusts the fit_text_in_terminal() function to return original
line if the terminal width is zero.

Also simplify the progress print and use same approach as ninja
https://github.com/ninja-build/ninja/blob/master/src/line_printer.cc#L66

Signed-off-by: Frantisek Hrbata <frantisek.hrbata@espressif.com>
2023-03-29 17:12:36 +02:00
Roland Dobai
83469ddbac Merge branch 'feature/update_ccache_to_4.8' into 'master'
Tools: update ccache 4.6.2 -> 4.8

Closes IDF-6749

See merge request espressif/esp-idf!22881
2023-03-29 22:18:16 +08:00
Konstantin Kondrashov
6c5a7da77c Merge branch 'feature/unicore_bootloader_can_run_multicore_app' into 'master'
esp_system: Fix case when multicore app can not be run if bootloader is unicore

Closes IDFGH-9336

See merge request espressif/esp-idf!22664
2023-03-29 21:56:26 +08:00
Mahavir Jain
8894fae432 Merge branch 'feature/update_secure_boot_test_app_to_pytest' into 'master'
secure_boot_test_app: Update the test_app to use pytest framework

Closes IDFCI-1135

See merge request espressif/esp-idf!17967
2023-03-29 14:26:35 +08:00
KonstantinKondrashov
444c27e4e6 test_apps: Test multicore app can be run by unicore bootloader 2023-03-29 03:47:55 +08:00
Rocha Euripedes
98b75727ba Merge branch 'feature/socks_transport' into 'master'
tcp_transport: Adds SOCKS4 proxy transport

See merge request espressif/esp-idf!20479
2023-03-28 20:33:28 +08:00
Aditya Patwardhan
780f7f2669 secure_boot_test_app: Update the test_app to use pytest framework
* Added custom class IdfFpgaDut in pytest from ttfw_idf.IDFFPGADUT
2023-03-28 16:10:00 +05:30
Marek Fiala
b4446e1748 Tools: Rewrite build system unit tests to python - cmake libraries and Kconfig 2023-03-28 11:20:42 +02:00
Frantisek Hrbata
9b731e5e35 tools: fix set-target if IDF_TARGET env is set and stale sdkconfig exists
Currently if the IDF_TARGET env is set, and old sdkconfig exists with
different target value in CONFIG_IDF_TARGET, the set-target action fails
complaining about the IDF_TARGET env and value in sdkconfig being different.
We should ignore IDF_TARGET value from sdkconfig, because we are
actually setting new target and the old sdkconfig is renamed in cmake.

This can be easily reproduced with

---8<---
$ IDF_TARGET=esp32 idf.py set-target esp32
$ IDF_TARGET=esp32s3 idf.py set-target esp32s3

Project sdkconfig '/home/fhrbata/work/hello_world/sdkconfig' was generated
for target 'esp32s3', but environment variable IDF_TARGET is set to 'esp32'.
Run 'idf.py set-target esp32' to generate new sdkconfig file for target esp32.
---8<---

This also adds test for this use case to test_non_default_target.py.

Signed-off-by: Frantisek Hrbata <frantisek.hrbata@espressif.com>
2023-03-28 11:18:04 +02:00
Roland Dobai
51772f4fb5 Merge branch 'feature/update_rom_elfs' into 'master'
tools: update esp-rom-elf to version 20230320

See merge request espressif/esp-idf!22838
2023-03-28 17:10:44 +08:00
Djordje Nedic
3e0f612a7e tools: Move out idf_size.py in favour of using the esp-idf-size package
This commit removes all idf_size.py files and references to them and adds esp-idf-size as a dependency and adequate wrappers to avoid breaking changes.
2023-03-27 19:40:33 +02:00
Euripedes Rocha
d6db90a3cd [tcp_transport] - Adds Socks4 proxy transport
- Basic implementation of Socks4 protocol.
- Introduce basic host testing.
2023-03-27 14:46:40 +02:00
Euripedes Rocha
1acfc9b5e0 ci: Migrateunit test for mqtt test to unit test app
- Split mqtt and mqtt5 tests
 - Move common test code to a common component
 - Add necessary python scripts
2023-03-24 10:32:43 +01:00
Wan Lei
896f046ac2 Merge branch 'feature/support_spi_slave_hd_append_later_s2' into 'master'
spi_slave: support spi slave hd append mode on chips other than s2

Closes IDF-2943

See merge request espressif/esp-idf!19557
2023-03-23 14:19:32 +08:00
Mahavir Jain
786851bfbd Merge branch 'feature/esp32c6_esp32h2_supported' into 'master'
tools: idf.py: remove esp32c6 and esp32h2 from preview targets list, update chip/version support table

See merge request espressif/esp-idf!22868
2023-03-23 12:25:57 +08:00
Mahavir Jain
86b6f87d68 Merge branch 'bugfix/ram_loadable_elf_flash_mmap_issue' into 'master'
Fix flash mmap data integrity issue for RAM loadable ELF case

See merge request espressif/esp-idf!22802
2023-03-23 12:13:35 +08:00
Marek Fiala
b65500fd63 Tools: update ccache 4.6.2 -> 4.8 2023-03-22 16:26:21 +01:00
Darian
c71025d6d6 Merge branch 'refactor/freertos_config_files' into 'master'
FreeRTOS: Combine FreeRTOSConfig.h

Closes IDF-6082

See merge request espressif/esp-idf!22815
2023-03-22 22:01:37 +08:00
Jakob Hasse
2b895ef9d8 Merge branch 'feature/rmt_mock' into 'master'
Mocks: added RMT mock

See merge request espressif/esp-idf!22060
2023-03-22 20:18:46 +08:00
Tomas Rezucha
f3de7e574d Merge branch 'bugfix/usb_reg_header_definition_upd' into 'master'
USB: usb_reg.h update missing register bitfield description

See merge request espressif/esp-idf!22766
2023-03-22 17:43:43 +08:00
Darian Leung
05bda6595d freertos: Move FreeRTOSConfig_arch.h
This commit moves the FreeRTOSConfig_arc.h to the "esp_additions" directory
so that they can also be used for SMP FreeRTOS builds.
2023-03-22 16:32:29 +08:00
Ivan Grokhotkov
77541faa14
tools: idf.py: remove esp32c6 and esp32h2 from preview targets list 2023-03-21 20:41:44 +01:00
Roland Dobai
a0eb55e81a Merge branch 'add_win64_oocd_bins' into 'master'
tools: Add missed OpenOCD v0.12.0-esp32-20230313 binaries for win64 platform

See merge request espressif/esp-idf!22856
2023-03-22 01:01:04 +08:00
Ondrej Kosta
531e23c802 Merge branch 'bugfix/dm9051_rcv_mcast' into 'master'
esp_eth: allowed DM9051 to receive multicast packets

See merge request espressif/esp-idf!22768
2023-03-21 22:55:44 +08:00
Michael (XIAO Xufeng)
dbbc1ba5be Merge branch 'feat/merge_nuttx_patch' into 'master'
G0, G1: fix issues that prevents using G0/G1 components on other platforms

See merge request espressif/esp-idf!22521
2023-03-21 20:48:21 +08:00
Alexey Gerenkov
d2c02c901a tools: Add OpenOCD v0.12.0-esp32-20230313 binaries for win64 platform 2023-03-21 15:44:53 +03:00
Armando (Dou Yiwen)
75fc5a2512 Merge branch 'bugfix/mspi_timing_tuning_ll_assertion_disable_build_fail_issue' into 'master'
mspi: fix build failure under  assertion disable

Closes IDF-7077

See merge request espressif/esp-idf!22835
2023-03-21 12:37:21 +08:00
wanlei
66ca403bc6 spi_slave: support spi slave hd append mode on chips other than s2 2023-03-21 11:30:17 +08:00
Armando
eee34bcf70 mspi: fix build failure under assertion disable 2023-03-21 10:14:59 +08:00
Roland Dobai
288332d6a9 Merge branch 'feature/update-OpenOCD-to-v0.12.0-esp32-20230313' into 'master'
tools: update OpenOCD version to 'v0.12.0-esp32-20230313'

See merge request espressif/esp-idf!22744
2023-03-21 06:17:35 +08:00
0xFEEDC0DE64
a96f5bd5b0 Enable support for C++23 in esp-idf 2023-03-20 17:01:40 +01:00
Alexey Lapshin
12ab3625ca tools: update esp-rom-elf to version 20230320 2023-03-20 19:20:34 +08:00
Roland Dobai
c1ce05e244 Merge branch 'feature/test_check_python_dependencies' into 'master'
ci: add dep check_python_dependencies.pyt test

Closes IDF-4961

See merge request espressif/esp-idf!22790
2023-03-20 16:21:56 +08:00
Mahavir Jain
d0c8b01956
test_apps: add test case for flash mmap data integrity in ram loadable app 2023-03-20 11:12:11 +05:30
Jakob Hasse
7dbe9687f9 Merge branch 'bugfix/esp_shared_stack_watchpoint_setting' into 'master'
bugfix(esp_system): made watchpoint setting configuration-dependent

Closes IDFGH-9003

See merge request espressif/esp-idf!21738
2023-03-20 10:19:05 +08:00
Frantisek Hrbata
53a8742680 ci: add dep check_python_dependencies.pyt test
Two new tests are added.

1) test_check_python_dependencies
The test prepares artificial constraints file containing packages from
requirements.core.txt, which are also reported in pip-freeze output
for virtual env. The constraints file requires package versions higher
than currently installed in venv, so check_python_dependencies
should fail for all of them.

2) test_check_required_packages_only
Test for espressif/esp-idf/-/merge_requests/17917. After installing
core requirements, install additional foopackage, which is embedded.
Add version requirement for foopackage, which cannot be satisfied,
to constraints file. Since foopackage is not a direct requirement,
check-python-dependencies should not fail.

This also fixes existing TestCustomPythonPathInstall test, which sets
IDF_PYTHON_ENV_PATH, but does not restore it. Unittest seems to be
running tests in order based on class/test name. Meaning this test runs
before TestPythonInstall and all tests in TestPythonInstall are using
the latest tmpdir from TestCustomPythonPathInstall as IDF_PYTHON_ENV_PATH.
IOW TestPythonInstall is actually testing custom python env path, same as
TestCustomPythonPathInstall. This fixes it by restoring the
IDF_PYTHON_ENV_PATH. Note that since the actual IDF_PYTHON_ENV_PATH
was different(tmpdir) from PYTHON_DIR, the default PYTHON_DIR was never used,
so the tests were running with old python env(no
shutil.rmtree(PYTHON_DIR).

Since TestCustomPythonPathInstall is inheriting from TestPythonInstall
it also runs test_opt_argument and test_no_constraints for the second
time. This seems unnecessary, so this patch also skips these two tests
in TestCustomPythonPathInstall.

Signed-off-by: Frantisek Hrbata <frantisek.hrbata@espressif.com>
2023-03-17 15:22:33 +01:00
Jiang Jiang Jian
2658fb7623 Merge branch 'feature/add_memprot_support_for_esp32h2' into 'master'
esp32h2: enable memory protection scheme using PMA and PMP

Closes IDF-6452 and IDF-6332

See merge request espressif/esp-idf!22699
2023-03-17 15:19:52 +08:00
Jakob Hasse
f679218cb6 feat(driver): added RMT mock 2023-03-17 14:54:48 +08:00
Wan Lei
3b62bf59c4 Merge branch 'bugfix/fix_deep_sleep_crash_when_psram_high_freq' into 'master'
mspi: turn down freq to fix crash when sleep

Closes IDF-6881

See merge request espressif/esp-idf!22491
2023-03-16 14:11:21 +08:00
wanlei
a48d1a85c1 mspi: add test_app measuring time cost of mspi APIs
and merge mspi unit test into this
2023-03-16 11:11:43 +08:00
Gustavo Henrique Nihei
50145ed179 esp_rom: Remove STATUS struct in favor of ETS_STATUS
Signed-off-by: Gustavo Henrique Nihei <gustavo.nihei@espressif.com>
2023-03-16 01:50:21 +08:00
Roland Dobai
4bf12081e2 Merge branch 'bugfix/non_default_sdkconfig' into 'master'
tools: fix usage of sdkconfig with custom path or name

Closes IDF-1369

See merge request espressif/esp-idf!22520
2023-03-15 20:53:38 +08:00
Mahavir Jain
b29ed0ba0b
test_apps: enable memprot tests for ESP32-H2 target 2023-03-15 13:16:26 +05:30
Armando
929b7717ff system: fixed ram app cannot use mmu correctly issue 2023-03-15 10:59:20 +08:00
Ondrej
2ec7fc8f10 esp_eth: allowed DM9051 to receive multicast packets
Removed extra PHY status link checks from DM9051 MAC layer
2023-03-14 13:59:27 +00:00
Roman Leonov
0b08570ae2 usb: usb_reg.h update missing register description 2023-03-14 13:29:20 +01:00
Alexey Gerenkov
5013e6588c tools: update OpenOCD version to 'v0.12.0-esp32-20230313' 2023-03-13 15:29:19 +00:00
Jakob Hasse
0769298b3b Merge branch 'contrib/github_pr_8987' into 'master'
pthread: avoid heap alloc in pthread_cond_timedwait if possible (GitHub PR)

Closes IDFGH-7409

See merge request espressif/esp-idf!22702
2023-03-13 19:34:21 +08:00
Jakob Hasse
03bc6488de bugfix(esp_system): made watchpoint setting configuration-dependent
esp_execute_shared_stack_function always restored the stack watchpoint
regardless of CONFIG_FREERTOS_WATCHPOINT_END_OF_STACK. This would lead
to an abondoned but active watchpoint on a former stack once the task
calling esp_execute_shared_stack_function is deleted, if
CONFIG_FREERTOS_WATCHPOINT_END_OF_STACK is inactive.
This has been fixed now.

Closes https://github.com/espressif/esp-idf/issues/10414
2023-03-13 14:24:15 +08:00
Jiang Jiang Jian
d5f53fb415 Merge branch 'feature/nan_datapath' into 'master'
NAN Datapath support and console example

Closes WIFI-1223

See merge request espressif/esp-idf!13593
2023-03-11 04:50:10 +08:00