Diff: Keyboard_Ts.cpp

Revision:

4:35b2f0e76b02

Parent:

1:55e05d2aa9cd

Child:

7:982fb1421824

--- a/Keyboard_Ts.cpp	Fri May 08 10:57:14 2020 +0000
+++ b/Keyboard_Ts.cpp	Mon May 11 09:49:05 2020 +0000
@@ -1,21 +1,14 @@
 #include "Keyboard_Ts.h"
 
-TS_DISCO_F429ZI ts;
-TS_StateTypeDef TS_State;
-
-KeyboardTs::KeyboardTs(unsigned char columnNumber){
+KeyboardTs::KeyboardTs(uint16_t columnNumber){
     ColumnX = columnNumber*80;
 }
 
 enum Buttons KeyboardTs::eRead(void) {
-    uint16_t x;
-    uint16_t y;
     ts.GetState(&TS_State);
-    x = TS_State.X;
-    y = TS_State.Y;
-    if((! TS_State.TouchDetected) || !((x>ColumnX) && (x<ColumnX+80)) ) return OTHER;
-    else if( (y>0) && (y<80) ) return BUTTON_0;
-    else if( (y>80) && (y<160) ) return BUTTON_1;
-    else if( (y>160) && (y<240) ) return BUTTON_2;
+    if((! TS_State.TouchDetected) || !((TS_State.X>ColumnX) && (TS_State.X<ColumnX+80)) ) return NOT_A_BUTTON;
+    else if( (TS_State.Y>0) && (TS_State.Y<80) ) return BUTTON_0;
+    else if( (TS_State.Y>80) && (TS_State.Y<160) ) return BUTTON_1;
+    else if( (TS_State.Y>160) && (TS_State.Y<240) ) return BUTTON_2;
     else return BUTTON_3;
 }