Use Arduino_GigaDisplayTouch library in LVGLDemo example

Author: leonardocavagnis

libraries/Arduino_H7_Video/examples/LVGLDemo/LVGLDemo.ino

@@ -7,36 +7,29 @@
 */
 
 #include "Arduino_H7_Video.h"
+#include "Arduino_GigaDisplayTouch.h"
 
 #include "lvgl.h"
-#include "giga_touch.h"
 
-Arduino_H7_Video Display(800, 480, GigaDisplayShield);
-//Arduino_H7_Video Display(1024, 768, USBCVideo);
-
-void my_touchpad_read(lv_indev_drv_t * indev, lv_indev_data_t * data) {
-  data->state = (touchpad_pressed) ? LV_INDEV_STATE_PR : LV_INDEV_STATE_REL;
-  if(data->state == LV_INDEV_STATE_PR) {
-    data->point.x = giga_get_touch_x();
-    data->point.y = giga_get_touch_y();
-    touchpad_pressed = false;
+Arduino_H7_Video          Display(800, 480, GigaDisplayShield); /* Arduino_H7_Video Display(1024, 768, USBCVideo); */
+Arduino_GigaDisplayTouch  Touch;
 
+void gigaTouchHandler(uint8_t contacts, GDTpoint_t* points) {
+  if (contacts > 0) {
     Serial.print("Touch detected: ");
-    Serial.print(data->point.x);
+    Serial.print(points[0].x);
     Serial.print(",");
-    Serial.println(data->point.y);
+    Serial.println(points[0].y);
   }
-  
-  return;
 }
 
 void setup() {
   Serial.begin(115200);
-  giga_touch_setup();
 
   Display.begin();
-  Display.attachLVGLTouchCb((void (*)(void*,void*))(my_touchpad_read));
-  
+  Touch.begin();
+  Touch.attach(gigaTouchHandler);
+
   /* Change the active screen's background color */
   lv_obj_set_style_bg_color(lv_scr_act(), lv_color_hex(0x03989e), LV_PART_MAIN);
 
@@ -48,9 +41,6 @@ void setup() {
 }
 
 void loop() { 
-  /* Touch handler */
-  giga_touch_handler();
-  
   /* Feed LVGL engine */
   lv_timer_handler();
 }

libraries/Arduino_H7_Video/examples/LVGLDemo/giga_touch.cpp

@@ -51,7 +51,7 @@ Arduino_H7_Video::~Arduino_H7_Video() {
 
 int Arduino_H7_Video::begin() {
   if (!ArduinoGraphics::begin()) {
-    return 0;
+    return H7V_ERR_UNKNOWN;
   }
 
   textFont(Font_5x7);
@@ -93,7 +93,7 @@ int Arduino_H7_Video::begin() {
     lv_disp_drv_register(&disp_drv);        /* Finally register the driver */
   #endif
 
-  return H7V_OK;
+  return 0;
 }
 
 void Arduino_H7_Video::end() {

libraries/Arduino_H7_Video/examples/LVGLDemo/giga_touch.h

@@ -16,7 +16,7 @@
 #include "H7DisplayShield.h"
 
 /* Exported defines ----------------------------------------------------------*/
-#define H7V_OK                      1
+#define H7V_ERR_UNKNOWN             1
 #define H7V_ERR_INSUFFMEM           2
 
 /* Exported enumeration ------------------------------------------------------*/