refactoring of attach and detect function

Author: leonardocavagnis

examples/Touch_IRQ/Touch_IRQ.ino

@@ -7,7 +7,7 @@
 
 #include "Arduino_GigaDisplayTouch.h"
 
-Arduino_GigaDisplayTouch touch;
+Arduino_GigaDisplayTouch touchDetector;
 
 void gigaTouchHandler(uint8_t contacts, GDTpoint_t* points) {
   Serial.print("Contacts: ");
@@ -25,14 +25,14 @@ void setup() {
   Serial.begin(115200);
   while(!Serial) {}
 
-  if (touch.begin()) {
+  if (touchDetector.begin()) {
     Serial.println("Touch controller init - OK");
   } else {
     Serial.println("Touch controller init - FAILED");
     while(1) ;
   }
 
-  touch.attach(gigaTouchHandler);
+  touchDetector.onDetect(gigaTouchHandler);
 }
 
 void loop() { }

examples/Touch_Polling/Touch_Polling.ino

@@ -7,13 +7,13 @@
 
 #include "Arduino_GigaDisplayTouch.h"
 
-Arduino_GigaDisplayTouch touch;
+Arduino_GigaDisplayTouch touchDetector;
 
 void setup() {
   Serial.begin(115200);
   while(!Serial) {}
 
-  if (touch.begin()) {
+  if (touchDetector.begin()) {
     Serial.print("Touch controller init - OK");
   } else {
     Serial.print("Touch controller init - FAILED");
@@ -25,7 +25,9 @@ void loop() {
   uint8_t contacts;
   GDTpoint_t points[5];
 
-  if(touch.detect(contacts, points)) {
+  contacts = touchDetector.getTouchPoints(points);
+
+  if (contacts > 0) {
     Serial.print("Contacts: ");
     Serial.println(contacts);
 

src/Arduino_GigaDisplayTouch.cpp

@@ -101,7 +101,9 @@ void _lvglTouchCb(lv_indev_drv_t * indev, lv_indev_data_t * data) {
     uint8_t contacts;
     GDTpoint_t points[5];
 
-    if(gThis->detect(contacts, points)) {
+    contacts = gThis->getTouchPoints(points);
+
+    if(contacts > 0) {
         data->state     = LV_INDEV_STATE_PR;
         data->point.x   = points[0].x;
         data->point.y   = points[0].y;
@@ -116,14 +118,16 @@ void _lvglTouchCb(lv_indev_drv_t * indev, lv_indev_data_t * data) {
 void Arduino_GigaDisplayTouch::end() 
 { }
 
-bool Arduino_GigaDisplayTouch::detect(uint8_t& contacts, GDTpoint_t* points) {
+uint8_t Arduino_GigaDisplayTouch::getTouchPoints(GDTpoint_t* points) {
     uint8_t rawpoints[GT911_MAX_CONTACTS * GT911_CONTACT_SIZE];
+    uint8_t contacts;
     uint8_t error;
 
-    error = _gt911ReadInputCoord(rawpoints, contacts);
+    contacts    = 0;
+    error       = _gt911ReadInputCoord(rawpoints, contacts);
 
     if (error) {
-        return false;
+        return 0;
     }
 
     for (uint8_t i = 0; i < contacts; i++) {
@@ -135,11 +139,10 @@ bool Arduino_GigaDisplayTouch::detect(uint8_t& contacts, GDTpoint_t* points) {
 
     _gt911WriteOp(GT911_REG_GESTURE_START_POINT, 0); /* Reset buffer status to finish the reading */
 
-    if (contacts > 0)   return true;
-    else                return false;
+    return contacts;
 }
 
-void Arduino_GigaDisplayTouch::attach(void (*handler)(uint8_t, GDTpoint_t*)) {
+void Arduino_GigaDisplayTouch::onDetect(void (*handler)(uint8_t, GDTpoint_t*)) {
     _gt911TouchHandler = handler;
     t.start(callback(&queue, &events::EventQueue::dispatch_forever));
     _irqInt.rise(queue.event(mbed::callback(this, &Arduino_GigaDisplayTouch::_gt911onIrq)));

src/Arduino_GigaDisplayTouch.h

@@ -98,8 +98,7 @@ class Arduino_GigaDisplayTouch {
       /**
        * @brief Initialize the touch controller.
        *
-       * @return true If the touch controller is successfully initialized
-       * @return false Otherwise
+       * @return true If the touch controller is successfully initialized, false Otherwise
        */
       bool begin();
 
@@ -110,18 +109,16 @@ class Arduino_GigaDisplayTouch {
 
       /**
        * @brief Check if a touch event is detected and get the touch points.
-       * @param contacts The number of detected touch points.
        * @param points The array containing the coordinates of the touch points.
-       * @return true If a touch event is detected
-       * @return false Otherwise
+       * @return uint8_t The number of detected touch points.
        */
-      bool detect(uint8_t& contacts, GDTpoint_t* points);
+      uint8_t getTouchPoints(GDTpoint_t* points);
 
       /**
        * @brief Attach an interrupt handler function for touch detection callbacks.
        * @param handler The pointer to the user-defined handler function.
        */
-      void attach(void (*handler)(uint8_t, GDTpoint_t*));
+      void onDetect(void (*handler)(uint8_t, GDTpoint_t*));
   private:
       TwoWire&          _wire;
       uint8_t           _intPin;