alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2025-10-18 17:38:09 +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/pretty_effect.c
View File

@@ -65,7 +65,7 @@ void pretty_effect_calc_lines(uint16_t *dest, int line, int frame, int linect)
}
esp_err_t pretty_effect_init()
esp_err_t pretty_effect_init(void)
{
#ifdef CONFIG_IDF_TARGET_ESP32
return decode_image(&pixels);