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

fix GPIO attachInterrupt

Browse Source
This commit is contained in:
me-no-dev 2016-10-11 12:07:18 +03:00
parent 5d61d8ddd0
commit 6125a40f93
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cores/esp32/esp32-hal-gpio.c
View File

@ -190,13 +190,14 @@ extern void __attachInterrupt(uint8_t pin, voidFuncPtr userFunc, int intr_type)
if(!interrupt_initialized) { if(!interrupt_initialized) {
interrupt_initialized = true; interrupt_initialized = true;
ESP_INTR_DISABLE(ETS_GPIO_INUM); ESP_INTR_DISABLE(ETS_GPIO_INUM);
intr_matrix_set(PRO_CPU_NUM, ETS_GPIO_INTR_SOURCE, ETS_GPIO_INUM); intr_matrix_set(xPortGetCoreID(), ETS_GPIO_INTR_SOURCE, ETS_GPIO_INUM);
xt_set_interrupt_handler(ETS_GPIO_INUM, &__onPinInterrupt, NULL); xt_set_interrupt_handler(ETS_GPIO_INUM, &__onPinInterrupt, NULL);
ESP_INTR_ENABLE(ETS_GPIO_INUM); ESP_INTR_ENABLE(ETS_GPIO_INUM);
} }
__pinInterruptHandlers[pin] = userFunc; __pinInterruptHandlers[pin] = userFunc;
ESP_INTR_DISABLE(ETS_GPIO_INUM); ESP_INTR_DISABLE(ETS_GPIO_INUM);
GPIO.pin[pin].val = (GPIO.pin[pin].val & ~((GPIO_PIN0_INT_ENA << GPIO_PIN0_INT_ENA_S) | (GPIO_PIN0_INT_TYPE << GPIO_PIN0_INT_TYPE_S))) | (((uint32_t)0x4 << GPIO_PIN0_INT_ENA_S) | ((uint32_t)intr_type << GPIO_PIN0_INT_TYPE_S)); GPIO.pin[pin].int_ena = 1;
GPIO.pin[pin].int_type = intr_type;
ESP_INTR_ENABLE(ETS_GPIO_INUM); ESP_INTR_ENABLE(ETS_GPIO_INUM);
} }
@ -204,7 +205,8 @@ extern void __detachInterrupt(uint8_t pin)
{ {
__pinInterruptHandlers[pin] = NULL; __pinInterruptHandlers[pin] = NULL;
ESP_INTR_DISABLE(ETS_GPIO_INUM); ESP_INTR_DISABLE(ETS_GPIO_INUM);
GPIO.pin[pin].val = (GPIO.pin[pin].val & ~((GPIO_PIN0_INT_ENA << GPIO_PIN0_INT_ENA_S) | (GPIO_PIN0_INT_TYPE << GPIO_PIN0_INT_TYPE_S))); GPIO.pin[pin].int_ena = 0;
GPIO.pin[pin].int_type = 0;
ESP_INTR_ENABLE(ETS_GPIO_INUM); ESP_INTR_ENABLE(ETS_GPIO_INUM);
} }