espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-11-15 15:00:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into feature/esp32s2beta_merge

Browse Source
This commit is contained in:
Angus Gratton
2019-10-15 14:59:27 +11:00
committed by Angus Gratton
parent cf7fe34cc2 7e3676f307
commit 496ede9bcd
122 changed files with 2683 additions and 1553 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
components/spi_flash/test/esp32/test_esp_flash.c
View File

@@ -6,7 +6,7 @@
#include <unity.h>
#include "esp_flash.h"
#include "driver/spi_common.h"
#include "driver/spi_common_internal.h"
#include "esp_flash_spi_init.h"
#include <esp_attr.h>
#include "esp_log.h"
@@ -14,7 +14,6 @@
#include <test_utils.h>
#include "unity.h"
#include "driver/spi_common.h"
#include "driver/gpio.h"
#include "soc/io_mux_reg.h"