From fb27980ed492896acf7c653ab668189bf4e4e91f Mon Sep 17 00:00:00 2001
From: lewisxhe <lewisxhe@outlook.com>
Date: Thu, 24 Sep 2020 16:40:07 +0800
Subject: [PATCH] Update ft6xxx driver

---
 src/TTGO.h                     |  4 ++--
 src/drive/fx50xx/focaltech.cpp | 18 +++++++++---------
 src/drive/fx50xx/focaltech.h   |  7 ++++---
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/src/TTGO.h b/src/TTGO.h
index 3431790..d6731b0 100644
--- a/src/TTGO.h
+++ b/src/TTGO.h
@@ -1186,7 +1186,7 @@ private:
     static uint8_t i2cWriteBytes(uint8_t devAddress, uint8_t regAddress, uint8_t *data, uint8_t len)
     {
         _ttgo->writeBytes(devAddress, regAddress, data, len);
-        return 0;
+        return true;
     }
 
     /**
@@ -1195,7 +1195,7 @@ private:
     static uint8_t i2cReadBytes(uint8_t devAddress, uint8_t regAddress,  uint8_t *data, uint8_t len)
     {
         _ttgo->readBytes(devAddress, regAddress, data, len);
-        return 0;
+        return true;
     }
 
     /**
diff --git a/src/drive/fx50xx/focaltech.cpp b/src/drive/fx50xx/focaltech.cpp
index 2325f68..80b6bb7 100644
--- a/src/drive/fx50xx/focaltech.cpp
+++ b/src/drive/fx50xx/focaltech.cpp
@@ -57,14 +57,14 @@ github:https://github.com/lewisxhe/FocalTech_Library
 
 bool FocalTech_Class::probe(void)
 {
-#ifdef ARDUINO
-    _i2cPort->beginTransmission(_address);
-    if (_i2cPort->endTransmission() == 0) {
-        initialization = true;
-    }
-#else
+// #ifdef ARDUINO
+//     _i2cPort->beginTransmission(_address);
+//     if (_i2cPort->endTransmission() == 0) {
+//         initialization = true;
+//     }
+// #else
     initialization = true;
-#endif
+// #endif
     return true;
 }
 
@@ -77,7 +77,7 @@ bool FocalTech_Class::begin(TwoWire &port, uint8_t addr)
     return probe();
 }
 
-bool FocalTech_Class::begin(iic_com_fptr_t read_cb, iic_com_fptr_t write_cb, uint8_t addr)
+bool FocalTech_Class::begin(iic_com_fptr_u8_t read_cb, iic_com_fptr_u8_t write_cb, uint8_t addr)
 {
     if (read_cb == nullptr || write_cb == nullptr) {
         return false;
@@ -208,7 +208,7 @@ bool FocalTech_Class::getPoint(uint16_t &x, uint16_t &y)
         event = (EventFlag_t)(buffer[1] & 0xC0);
         x = (buffer[1] & 0x0F) << 8 | buffer[2];
         y =  (buffer[3] & 0x0F) << 8 | buffer[4];
-
+#define DBG_FOCALTECH
 #ifdef DBG_FOCALTECH
         printf("x=%03u y=%03u\n", x, y);
 #endif
diff --git a/src/drive/fx50xx/focaltech.h b/src/drive/fx50xx/focaltech.h
index 019117b..657c66a 100644
--- a/src/drive/fx50xx/focaltech.h
+++ b/src/drive/fx50xx/focaltech.h
@@ -64,6 +64,7 @@ typedef enum {
 } PowerMode_t;
 
 typedef uint8_t (*iic_com_fptr_t)(int dev_addr, uint16_t reg_addr, uint8_t *data, int len);
+typedef uint8_t (*iic_com_fptr_u8_t)(uint8_t dev_addr, uint8_t reg_addr, uint8_t *data, uint8_t len);
 
 
 class GT9xx_Class
@@ -115,7 +116,7 @@ public:
     bool begin(TwoWire &port = Wire, uint8_t addr = FOCALTECH_SLAVE_ADDRESS);
 #endif
 
-    bool begin(iic_com_fptr_t read_cb, iic_com_fptr_t write_cb, uint8_t addr = FOCALTECH_SLAVE_ADDRESS);
+    bool begin(iic_com_fptr_u8_t read_cb, iic_com_fptr_u8_t write_cb, uint8_t addr = FOCALTECH_SLAVE_ADDRESS);
 
     void    setTheshold(uint8_t value);
     uint8_t getThreshold(void);
@@ -157,8 +158,8 @@ private:
 
     uint8_t _address;
     bool initialization = false;
-    iic_com_fptr_t _readCallbackFunc = nullptr;
-    iic_com_fptr_t _writeCallbackFunc = nullptr;
+    iic_com_fptr_u8_t _readCallbackFunc = nullptr;
+    iic_com_fptr_u8_t _writeCallbackFunc = nullptr;
 
 #ifdef ARDUINO
     TwoWire *_i2cPort;