Diff: RA8875_Touch.cpp

Revision:

149:c62c4b2d6a15

Parent:

145:5eb2492acdda

Child:

150:35a4db3081c1

--- a/RA8875_Touch.cpp	Tue Jun 13 23:12:26 2017 +0000
+++ b/RA8875_Touch.cpp	Sun Aug 06 17:05:54 2017 +0000
@@ -119,7 +119,7 @@
     while (TouchPanelA2DFiltered(&x, &y) && timeout.read() < maxwait_s) {
         wait_ms(20);
         if (idle_callback) {
-            if (external_abort == (*idle_callback)(touchcal_wait)) {
+            if (external_abort == (*idle_callback)(touchcal_wait, 0)) {
                 return external_abort;
             }
         }
@@ -143,7 +143,7 @@
         while (!TouchPanelA2DFiltered(&x, &y) && timeout.read() < maxwait_s) {
             wait_ms(20);
             if (idle_callback) {
-                if (external_abort == (*idle_callback)(touchcal_wait)) {
+                if (external_abort == (*idle_callback)(touchcal_wait, 0)) {
                     return external_abort;
                 }
             }
@@ -157,7 +157,7 @@
         while (TouchPanelA2DFiltered(&x, &y) && timeout.read() < maxwait_s) {
             wait_ms(20);
             if (idle_callback) {
-                if (external_abort == (*idle_callback)(touchcal_wait)) {
+                if (external_abort == (*idle_callback)(touchcal_wait, 0)) {
                     return external_abort;
                 }
             }
@@ -165,7 +165,7 @@
         for (int t=0; t<100; t++) {
             wait_ms(20);
             if (idle_callback) {
-                if (external_abort == (*idle_callback)(touchcal_wait)) {
+                if (external_abort == (*idle_callback)(touchcal_wait, 0)) {
                     return external_abort;
                 }
             }
@@ -290,7 +290,7 @@
         if (t != no_touch)
             break;
         if (idle_callback) {
-            if (external_abort == (*idle_callback)(touch_wait)) {
+            if (external_abort == (*idle_callback)(touch_wait, 0)) {
                 return no_touch;
             }
         }