interrupt management with mbed os task

Author: leonardocavagnis

examples/GigaDisplay_touch/GigaDisplay_touch.ino

@@ -38,9 +38,7 @@ void setup() {
 }
 
 void loop() {
-  #if TOUCH_MODE
-    touch.detect();
-  #else
+  #if (TOUCH_MODE == 0)
     uint8_t contacts;
     GDTpoint_t points[5];
     if(touch.detect(contacts, points)) {

src/Arduino_GigaDisplayTouch.cpp

@@ -16,14 +16,15 @@
 #define GT911_REG_CONFIG_VERSION        0x8047
 
 /* Private variables ---------------------------------------------------------*/
-volatile bool _gt911DataReadyIrq = false;
+rtos::Thread t;
+events::EventQueue queue(32 * EVENTS_EVENT_SIZE);  
 
 /* Private function prototypes -----------------------------------------------*/
 void _gt911_irqHandler();
 
 /* Functions -----------------------------------------------------------------*/
 Arduino_GigaDisplayTouch::Arduino_GigaDisplayTouch(TwoWire& wire, uint8_t intPin, uint8_t rstPin, uint8_t addr)
-: _wire{wire}, _intPin{intPin}, _rstPin{rstPin}, _addr{addr} 
+: _wire{wire}, _intPin{intPin}, _rstPin{rstPin}, _addr{addr}, _irqInt{digitalPinToPinName(intPin)}
 { }
 
 Arduino_GigaDisplayTouch::~Arduino_GigaDisplayTouch() 
@@ -55,7 +56,6 @@ bool Arduino_GigaDisplayTouch::begin() {
     delay(51);
     pinMode(_intPin, INPUT);
 
-    _gt911DataReadyIrq = false;
     _gt911TouchHandler = nullptr;
 
     /* GT911 test communication */
@@ -68,13 +68,6 @@ bool Arduino_GigaDisplayTouch::begin() {
 void Arduino_GigaDisplayTouch::end() 
 { }
 
-void Arduino_GigaDisplayTouch::detect() {
-  if (_gt911DataReadyIrq) {
-    _gt911onIrq();
-    _gt911DataReadyIrq = false;
-  }
-}
-
 bool Arduino_GigaDisplayTouch::detect(uint8_t& contacts, GDTpoint_t* points) {
     uint8_t rawpoints[GT911_MAX_CONTACTS * GT911_CONTACT_SIZE];
     uint8_t error;
@@ -99,7 +92,9 @@ bool Arduino_GigaDisplayTouch::detect(uint8_t& contacts, GDTpoint_t* points) {
 }
 
 void Arduino_GigaDisplayTouch::attach(void (*handler)(uint8_t, GDTpoint_t*)) {
-    attachInterrupt(_intPin, _gt911_irqHandler, RISING);
+    t.start(callback(&queue, &events::EventQueue::dispatch_forever));
+    _irqInt.rise(queue.event(mbed::callback(this, &Arduino_GigaDisplayTouch::_gt911onIrq)));
+
     _gt911TouchHandler = handler;
 }
 
@@ -186,10 +181,4 @@ uint8_t Arduino_GigaDisplayTouch::_gt911ReadInputCoord(uint8_t * pointsbuf, uint
     return 0;
 }
 
-void _gt911_irqHandler() {
-  noInterrupts();
-  _gt911DataReadyIrq = true;
-  interrupts();
-}
-
 /**** END OF FILE ****/

src/Arduino_GigaDisplayTouch.h

@@ -14,6 +14,7 @@
 /* Includes ------------------------------------------------------------------*/
 #include <Arduino.h>
 #include "Wire.h"
+#include "mbed.h"
 #include "pinDefinitions.h"
 
 /* Exported defines ----------------------------------------------------------*/
@@ -52,24 +53,27 @@ class Arduino_GigaDisplayTouch {
                                uint8_t rstPin = PinNameToIndex(PD_5), 
                                uint8_t addr   = GT911_I2C_ADDR_BA_BB);
     #else 
-      Arduino_GigaDisplayTouch(TwoWire& wire, uint8_t intPin, uint8_t rstPin, uint8_t addr);
+      Arduino_GigaDisplayTouch(TwoWire& wire, 
+                               uint8_t intPin, 
+                               uint8_t rstPin, 
+                               uint8_t addr);
     #endif
       ~Arduino_GigaDisplayTouch();
 
       bool begin();
       void end();
 
-      void detect();
       bool detect(uint8_t& contacts, GDTpoint_t* points);
       void attach(void (*handler)(uint8_t, GDTpoint_t*));
   private:
-      TwoWire&      _wire;
-      uint8_t       _intPin;
-      uint8_t       _rstPin;
-      uint8_t       _addr;
-      GDTpoint_t    _points[GT911_MAX_CONTACTS];
-      void          (*_gt911TouchHandler)(uint8_t, GDTpoint_t*);
-      
+      TwoWire&          _wire;
+      uint8_t           _intPin;
+      mbed::InterruptIn _irqInt; 
+      uint8_t           _rstPin;
+      uint8_t           _addr;
+      GDTpoint_t        _points[GT911_MAX_CONTACTS];
+      void              (*_gt911TouchHandler)(uint8_t, GDTpoint_t*);
+
       uint8_t   _gt911WriteOp(uint16_t reg, uint8_t data);
       uint8_t   _gt911WriteBytesOp(uint16_t reg, uint8_t * data, uint8_t len);
       uint8_t   _gt911ReadOp(uint16_t reg, uint8_t * data, uint8_t len);