alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2025-12-03 23:57:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/esp32s2beta_update' into 'feature/esp32s2beta'

Browse Source 
esp32s2beta: Merge master into esp32s2beta branch

See merge request espressif/esp-idf!5724
This commit is contained in:
Angus Gratton
2019-08-21 15:20:28 +08:00
parent 9d8c21d8fb 80f1c13fd7
commit 38d61f83db
2909 changed files with 171889 additions and 54694 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/soc/esp32s2beta/rtc_init.c
View File

@@ -184,7 +184,7 @@ void rtc_init(rtc_config_t cfg)
}
#endif
rtc_vddsdio_config_t rtc_vddsdio_get_config()
rtc_vddsdio_config_t rtc_vddsdio_get_config(void)
{
rtc_vddsdio_config_t result;
uint32_t sdio_conf_reg = REG_READ(RTC_CNTL_SDIO_CONF_REG);