"Added ability to set callbacks for interrupts that get an argument. This argument can be the instance that needs to handle the interrupt, or just a random argument you might find useful later. Suggestions from mbolivar and iperry from pull53 on libmaple were taken into account.

Signed-off-by: Aditya Gaddam <adityagaddam@gmail.com>"

2 files changed, 49 insertions, 0 deletions

diff --git a/wirish/ext_interrupts.cpp b/wirish/ext_interrupts.cpp
index a3e61fd..f72efbf 100644
--- a/wirish/ext_interrupts.cpp
+++ b/wirish/ext_interrupts.cpp
@@ -60,6 +60,34 @@ void attachInterrupt(uint8 pin, voidFuncPtr handler, ExtIntTriggerMode mode) {
 }
 
 /**
+ *  @brief Registers an interrupt handler on a pin.
+ *
+ *  @param pin Pin number
+ *  @param handler Static class member function to run upon external interrupt 
+ *                 trigger. The handler should take 1 argument and return void
+ *  @param arg Argument that the handler will be passed when it's called. One
+ *             use of this is to pass the specific instance of the class that 
+ *             will handle the interrupt.
+ *  @param mode Type of transition to trigger on, e.g. falling, rising, etc.
+ *
+ *  @sideeffect Registers a handler
+ *  @see detachInterrupt()
+ */
+void attachInterrupt(uint8 pin, voidFuncPtr handler, void *arg, ExtIntTriggerMode mode) {
+    if (pin >= BOARD_NR_GPIO_PINS || !handler) {
+        return;
+    }
+
+    exti_trigger_mode outMode = exti_out_mode(mode);
+
+    exti_attach_callback((exti_num)(PIN_MAP[pin].gpio_bit),
+                          gpio_exti_port(PIN_MAP[pin].gpio_device),
+                          handler,
+                          arg,
+                          outMode);
+}
+
+/**
  * @brief Disable any external interrupt attached to a pin.
  * @param pin Pin number to detach any interrupt from.
  */
diff --git a/wirish/include/wirish/ext_interrupts.h b/wirish/include/wirish/ext_interrupts.h
index 933be04..1bd7956 100644
--- a/wirish/include/wirish/ext_interrupts.h
+++ b/wirish/include/wirish/ext_interrupts.h
@@ -69,6 +69,27 @@ typedef enum ExtIntTriggerMode {
 void attachInterrupt(uint8 pin, voidFuncPtr handler, ExtIntTriggerMode mode);
 
 /**
+ *  @brief Registers an interrupt handler on a pin.
+ *
+ *  The interrupt will be triggered on a given transition on the pin,
+ *  as specified by the mode parameter.  The handler runs in interrupt
+ *  context.  The new handler will replace whatever handler is
+ *  currently registered for the pin, if any.
+ *
+ *  @param pin Pin number
+ *  @param handler Static class member function to run upon external interrupt 
+ *                 trigger. The handler should take 1 argument and return void
+ *  @param arg Argument that the handler will be passed when it's called. One
+ *             use of this is to pass the specific instance of the class that 
+ *             will handle the interrupt.
+ *  @param mode Type of transition to trigger on, e.g. falling, rising, etc.
+ *
+ *  @sideeffect Registers a handler
+ *  @see detachInterrupt()
+ */
+void attachInterrupt(uint8 pin, voidFuncPtr handler, void *arg, ExtIntTriggerMode mode);
+
+/**
  * @brief Disable any registered external interrupt.
  * @param pin Maple pin number
  * @sideeffect unregisters external interrupt handler