From 5bc40c9287f06d2c2bb24a5691175f1d29a17c1b Mon Sep 17 00:00:00 2001
From: Riku Isokoski <riksu9000@gmail.com>
Date: Wed, 14 Jul 2021 17:11:16 +0300
Subject: Update touchpad driver

---
 src/drivers/Cst816s.h | 36 ++++++++++++++++++++++++------------
 1 file changed, 24 insertions(+), 12 deletions(-)

(limited to 'src/drivers/Cst816s.h')

diff --git a/src/drivers/Cst816s.h b/src/drivers/Cst816s.h
index 14c296ea..394cc40f 100644
--- a/src/drivers/Cst816s.h
+++ b/src/drivers/Cst816s.h
@@ -20,11 +20,9 @@ namespace Pinetime {
         uint16_t x = 0;
         uint16_t y = 0;
         uint8_t action = 0;
-        uint8_t finger = 0;
-        uint8_t pressure = 0;
-        uint8_t area = 0;
+        bool touching = false;
         Gestures gesture = Gestures::None;
-        bool isTouch = false;
+        bool isValid = true;
       };
 
       Cst816S(TwiMaster& twiMaster, uint8_t twiAddress);
@@ -38,26 +36,40 @@ namespace Pinetime {
       void Sleep();
       void Wakeup();
 
+      uint8_t GetChipId() const {
+        return chipId;
+      }
+      uint8_t GetVendorId() const {
+        return vendorId;
+      }
+      uint8_t GetFwVersion() const {
+        return fwVersion;
+      }
     private:
       static constexpr uint8_t pinIrq = 28;
       static constexpr uint8_t pinReset = 10;
-      static constexpr uint8_t lastTouchId = 0x0f;
+
+      // Unused/Unavailable commented out
+      static constexpr uint8_t gestureIndex = 1;
       static constexpr uint8_t touchPointNumIndex = 2;
-      static constexpr uint8_t touchMiscIndex = 8;
-      static constexpr uint8_t touchXYIndex = 7;
       static constexpr uint8_t touchEventIndex = 3;
       static constexpr uint8_t touchXHighIndex = 3;
       static constexpr uint8_t touchXLowIndex = 4;
+      //static constexpr uint8_t touchIdIndex = 5;
       static constexpr uint8_t touchYHighIndex = 5;
       static constexpr uint8_t touchYLowIndex = 6;
-      static constexpr uint8_t touchIdIndex = 5;
-      static constexpr uint8_t touchStep = 6;
-      static constexpr uint8_t gestureIndex = 1;
+      //static constexpr uint8_t touchStep = 6;
+      //static constexpr uint8_t touchXYIndex = 7;
+      //static constexpr uint8_t touchMiscIndex = 8;
 
-      uint8_t touchData[10];
+      uint8_t touchData[7];
       TwiMaster& twiMaster;
       uint8_t twiAddress;
+
+      uint8_t chipId;
+      uint8_t vendorId;
+      uint8_t fwVersion;
     };
 
   }
-}
\ No newline at end of file
+}
-- 
cgit v1.2.3-70-g09d2