Crash_Override/OVMS3-idf
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'bugfix/soc_io_mux_h' into 'master'

Browse source 
esp32: update io_mux_reg.h to latest version

fixes https://github.com/espressif/esp-idf/issues/349

See merge request !546
This commit is contained in:
Ivan Grokhotkov 2017-03-06 22:36:19 +08:00
commit 153472d70d
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
components/esp32/include/soc/io_mux_reg.h
View file

@ -88,7 +88,7 @@ static inline void __attribute__ ((deprecated)) PIN_PULLDWN_EN(uint32_t PIN_NAME
#define FUNC_GPIO0_GPIO0_0 0 #define FUNC_GPIO0_GPIO0_0 0
#define PERIPHS_IO_MUX_U0TXD_U (DR_REG_IO_MUX_BASE +0x88) #define PERIPHS_IO_MUX_U0TXD_U (DR_REG_IO_MUX_BASE +0x88)
#define FUNC_U0TXD_EMAC_RXD2 3 #define FUNC_U0TXD_EMAC_RXD2 5
#define FUNC_U0TXD_GPIO1 2 #define FUNC_U0TXD_GPIO1 2
#define FUNC_U0TXD_CLK_OUT3 1 #define FUNC_U0TXD_CLK_OUT3 1
#define FUNC_U0TXD_U0TXD 0 #define FUNC_U0TXD_U0TXD 0
@ -181,7 +181,7 @@ static inline void __attribute__ ((deprecated)) PIN_PULLDWN_EN(uint32_t PIN_NAME
#define PERIPHS_IO_MUX_MTMS_U (DR_REG_IO_MUX_BASE +0x30) #define PERIPHS_IO_MUX_MTMS_U (DR_REG_IO_MUX_BASE +0x30)
#define FUNC_MTMS_EMAC_TXD2 5 #define FUNC_MTMS_EMAC_TXD2 5
#define FUNC_MTMS_SD_CLK 4 #define FUNC_MTMS_SD_CLK 4
#define FUNC_MTMS_HS2_CLk 3 #define FUNC_MTMS_HS2_CLK 3
#define FUNC_MTMS_GPIO14 2 #define FUNC_MTMS_GPIO14 2
#define FUNC_MTMS_HSPICLK 1 #define FUNC_MTMS_HSPICLK 1
#define FUNC_MTMS_MTMS 0 #define FUNC_MTMS_MTMS 0