jacob.eva/arduino-esp32
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SDK headers: Use new esp-idf signal name VSPICLK_OUT_IDX (#130)

Browse Source
This commit is contained in:
Angus Gratton 2017-01-16 21:12:13 +11:00 committed by Me No Dev
parent 6edf8a7795
commit ce5df79674
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cores/esp32/esp32-hal-spi.c
View File

@ -27,7 +27,7 @@
#include "soc/gpio_sig_map.h" #include "soc/gpio_sig_map.h"
#include "soc/dport_reg.h" #include "soc/dport_reg.h"
#define SPI_CLK_IDX(p) ((p==0)?SPICLK_OUT_IDX:((p==1)?SPICLK_OUT_IDX:((p==2)?HSPICLK_OUT_IDX:((p==3)?VSPICLK_OUT_MUX_IDX:0)))) #define SPI_CLK_IDX(p) ((p==0)?SPICLK_OUT_IDX:((p==1)?SPICLK_OUT_IDX:((p==2)?HSPICLK_OUT_IDX:((p==3)?VSPICLK_OUT_IDX:0))))
#define SPI_MISO_IDX(p) ((p==0)?SPIQ_OUT_IDX:((p==1)?SPIQ_OUT_IDX:((p==2)?HSPIQ_OUT_IDX:((p==3)?VSPIQ_OUT_IDX:0)))) #define SPI_MISO_IDX(p) ((p==0)?SPIQ_OUT_IDX:((p==1)?SPIQ_OUT_IDX:((p==2)?HSPIQ_OUT_IDX:((p==3)?VSPIQ_OUT_IDX:0))))
#define SPI_MOSI_IDX(p) ((p==0)?SPID_IN_IDX:((p==1)?SPID_IN_IDX:((p==2)?HSPID_IN_IDX:((p==3)?VSPID_IN_IDX:0)))) #define SPI_MOSI_IDX(p) ((p==0)?SPID_IN_IDX:((p==1)?SPID_IN_IDX:((p==2)?HSPID_IN_IDX:((p==3)?VSPID_IN_IDX:0))))

2
tools/sdk/include/esp32/soc/gpio_sig_map.h
View File

@ -135,7 +135,7 @@
#define HSPICS2_IN_IDX 62 #define HSPICS2_IN_IDX 62
#define HSPICS2_OUT_IDX 62 #define HSPICS2_OUT_IDX 62
#define VSPICLK_IN_IDX 63 #define VSPICLK_IN_IDX 63
#define VSPICLK_OUT_MUX_IDX 63 #define VSPICLK_OUT_IDX 63
#define VSPIQ_IN_IDX 64 #define VSPIQ_IN_IDX 64
#define VSPIQ_OUT_IDX 64 #define VSPIQ_OUT_IDX 64
#define VSPID_IN_IDX 65 #define VSPID_IN_IDX 65