refactored, interrupt type

fbiego · Aug 13, 2021 · 69cf0dd · 69cf0dd
1 parent 817f395
commit 69cf0dd
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 41 deletions.
diff --git a/CST816S.cpp b/CST816S.cpp
@@ -72,8 +72,10 @@ void IRAM_ATTR CST816S::handleISR(void) {
 
 /*!
     @brief  initialize the touch screen
+	@param	interrupt
+			type of interrupt FALLING, RISING..
 */
-void CST816S::begin() {
+void CST816S::begin(int interrupt) {
   Wire.begin(_sda, _scl);
 
   pinMode(_irq, INPUT);
@@ -90,7 +92,7 @@ void CST816S::begin() {
   delay(5);
   i2c_read(CST816S_ADDRESS, 0xA7, data.versionInfo, 3);
 
-  attachInterrupt(_irq, std::bind(&CST816S::handleISR, this), RISING);
+  attachInterrupt(_irq, std::bind(&CST816S::handleISR, this), interrupt);
 }
 
 /*!
@@ -122,28 +124,28 @@ void CST816S::sleep() {
 */
 String CST816S::gesture() {
   switch (data.gestureID) {
-    case CST816S_NONE:
+    case NONE:
       return "NONE";
       break;
-    case CST816S_SWIPE_DOWN:
+    case SWIPE_DOWN:
       return "SWIPE DOWN";
       break;
-    case CST816S_SWIPE_UP:
+    case SWIPE_UP:
       return "SWIPE UP";
       break;
-    case CST816S_SWIPE_LEFT:
+    case SWIPE_LEFT:
       return "SWIPE LEFT";
       break;
-    case CST816S_SWIPE_RIGHT:
+    case SWIPE_RIGHT:
       return "SWIPE RIGHT";
       break;
-    case CST816S_SINGLE_CLICK:
+    case SINGLE_CLICK:
       return "SINGLE CLICK";
       break;
-    case CST816S_DOUBLE_CLICK:
+    case DOUBLE_CLICK:
       return "DOUBLE CLICK";
       break;
-    case CST816S_LONG_PRESS:
+    case LONG_PRESS:
       return "LONG PRESS";
       break;
     default:

diff --git a/CST816S.h b/CST816S.h
@@ -27,17 +27,20 @@
 
 #include <Arduino.h>
 
-#define CST816S_NONE       	0x00
-#define CST816S_SWIPE_DOWN    0x01
-#define CST816S_SWIPE_UP    0x02
-#define CST816S_SWIPE_LEFT    0x03
-#define CST816S_SWIPE_RIGHT   0x04
-#define CST816S_SINGLE_CLICK  0x05
-#define CST816S_DOUBLE_CLICK  0x0B
-#define CST816S_LONG_PRESS    0x0C
-
 #define CST816S_ADDRESS     0x15
 
+enum GESTURE {
+  NONE = 0x00,
+  SWIPE_DOWN = 0x01,
+  SWIPE_UP = 0x02,
+  SWIPE_LEFT = 0x03,
+  SWIPE_RIGHT = 0x04,
+  SINGLE_CLICK = 0x05,
+  DOUBLE_CLICK = 0x0B,
+  LONG_PRESS = 0x0C
+
+};
+
 struct data_struct {
   byte gestureID; // Gesture ID
   byte points;  // Number of touch points
@@ -54,7 +57,7 @@ class CST816S {
 
   public:
     CST816S(int sda, int scl, int rst, int irq);
-    void begin();
+    void begin(int interrupt = FALLING);
     void sleep();
     bool available();
     data_struct data;

diff --git a/README.md b/README.md
@@ -1,4 +1,2 @@
 # CST816S
- An Arduino library for the Hynitron CST816S capacitive touch screen IC
-
- [![arduino-library-badge](https://www.ardu-badge.com/badge/CST816S.svg?)](https://www.arduinolibraries.info/libraries/cst816-s)
+ An Arduino library for the CST816S capacitive touch screen IC
diff --git a/keywords.txt b/keywords.txt
@@ -5,16 +5,12 @@ available				KEYWORD2
 sleep					KEYWORD2
 begin					KEYWORD2
 gesture					KEYWORD2
-version					KEYWORD2
-versionInfo				KEYWORD2
-gestureID				KEYWORD2
-points					KEYWORD2
 
-CST816S_NONE			LITERAL2
-CST816S_SWIPE_DOWN		LITERAL2
-CST816S_SWIPE_UP		LITERAL2
-CST816S_SWIPE_LEFT		LITERAL2
-CST816S_SWIPE_RIGHT		LITERAL2
-CST816S_SINGLE_CLICK	LITERAL2
-CST816S_DOUBLE_CLICK	LITERAL2
-CST816S_LONG_PRESS		LITERAL2
+NONE					LITERAL1
+SWIPE_DOWN				LITERAL1
+SWIPE_UP				LITERAL1
+SWIPE_LEFT				LITERAL1
+SWIPE_RIGHT				LITERAL1
+SINGLE_CLICK			LITERAL1
+DOUBLE_CLICK			LITERAL1
+LONG_PRESS				LITERAL1
diff --git a/library.json b/library.json
@@ -1,8 +1,8 @@
 {
   "name": "CST816S",
-  "version": "1.0.0",
-  "keywords": "Arduino, ESP32, Touch, Hynitron, CST816S, I2C, TouchScreen",
-  "description": "An Arduino library for the Hynitron CST816S capacitive touch screen IC",
+  "version": "1.1.0",
+  "keywords": "Arduino, ESP32, Touch, Hynitron, CST816S, I2C",
+  "description": "An Arduino library for the CST816S capacitive touch screen IC",
   "repository":
   {
     "type": "git",

diff --git a/library.properties b/library.properties
@@ -1,10 +1,10 @@
 name=CST816S
-version=1.0.0
+version=1.1.0
 author=fbiego
 maintainer=fbiego
 sentence=Capacitive touch screen library
-paragraph=An Arduino library for the Hynitron CST816S capacitive touch screen IC
-category=Sensors
+paragraph=An Arduino library for the CST816S capacitive touch screen IC
+category=Other
 url=https://github.com/fbiego/CST816S
 architectures=*
 includes=CST816S.h