Diff: touch.cpp

Revision:

4:87b40e5986e7

Parent:

3:1396bac4ae71

Child:

5:80791250acb2

--- a/touch.cpp	Thu Jan 10 01:14:40 2019 +0000
+++ b/touch.cpp	Thu Jan 10 03:48:37 2019 +0000
@@ -6,19 +6,40 @@
 TouchScreen::TouchScreen(PinName xp, PinName yp, PinName xm, PinName ym) {}
 
 
-int TouchScreen::readTouch(PinName n, PinName m, PinName a, PinName i){
-    
-    DigitalOut _n(n);
+int TouchScreen::readTouch(PinName a, PinName i, PinName n, PinName m){
+//int readTouch(PinName a, PinName i, PinName n, PinName m){
+   
+    /*DigitalOut _n(PTB1);
     _n = 1;
-    DigitalOut _m(m);
+    DigitalOut _m(PTB0);
     _m = 0;
     wait_ms(10);
-    AnalogIn   _a(a);
+    AnalogIn   _a(PTB3);
     wait_ms(10);
-    AnalogIn   _i(i);
+    AnalogIn   _i(PTB2);
     wait_us(10);
     _n = 0;
-    return (int)_a.read_u16();
+    return (int)_a.read_u16();*/
+    
+    AnalogIn   _a(a);
+    AnalogIn   _i(i);
+    DigitalOut _n(n);
+    DigitalOut _m(m);
+    //uint16_t y1=1;
+    //uint16_t y2=0;
+    int y1=1;
+    int y2=0;
+    _n = 1;
+    _m = 0;
+    wait_us(50);
+    //while(y1 != y2){
+        y1 = _a.read_u16();
+        wait_us(50);
+        y2 = _a.read_u16();
+        wait_us(50);
+    //}
+    _n=0;
+    return (y1+y2)/2;
 }