alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2025-10-04 04:19:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into feature/esp32s2beta_update

Browse Source
This commit is contained in:
Angus Gratton
2019-08-08 14:00:45 +10:00
committed by Angus Gratton
parent 24d26fccde 51d811a71c
commit 04ae56806c
657 changed files with 6814 additions and 7534 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/peripherals/spi_master/main/spi_master_example_main.c
View File

@@ -403,7 +403,7 @@ static void display_pretty_colors(spi_device_handle_t spi)
}
}
void app_main()
void app_main(void)
{
esp_err_t ret;
spi_device_handle_t spi;