From f5d6828c5a2924a1c41a6bdb70fb65e8aeaa20ae Mon Sep 17 00:00:00 2001 From: me-no-dev Date: Fri, 9 Dec 2016 13:22:56 +0200 Subject: [PATCH] Adjust interrupt numbers for GPIO and Touch --- cores/esp32/esp32-hal-gpio.c | 2 +- cores/esp32/esp32-hal-touch.c | 2 +- cores/esp32/esp32-hal-uart.c | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/cores/esp32/esp32-hal-gpio.c b/cores/esp32/esp32-hal-gpio.c index 74a45c2d4..7c79acae8 100644 --- a/cores/esp32/esp32-hal-gpio.c +++ b/cores/esp32/esp32-hal-gpio.c @@ -24,7 +24,7 @@ #include "soc/gpio_struct.h" #include "soc/rtc_io_reg.h" -#define ETS_GPIO_INUM 4 +#define ETS_GPIO_INUM 12 const DRAM_ATTR esp32_gpioMux_t esp32_gpioMux[GPIO_PIN_COUNT]={ {0x44, 11, 11, 1}, diff --git a/cores/esp32/esp32-hal-touch.c b/cores/esp32/esp32-hal-touch.c index cb4d1d40b..8f530150d 100644 --- a/cores/esp32/esp32-hal-touch.c +++ b/cores/esp32/esp32-hal-touch.c @@ -22,7 +22,7 @@ #include "soc/rtc_cntl_reg.h" #include "soc/sens_reg.h" -#define RTC_TOUCH_INUM 5 +#define RTC_TOUCH_INUM 13 static uint16_t __touchSleepCycles = 0x1000; static uint16_t __touchMeasureCycles = 0x1000; diff --git a/cores/esp32/esp32-hal-uart.c b/cores/esp32/esp32-hal-uart.c index a2194827d..98fcdce58 100644 --- a/cores/esp32/esp32-hal-uart.c +++ b/cores/esp32/esp32-hal-uart.c @@ -33,7 +33,6 @@ #define UART_REG_BASE(u) ((u==0)?DR_REG_UART_BASE:( (u==1)?DR_REG_UART1_BASE:( (u==2)?DR_REG_UART2_BASE:0))) #define UART_RXD_IDX(u) ((u==0)?U0RXD_IN_IDX:( (u==1)?U1RXD_IN_IDX:( (u==2)?U2RXD_IN_IDX:0))) #define UART_TXD_IDX(u) ((u==0)?U0TXD_OUT_IDX:( (u==1)?U1TXD_OUT_IDX:( (u==2)?U2TXD_OUT_IDX:0))) -#define UART_INUM(u) ((u==0)?ETS_UART0_INUM:( (u==1)?ETS_UART1_INUM:( (u==2)?ETS_UART2_INUM:0))) #define UART_INTR_SOURCE(u) ((u==0)?ETS_UART0_INTR_SOURCE:( (u==1)?ETS_UART1_INTR_SOURCE:((u==2)?ETS_UART2_INTR_SOURCE:0))) static int s_uart_debug_nr = 0; -- GitLab