Commit Graph
100 Commits
Author SHA1 Message Date
Michael (XIAO Xufeng) 8282dca796 Merge branch 'bugfix/fix_c3_dig_dibas_limit_bug' into 'master'
ESP32C3: Fix system not stable bug when dbias storing in efuse is bigger than 27

Closes IDF-6048

See merge request espressif/esp-idf!20453
2022-10-08 14:56:40 +08:00
Michael (XIAO Xufeng) 9bc18ba480 Merge branch 'feat/sdio_slave_disable_hs' into 'master'
sdio_slave: allow disabling highspeed mode

Closes IDF-5994

See merge request espressif/esp-idf!20312
2022-10-01 01:52:47 +08:00
Michael (XIAO Xufeng) 9ba928d32e Merge branch 'bugfix/essl_pacman_ver' into 'master'
example: fixed spi_slave_hd and sdio hosts should pull essl package of compatible versions

See merge request espressif/esp-idf!20368
2022-09-29 03:08:02 +08:00
Michael (XIAO Xufeng) 5d67d1d85b example: fixed spi_slave_hd and sdio hosts should pull essl package of compatible versions 2022-09-29 02:20:36 +08:00
Michael (XIAO Xufeng) 507864c4f1 sdio_slave: allow disabling highspeed mode 2022-09-27 18:38:35 +08:00
Michael (XIAO Xufeng) 03d8059fa5 Merge branch 'feat/essl_extra_component' into 'master'
essl: move from esp-idf component to extra component

See merge request espressif/esp-idf!20221
2022-09-26 18:29:07 +08:00
Michael (XIAO Xufeng) f21f0ac3a6 sdio/example: fixed the essl return type issue 2022-09-26 12:26:55 +08:00
Michael (XIAO Xufeng) 02a9de904a essl: move from esp-idf component to extra component 2022-09-26 12:26:55 +08:00
Michael (XIAO Xufeng) eb290ecd12 Merge branch 'doc/usj_sw_reset_alive_bbpll_doc' into 'master'
usb_serial_jtag: fixed the docs that we can use usj in sleep modes

See merge request espressif/esp-idf!20096
2022-09-22 15:30:41 +08:00
Michael (XIAO Xufeng) a0bf87ee5d usb_serial_jtag: fixed the docs that we can use usj in sleep modes
Related to: https://github.com/espressif/esp-idf/issues/8507, https://github.com/espressif/esp-idf/issues/8884
2022-09-22 01:36:06 +08:00
Michael (XIAO Xufeng) 4fb1ccdd4e Merge branch 'feature/c2_efuse_with_26mhz' into 'master'
efuse(es32c2): Supports 26MHz XTAL

Closes IDF-5427

See merge request espressif/esp-idf!18851
2022-08-29 01:43:57 +08:00
Michael (XIAO Xufeng) 8e361d3df0 Merge branch 'bugfix/sdio_slave_gcc11_crash' into 'master'
sdio_slave: workaround the sdio_slave crash issue with release config + GCC11

Closes IDFCI-1296, IDFCI-1297, and IDFCI-1298

See merge request espressif/esp-idf!19680
2022-08-26 00:39:35 +08:00
Michael (XIAO Xufeng) bc0ccd9b6d Merge branch 'bugfix/rtc_periph_ulp_touch' into 'master'
sleep_modes: allow using touch/ULP with RTC_PERIPH domain (including EXT0 wakeup source)

Closes IDF-4528

See merge request espressif/esp-idf!19209
2022-08-25 12:27:29 +08:00
Michael (XIAO Xufeng) aff90b9853 sleep_modes: allow using touch/ULP with RTC_PERIPH domain (including EXT0 wakeup source) 2022-08-25 12:27:28 +08:00
Michael (XIAO Xufeng) 0a2e5a7774 Merge branch 'feat/support_esp32c2_uart' into 'master'
uart: update console docs about frequency for ESP32-C2, move frequency of clock sources out of HAL

Closes IDF-5424 and IDF-4332

See merge request espressif/esp-idf!19274
2022-08-22 14:24:26 +08:00
Michael (XIAO Xufeng) e7dbfd65cb Merge branch 'feature/support_7.2.8_soc/pvt-dig' into 'master'
rtc: auto adjust LDO voltage based on pvt-dig saved in efuse

Closes IDF-4873

See merge request espressif/esp-idf!16365
2022-08-22 11:43:07 +08:00
Michael (XIAO Xufeng) 19add3fb05 sdio_slave: workaround the sdio_slave crash issue with release config + GCC11 2022-08-22 10:53:24 +08:00
Michael (XIAO Xufeng) ce80aae460 docs: update console frequency for ESP32-C2 2022-08-15 18:55:43 +00:00
Michael (XIAO Xufeng) 746f4b814c uart: move frequency of clock sources out of HAL 2022-08-15 18:55:43 +00:00
Michael (XIAO Xufeng) f11de46bfc Merge branch 'bugfix/fix_c2_rtc_ldo_too_low_bug' into 'master'
ESP32C2: Fix system not stable bug when rtc voltage too low

Closes IDF-5539

See merge request espressif/esp-idf!19217
2022-08-15 17:34:36 +08:00
Michael (XIAO Xufeng) bba57249ea Merge branch 'feature/support_7.2.9_soc/pvt_dig' into 'master'
esp32c2: support auto adjust LDO voltage based on pvt-dig

Closes IDF-5731 and IDF-4940

See merge request espressif/esp-idf!19267
2022-08-08 12:55:11 +08:00
Michael (XIAO Xufeng) 198fd08fb3 Merge branch 'contrib/github_pr_7872' into 'master'
QA: Check driver installation status (GitHub PR)

Closes IDFGH-6196

See merge request espressif/esp-idf!16630
2022-08-01 09:59:26 +08:00
Michael (XIAO Xufeng) f19dfd6afb Merge branch 'ci/reduce_usage_of_ut_sdio_runners' into 'master'
CI: reduce usage of sdio runners (UT_044, UT_045)

See merge request espressif/esp-idf!19184
2022-07-25 15:12:16 +08:00
Michael (XIAO Xufeng) 5d24a207b6 test_spi: fixed redundant quotes in test descriptions 2022-07-20 15:36:10 +08:00
Michael (XIAO Xufeng) a58362a429 Merge branch 'feature/efuse_rev_major_minor' into 'master'
efuse: Adds major and minor versions

See merge request espressif/esp-idf!18255
2022-07-07 11:48:54 +08:00
Michael (XIAO Xufeng) 7c7d53813c Merge branch 'feat/revert_touch_s3' into 'master'
touch: Added support for using touch in sleep modes back on ESP32-S3

Closes IDF-5041

See merge request espressif/esp-idf!18421
2022-06-15 16:11:50 +08:00
Michael (XIAO Xufeng) 7b8e5888ca Merge branch 'refactor/add_clk_tree_ll' into 'master'
clk_tree: Stage3 - HAL for clock subsystem

Closes IDF-4334

See merge request espressif/esp-idf!18270
2022-06-14 17:16:29 +08:00
Michael (XIAO Xufeng) f522865462 Revert "touch: add protection for touch sleep case"
This reverts commit 974ac3b4b8.
2022-06-13 01:51:15 +08:00
Michael (XIAO Xufeng) 069ef38ff6 Revert "touch_sensor: forbid from using touch sensor with sleep on ESP32-S3"
This reverts commit a84faa3cef.
2022-06-13 01:51:12 +08:00
Michael (XIAO Xufeng) 773715d900 Merge branch 'feature/support_refresh_brownout_v1' into 'master'
spi_flash: send reset when brownout detected on XMC flash

Closes IDF-3882

See merge request espressif/esp-idf!16873
2022-06-06 16:27:58 +08:00
Michael (XIAO Xufeng) e372710b35 test_rtc: remove invalid test case file 2022-06-06 00:36:21 +08:00
Michael (XIAO Xufeng) d798662421 Merge branch 'bugfix/s3_sleep_voltage' into 'master'
esp32s3: fixed dangerous power parameters in sleep modes

See merge request espressif/esp-idf!18168
2022-06-04 00:47:32 +08:00
Michael (XIAO Xufeng) 4e231f9dac ci: partially enable pytest for esp32c2 2022-06-02 15:07:53 +08:00
Michael (XIAO Xufeng) 6a8aed12ee ci: partially enable ut tests for esp32c2
Disabled test cases are tracked in:

 IDF-4465, IDF-5045, IDF-5057, IDF-5058, IDF-5059, IDF-5060, IDF-5061, IDF-5131

- test_fatfs: IDF-5136

- test_pm: IDF-5053

- test_cache_mmu: IDF-5138

- test_partitions: IDF-5137

- test_vfs: IDF-5139

- test_freertos: IDF-5140

- test_wpa_supplicant: IDF-5046

- test_mbedtls: IDF-5141

- test_pthread: IDF-5142

- test_protocomm: IDF-5143

- test_lightsleep: IDF-5053

- test_taskwdt: IDF-5055

- test_tcp_transport: IDF-5144

- test_app_update: IDF-5145

- test_timer: IDF-5052

- test_spi: IDF-5146

- test_rtc_clk: IDF-5060

- test_heap: IDF-5167

ci: fixed issues for tests of libgcc, ets_timer, newlib

test_pm: support on C2
2022-06-02 14:23:35 +08:00
Michael (XIAO Xufeng) f7be540222 ci: partially enable example build for esp32c2 2022-06-02 14:17:31 +08:00
Michael (XIAO Xufeng) acd4ca0f6e ci: add ut configs for ESP32-C2
note: flash encryption ut is not enabled in this commit, see IDF-5056
2022-06-02 11:10:29 +08:00
Michael (XIAO Xufeng) b9f37be868 ci: enable target tests for ESP32-C2
reduce parallel num of unused jobs
2022-06-02 11:10:29 +08:00
Michael (XIAO Xufeng) a0c2252756 build_system: fixed issue that default.target may override other custom configs 2022-06-02 11:08:59 +08:00
Michael (XIAO Xufeng) 1d018fd3bd test_rtc: add test_app to test power consumption 2022-06-01 21:03:54 +08:00
Michael (XIAO Xufeng) ab69df3ea7 esp32s3: fixed dangerous power parameters in sleep modes 2022-06-01 21:03:54 +08:00
Michael (XIAO Xufeng) 9f5c03dc67 Merge branch 'feat/elf_unit_test_parser' into 'master'
ci: extract ElfUnitTestParser allowing resolve elf offline

See merge request espressif/esp-idf!18205
2022-05-27 18:03:13 +08:00
Michael (XIAO Xufeng) cd6056c9cd ci: extract ElfUnitTestParser allowing resolve elf offline 2022-05-26 01:40:52 +08:00
Michael (XIAO Xufeng) 0adb814af3 Merge branch 'bugfix/fix_memory_miss_bug_esp32c3_esp32s3' into 'master'
ESP32C3/ESP32S3: Fix cpu crash bug  when wakeup from lightsleep for memory data miss

Closes IDF-162 and IDF-4923

See merge request espressif/esp-idf!17823
2022-05-18 12:05:08 +08:00
Michael (XIAO Xufeng) adcdcbaa0e Merge branch 'feat/pm_dbias_refactoring' into 'master'
pm: refactoring dbias related code

See merge request espressif/esp-idf!17994
2022-05-17 14:42:16 +08:00
Michael (XIAO Xufeng) 1f6fad6f48 Merge branch 'test/rtc_8m_d256' into 'master'
rtc: fixed 8MD256 can't be used as RTC slow src on ESP32

See merge request espressif/esp-idf!17989
2022-05-16 01:30:25 +08:00
Michael (XIAO Xufeng) cb1abdf33e Merge branch 'bugfix/remove_mislead_psram_type_is25' into 'master'
Kconfig: remove misleading psram name IS25WP032 in the Kconfig option

See merge request espressif/esp-idf!18025
2022-05-16 00:09:09 +08:00
Michael (XIAO Xufeng) 6f507d527c rtc: fixed 8MD256 can't be used as RTC slow src on ESP32
Sync configuration from other chips

Closes: https://github.com/espressif/esp-idf/issues/8007, https://github.com/espressif/esp-idf/pull/8089
2022-05-14 22:35:41 +08:00
Michael (XIAO Xufeng) b920676e59 pm: add test for RTC using 8MD256 as clock source 2022-05-14 22:35:41 +08:00
Michael (XIAO Xufeng) 234628b3ea pm: putting dbias and pd_cur code into same function 2022-05-14 02:35:11 +08:00
Michael (XIAO Xufeng) cc37f63e14 Merge branch 'bugfix/keep_rtc8m_in_lightsleep' into 'master'
pm: fixed RTC8M domain power down issue when used as RTC source

See merge request espressif/esp-idf!17612
2022-05-12 10:25:35 +08:00
Michael (XIAO Xufeng) 36074b9812 pm: add powerdown for int_8m on ESP32-C2 and ESP32-H2
Also move the xtal fpu logic to sleep_modes.c
2022-05-11 11:36:34 +08:00
Michael (XIAO Xufeng) 2905cbbe03 pm: fixed RTC8M domain power issues
introduced in e44ead5356

1. The int8M power domain config by default is PD. While LEDC is using
RTC8M as clock source, this power domain will be kept on.

But when 8MD256 is used as RTC clock source, the power domain should
also be kept on.

On ESP32, there was protection for it, but broken by commit
e44ead5356. Currently the power domain
will be forced on when LEDC is using RTC8M as clock source &&
!int8m_pd_en (user enable ESP_PDP_DOMAIN_RTC8M in lightsleep). Otherwise
the power domain will be powered off, regardless of RTC clock source.

In other words, int8M domain will be forced off (even when 8MD256
used as RTC clock source) if LEDC not using RTC8M as clock source, user
doesn't enable ESP_PDP_DOMAIN_RTC8M, or in deep sleep.

On later chips, there's no such protection, so 8MD256 could't be used as
RTC clock source in sleep modes.

This commit adds protection of 8MD256 clock to other chips. Fixes the
incorrect protection logic overriding on ESP32. Now the power domain
will be determiend by the logic below (order by priority):

    1. When RTC clock source uses 8MD256, power up
    2. When LEDC uses RTC8M clock source, power up
    3. In deepsleep, power down
    4. Otherwise determined by user config of ESP_PDP_DOMAIN_RTC8M,
       power down by default. (This is preferred to have highest
       priority, but it's kept as is because of current code structure.)

2. Before, after the macro `RTC_SLEEP_CONFIG_DEFAULT` decides dbias, the
protection above may force the int8m PU. This may cause the inconsistent
of dbias and the int8m PU status.

This commit lifts the logic of pd int8m/xtal fpu logic to upper layer
(sleep_modes.c).

Related: https://github.com/espressif/esp-idf/issues/8007, https://github.com/espressif/esp-idf/pull/8089

temp
2022-05-11 11:30:47 +08:00
Michael (XIAO Xufeng) 76a46a939c Kconfig: remove misleading psram name IS25WP032 in the Kconfig option
Closes: https://github.com/espressif/esp-idf/issues/8863
2022-05-06 22:56:53 +08:00
Michael (XIAO Xufeng) 6bc8dd0f92 Merge branch 'feature/support_esp32s3_bbpll_fix' into 'master'
rtc: update esp32s3 bbpll config

Closes IDF-4872

See merge request espressif/esp-idf!14471
2022-04-27 22:52:21 +08:00
Michael (XIAO Xufeng) cbbb308173 Merge branch 'bugfix/esp_flash_forbid_invalid_init' into 'master'
spi_flash: forbid writing to main flash when using invalid init arguments

Closes IDFGH-6936

See merge request espressif/esp-idf!17761
2022-04-24 22:53:57 +08:00
Michael (XIAO Xufeng) 7c668770ee Merge branch 'feature/support_esp8684_esp32h2_ledc' into 'master'
ledc: Provide support for esp32c2 and esp32h2

Closes IDF-4347, IDF-3900, IDF-4157, and IDF-4648

See merge request espressif/esp-idf!17071
2022-04-15 00:42:36 +08:00
Michael (XIAO Xufeng) d64c6f581d ledc: cleanup the clock selection code 2022-04-14 08:15:14 +00:00
Michael (XIAO Xufeng) 46b5363e39 spi_flash: forbid writing to main flash when using invalid init arguments
Also refactored the init code to make the logic of device (CS) acquiring
more centralized.

Resolves: https://github.com/espressif/esp-idf/issues/8556
2022-04-13 18:02:34 +08:00
Michael (XIAO Xufeng) c01d29a184 Merge branch 'feat/opi_mxic_header_def' into 'master'
spi_flash: update def header of MXIC

See merge request espressif/esp-idf!17533
2022-04-07 11:59:00 +08:00
Michael (XIAO Xufeng) b585d0afd0 Merge branch 'bugfix/phy_regi2c_critical_section' into 'master'
esp_phy: use spinlock to avoid regi2c access conflicts

See merge request espressif/esp-idf!17298
2022-04-06 09:30:03 +08:00
Michael (XIAO Xufeng) f3adbf9953 esp_phy: use spinlock to avoid regi2c access conflicts 2022-04-01 10:49:29 +08:00
Michael (XIAO Xufeng) 049ebf9853 regi2c: use safe version of spinlock, instead of ISR ver 2022-04-01 10:48:46 +08:00
Michael (XIAO Xufeng) e2ecdfc0a7 spi_flash: update def header of MXIC 2022-03-28 16:40:02 +00:00
Michael (XIAO Xufeng) e3c0229d2e Merge branch 'ci/renable_s3_tests' into 'master'
ci: renable s3 tests

See merge request espressif/esp-idf!17574
2022-03-28 15:53:49 +08:00
Michael (XIAO Xufeng) fdcf5ca540 Merge branch 'test/disable_touch_sleep_testcase' into 'master'
touch: add protection for touch sleep case

See merge request espressif/esp-idf!17578
2022-03-27 02:44:14 +08:00
Michael (XIAO Xufeng) 80904a5815 Merge branch 'bugfix/spi_free_crash_uninitialized' into 'master'
spi: fixed crash when calling spi_bus_free when not initialized

Closes IDFGH-7024

See merge request espressif/esp-idf!17573
2022-03-27 02:31:06 +08:00
Michael (XIAO Xufeng) bee9b6b9eb spi: fixed crash when calling spi_bus_free when not initialized
introduced in 49a48644e4

Closes: https://github.com/espressif/esp-idf/issues/8642
2022-03-25 01:52:10 +08:00
Michael (XIAO Xufeng) 974ac3b4b8 touch: add protection for touch sleep case 2022-03-24 18:27:05 +08:00
Michael (XIAO Xufeng) 75e80b19f6 sleep: fixed the issue error log not printed 2022-03-24 11:39:46 +08:00
Michael (XIAO Xufeng) a84faa3cef touch_sensor: forbid from using touch sensor with sleep on ESP32-S3
This is not supported yet.
2022-03-24 03:00:47 +08:00
Michael (XIAO Xufeng) 5a2f672d5a Merge branch 'feat/esp32s3_support_gpio_deepsleep_wakeup' into 'master'
example/deep_sleep: add example of EXT0 and using internal pullups

Closes IDF-4657 and IDFGH-6711

See merge request espressif/esp-idf!17099
2022-03-16 16:27:07 +08:00
Michael (XIAO Xufeng) fcd396a37e example/deep_sleep: add example of EXT0 and using internal pullups 2022-03-15 22:34:34 +08:00
Michael (XIAO Xufeng) 5cc751ca9c soc/esp32s3: merge gpio caps into soc_caps.h 2022-03-15 22:34:29 +08:00
Michael (XIAO Xufeng) dfc5360963 codeowner: add peripherals to codeowners of esp_hw_support 2022-03-15 22:17:07 +08:00
Michael (XIAO Xufeng) aab535fe4a Merge branch 'bugfix/regi2c_ctrl_spinlock_s2' into 'master'
hw_support: fixed regi2c not protected by lock on ESP32S2

See merge request espressif/esp-idf!16653
2022-03-13 02:47:53 +08:00
Michael (XIAO Xufeng) d5bdf95580 hw_support: fixed regi2c not protected by lock on ESP32S2 2022-03-13 00:24:08 +08:00
Michael (XIAO Xufeng) 78165c541e Merge branch 'bugfix/bootloader_uart_custom_gpio' into 'master'
bootloader: fixed the issue custom_uart_gpio doesn't take effect

Closes IDF-4606

See merge request espressif/esp-idf!16910
2022-03-02 02:35:14 +08:00
Michael (XIAO Xufeng) 395cd494f8 bootloader: fixed the issue custom_uart_gpio doesn't take effect 2022-03-01 17:54:34 +08:00
Michael (XIAO Xufeng) c1b30491dd Merge branch 'feature/esp32c3_uart_add_wakeup_event' into 'master'
UART: add uart wakeup event for esp32c3 and esp32s3

Closes IDF-3416

See merge request espressif/esp-idf!14482
2022-02-04 17:23:29 +00:00
Michael (XIAO Xufeng) 81b92af5cf Merge branch 'bugfix/adc2_cal_assert_arbiter_failed' into 'master'
adc_cal: fixed the assertion failure or returning wrong error code when ADC2 failed the arbitration

See merge request espressif/esp-idf!16836
2022-01-19 15:55:07 +00:00
Michael (XIAO Xufeng) 403577e3ff adc_cal: fixed the assertion failure or returning wrong error code when ADC2 failed the arbitration
Issue exist since first IDF version supporting ESP32-S2.
2022-01-18 12:26:55 +08:00
Michael (XIAO Xufeng) 3ba47f1628 Merge branch 'test/remove_spi_flash_perf_thr' into 'master'
spi_flash_test: remove threshold from unit test

See merge request espressif/esp-idf!16803
2022-01-16 19:19:15 +00:00
Michael (XIAO Xufeng) 1cbf9506b2 spi_flash_test: remove threshold from unit test 2022-01-16 19:19:14 +00:00
Michael (XIAO Xufeng) 7fb3e06c69 Merge branch 'bugfix/adc_include_sdkconfig' into 'master'
adc: add explicit sdkconfig.h include

See merge request espressif/esp-idf!16746
2022-01-12 15:35:13 +00:00
Michael (XIAO Xufeng) a2fc3629bd adc: add explicit sdkconfig.h include 2022-01-12 15:35:12 +00:00
Michael (XIAO Xufeng) 476da74796 Merge branch 'bugfix/ledc_fade_array_check' into 'master'
ledc: fixed check to s_ledc_fade_rec array

See merge request espressif/esp-idf!16086
2022-01-06 03:28:10 +00:00
Michael (XIAO Xufeng) 466f3a91cb ledc: fixed check to s_ledc_fade_rec array 2022-01-06 03:28:05 +00:00
Michael (XIAO Xufeng) b84abb1b17 Merge branch 'bugfix/rtcio_increase_size' into 'master'
sleep: fixed ext1 cannot wakeup via RTCIO >= 18 issue

Closes IDF-4526 and IDF-4505

See merge request espressif/esp-idf!16617
2022-01-06 03:03:58 +00:00
Michael (XIAO Xufeng) 9d0bebc773 code_owners: add peripherals to the owner of bootloader_flash 2022-01-04 03:23:31 +00:00
Michael (XIAO Xufeng) 46f8d868d3 soc: updated soc_caps about rtc_io and the format 2022-01-01 03:13:45 +08:00
Michael (XIAO Xufeng) 9382b24d1d sleep: fixed ext1 cannot wakeup via RTCIO >= 18 issue 2021-12-31 08:09:43 +00:00
Michael (XIAO Xufeng) 5cc4bceb2a Merge branch 'docs/sdspi_share_other_device' into 'master'
docs/sdspi: add documentation about sharing SPI bus among SD card and other devices

Closes IDFGH-4699

See merge request espressif/esp-idf!15080
2021-12-27 04:39:33 +00:00
Michael (XIAO Xufeng) 54dcd4d4d6 docs/sdspi: add documentation about sharing SPI bus among SD card and other devices 2021-12-27 04:39:32 +00:00
Michael (XIAO Xufeng) 322a0beb87 Merge branch 'bugfix/sdio_slave_dma_desc_int' into 'master'
sdio_slave: Fixed the issue that DMA descriptors allocated to non-DMA capable area

See merge request espressif/esp-idf!16159
2021-12-27 03:10:52 +00:00
Michael (XIAO Xufeng) ad90373a69 sdio_slave: fixed the issue DMA desc not capable 2021-12-22 01:34:38 +08:00
Michael (XIAO Xufeng) 5999e2c6f8 gitlab: make "Related" subsection visible in the minimal template 2021-12-21 09:46:51 +00:00
Michael (XIAO Xufeng) 59f3d98d45 Merge branch 'feat/support_mxic_unlock' into 'master'
spi_flash: support unlock MXIC flash chips

Closes IDF-3575

See merge request espressif/esp-idf!15238
2021-12-21 07:09:57 +00:00
Michael (XIAO Xufeng) 9894019909 bootloader: support unlock MXIC flash chips 2021-12-20 18:01:12 +08:00
Michael (XIAO Xufeng) b23ed0ee81 Merge branch 'feature/update_adc_cali_due_to_efuse_version_change' into 'master'
adc: update s3 adc calibration efuse version

Closes IDF-4069

See merge request espressif/esp-idf!15843
2021-12-14 07:27:35 +00:00
Michael (XIAO Xufeng) 590c18f5c8 Merge branch 'feature/support_s3_octal_psram_ecc_feature' into 'master'
psram: add octal psram Error Correcting Code (ECC) feature

Closes IDF-4258

See merge request espressif/esp-idf!15832
2021-12-14 06:56:21 +00:00