default constructor parameters for GIGA and PORTENTA boards

Author: leonardocavagnis

examples/GigaDisplay_touch/GigaDisplay_touch.ino

@@ -6,16 +6,10 @@
 */
 
 #include "Arduino_GigaDisplayTouch.h"
-#include "pinDefinitions.h"
-
-#define Wire          Wire1
-#define INT_PIN       PinNameToIndex(PI_1)
-#define RST_PIN       PinNameToIndex(PI_2)
-#define WIRE_ADDR     GT911_I2C_ADDR_BA_BB
 
 #define TOUCH_MODE    1 /* 1: Interrupt, 0: Polling */
 
-Arduino_GigaDisplayTouch touch(Wire, INT_PIN, RST_PIN, WIRE_ADDR);
+Arduino_GigaDisplayTouch touch;
 
 void gigaTouchHandler(uint8_t contacts, GDTpoint_t* points) {
   Serial.print("Contacts: ");
@@ -32,14 +26,10 @@ void setup() {
   Serial.begin(115200);
   while(!Serial) {}
 
-  Wire.setClock(400000); /* maximum transmission rate of 400K bps */
-  Wire.begin();
-
-  Serial.print("Touch controller init ");
   if (touch.begin()) {
-    Serial.println("SUCCESS");
+    Serial.print("Touch controller init - OK");
   } else {
-    Serial.println("FAILED");
+    Serial.print("Touch controller init - FAILED");
     while(1) ;
   }
 #if TOUCH_MODE
@@ -54,7 +44,14 @@ void loop() {
     uint8_t contacts;
     GDTpoint_t points[5];
     if(touch.detect(contacts, points)) {
-      Serial.println("Contacts!");
+      Serial.print("Contacts: ");
+      Serial.println(contacts);
+
+      for (uint8_t i = 0; i < contacts; i++) {
+        Serial.print(points[i].x);
+        Serial.print(" ");
+        Serial.println(points[i].y);
+      }
     }
   #endif
 

src/Arduino_GigaDisplayTouch.cpp

@@ -30,6 +30,9 @@ Arduino_GigaDisplayTouch::~Arduino_GigaDisplayTouch()
 { }
 
 bool Arduino_GigaDisplayTouch::begin() {
+    _wire.setClock(400000); /* maximum transmission rate of 400K bps */
+    _wire.begin();
+
     delay(300);
 
     /* GT911 Power-on timing procedure - Ref. pg10 GT911 Rev09 */

src/Arduino_GigaDisplayTouch.h

@@ -14,6 +14,7 @@
 /* Includes ------------------------------------------------------------------*/
 #include <Arduino.h>
 #include "Wire.h"
+#include "pinDefinitions.h"
 
 /* Exported defines ----------------------------------------------------------*/
 #define GT911_I2C_ADDR_BA_BB    (0x5D | 0x80)  // 0xBA/0xBB - 0x5D (7bit address)
@@ -39,8 +40,20 @@ struct GDTpoint_s {
 
 /* Class ----------------------------------------------------------------------*/
 class Arduino_GigaDisplayTouch {
-  public:
+  public:  
+    #if defined(ARDUINO_GIGA)
+      Arduino_GigaDisplayTouch(TwoWire& wire  = Wire1, 
+                               uint8_t intPin = PinNameToIndex(PI_1),
+                               uint8_t rstPin = PinNameToIndex(PI_2), 
+                               uint8_t addr   = GT911_I2C_ADDR_BA_BB);
+    #elif defined(ARDUINO_PORTENTA_H7_M7)
+      Arduino_GigaDisplayTouch(TwoWire& wire  = Wire, 
+                               uint8_t intPin = PinNameToIndex(PD_4),
+                               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);
+    #endif
       ~Arduino_GigaDisplayTouch();
 
       bool begin();