Allow using argument with attachInterrupt (#1535)

* Allow using argument with attachInterrupt * formatting replace tabs with spaces * fix bug more then 1 interrupt * leftover * add example * make attachInterruptArg public * update example * leftover

Author: bertmelis

cores/esp32/esp32-hal-gpio.c

@@ -70,7 +70,12 @@ const DRAM_ATTR esp32_gpioMux_t esp32_gpioMux[GPIO_PIN_COUNT]={
 };
 
 typedefvoid (*voidFuncPtr)(void);
-staticvoidFuncPtr__pinInterruptHandlers[GPIO_PIN_COUNT] ={0,};
+typedefvoid (*voidFuncPtrArg)(void*);
+typedefstruct{
+voidFuncPtrfn;
+void*arg;
+} InterruptHandle_t;
+staticInterruptHandle_t__pinInterruptHandlers[GPIO_PIN_COUNT] ={0,};
 
 #include"driver/rtc_io.h"
 
@@ -193,7 +198,7 @@ extern int IRAM_ATTR __digitalRead(uint8_t pin)
 
 staticintr_handle_tgpio_intr_handle=NULL;
 
-staticvoidIRAM_ATTR__onPinInterrupt(void*arg)
+staticvoidIRAM_ATTR__onPinInterrupt()
 {
 uint32_tgpio_intr_status_l=0;
 uint32_tgpio_intr_status_h=0;
@@ -207,8 +212,12 @@ static void IRAM_ATTR __onPinInterrupt(void *arg)
 if(gpio_intr_status_l){
 do{
 if(gpio_intr_status_l& ((uint32_t)1 << pin)){
-if(__pinInterruptHandlers[pin]){
-__pinInterruptHandlers[pin]();
+if(__pinInterruptHandlers[pin].fn){
+if(__pinInterruptHandlers[pin].arg){
+ ((voidFuncPtrArg)__pinInterruptHandlers[pin].fn)(__pinInterruptHandlers[pin].arg);
+ } else{
+__pinInterruptHandlers[pin].fn();
+ }
  }
  }
  } while(++pin<32);
@@ -217,23 +226,28 @@ static void IRAM_ATTR __onPinInterrupt(void *arg)
 pin=32;
 do{
 if(gpio_intr_status_h& ((uint32_t)1 << (pin-32))){
-if(__pinInterruptHandlers[pin]){
-__pinInterruptHandlers[pin]();
+if(__pinInterruptHandlers[pin].fn){
+if(__pinInterruptHandlers[pin].arg){
+ ((voidFuncPtrArg)__pinInterruptHandlers[pin].fn)(__pinInterruptHandlers[pin].arg);
+ } else{
+__pinInterruptHandlers[pin].fn();
+ }
  }
  }
  } while(++pin<GPIO_PIN_COUNT);
  }
 }
 
-externvoid__attachInterrupt(uint8_tpin, voidFuncPtruserFunc, intintr_type)
+externvoid__attachInterruptArg(uint8_tpin, voidFuncPtrArguserFunc, void*arg, intintr_type)
 {
 staticboolinterrupt_initialized= false;
 
 if(!interrupt_initialized){
 interrupt_initialized= true;
 esp_intr_alloc(ETS_GPIO_INTR_SOURCE, (int)ESP_INTR_FLAG_IRAM, __onPinInterrupt, NULL, &gpio_intr_handle);
  }
-__pinInterruptHandlers[pin] =userFunc;
+__pinInterruptHandlers[pin].fn= (voidFuncPtr)userFunc;
+__pinInterruptHandlers[pin].arg=arg;
 esp_intr_disable(gpio_intr_handle);
 if(esp_intr_get_cpu(gpio_intr_handle)){//APP_CPU
 GPIO.pin[pin].int_ena=1;
@@ -244,10 +258,15 @@ extern void __attachInterrupt(uint8_t pin, voidFuncPtr userFunc, int intr_type)
 esp_intr_enable(gpio_intr_handle);
 }
 
+externvoid__attachInterrupt(uint8_tpin, voidFuncPtruserFunc, intintr_type){
+__attachInterruptArg(pin, (voidFuncPtrArg)userFunc, NULL, intr_type);
+}
+
 externvoid__detachInterrupt(uint8_tpin)
 {
 esp_intr_disable(gpio_intr_handle);
-__pinInterruptHandlers[pin] =NULL;
+__pinInterruptHandlers[pin].fn=NULL;
+__pinInterruptHandlers[pin].arg=NULL;
 GPIO.pin[pin].int_ena=0;
 GPIO.pin[pin].int_type=0;
 esp_intr_enable(gpio_intr_handle);
@@ -258,5 +277,6 @@ extern void pinMode(uint8_t pin, uint8_t mode) __attribute__ ((weak, alias("__pi
 externvoiddigitalWrite(uint8_tpin, uint8_tval) __attribute__ ((weak, alias("__digitalWrite")));
 externintdigitalRead(uint8_tpin) __attribute__ ((weak, alias("__digitalRead")));
 externvoidattachInterrupt(uint8_tpin, voidFuncPtrhandler, intmode) __attribute__ ((weak, alias("__attachInterrupt")));
+externvoidattachInterruptArg(uint8_tpin, voidFuncPtrhandler, void*arg, intmode) __attribute__ ((weak, alias("__attachInterruptArg")));
 externvoiddetachInterrupt(uint8_tpin) __attribute__ ((weak, alias("__detachInterrupt")));
 

cores/esp32/esp32-hal-gpio.h

@@ -79,6 +79,7 @@ void digitalWrite(uint8_t pin, uint8_t val);
 intdigitalRead(uint8_tpin);
 
 voidattachInterrupt(uint8_tpin, void (*)(void), intmode);
+voidattachInterruptArg(uint8_tpin, void (*)(void), void*arg, intmode);
 voiddetachInterrupt(uint8_tpin);
 
 #ifdef__cplusplus

libraries/ESP32/examples/GPIOInterrupt/GPIOInterrupt.ino

@@ -0,0 +1,45 @@
+#include<Arduino.h>
+
+structButton{
+constuint8_t PIN;
+uint32_t numberKeyPresses;
+bool pressed;
+};
+
+Button button1 ={23, 0, false};
+Button button2 ={18, 0, false};
+
+void IRAM_ATTR isr(void* arg){
+ Button* s = static_cast<Button*>(arg);
+ s->numberKeyPresses += 1;
+ s->pressed = true;
+}
+
+void IRAM_ATTR isr(){
+ button2.numberKeyPresses += 1;
+ button2.pressed = true;
+}
+
+voidsetup(){
+ Serial.begin(115200);
+pinMode(button1.PIN, INPUT_PULLUP);
+attachInterruptArg(button1.PIN, isr, &button1, FALLING);
+pinMode(button2.PIN, INPUT_PULLUP);
+attachInterrupt(button2.PIN, isr, FALLING);
+}
+
+voidloop(){
+if (button1.pressed){
+ Serial.printf("Button 1 has been pressed %u times\n", button1.numberKeyPresses);
+ button1.pressed = false;
+ }
+if (button2.pressed){
+ Serial.printf("Button 2 has been pressed %u times\n", button2.numberKeyPresses);
+ button2.pressed = false;
+ }
+staticuint32_t lastMillis = 0;
+if (millis() - lastMillis > 10000){
+ lastMillis = millis();
+detachInterrupt(button1.PIN);
+ }
+}