export test

Dependencies:   SDFileSystem ds3231 eeprom_Nikita mbed testUniGraphic_150217

Fork of Int_Demo_09May2017_Suhasini_HRavg_Nikita_ili9341 by nikita teggi

Revision:
29:7edc76b15e3d
Parent:
24:d992ee8369f4
Child:
31:37d3ae1fa1eb
--- a/touch_modules.cpp	Sat Jul 08 04:51:31 2017 +0000
+++ b/touch_modules.cpp	Sat Jul 08 12:01:18 2017 +0000
@@ -1,10 +1,10 @@
 #include "mbed.h"
 #include "eeprom_pgm.h"
 //#include "ili9325.h"
-//#include "lcd_base.h"
 #include "display_modules.h"
 #include "touch_modules.h"
-InterruptIn Touch_D(PTD6);
+//InterruptIn Touch_D(PTD6);
+InterruptIn Touch_D(PTD2);
 int i;
 unsigned int xt;
 unsigned int yt;
@@ -51,13 +51,13 @@
     
     unsigned char state;
         
-                  if ( ((xt >=70) && (xt<=170)) && ( (yt>= 140) && (yt<= 195) ) ) // system configuration
+                  if ( ((xt >=SYSCFG_MAIN_X_MIN) && (xt<=SYSCFG_MAIN_X_MAX)) && ( (yt>=SYSCFG_MAIN_Y_MIN) && (yt<= SYSCFG_MAIN_Y_MAX) ) ) // system configuration
                        {
                           
                           state=2;
                         }
     
-                 else if ( ((xt >=70) && (xt<=170)) && ( (yt>=70) && (yt<=140) ) ) // test
+                 else if ( ((xt >=TEST_MAIN_X_MIN) && (xt<=TEST_MAIN_X_MAX)) && ( (yt>=TEST_MAIN_Y_MIN) && (yt<=TEST_MAIN_Y_MAX) ) ) // test
                       {
                            state=3;
                  }   
@@ -73,24 +73,24 @@
     
     unsigned char state;
         
-                  if ( ((xt >=35) && (xt<=100)) && ( (yt>= 135) && (yt<= 185) ) ) // ble
+                  if ( ((xt >=BLE_MAIN_X_MIN) && (xt<=BLE_MAIN_X_MAX)) && ( (yt>= BLE_MAIN_Y_MIN) && (yt<=BLE_MAIN_Y_MAX) ) ) // ble
                        {
                           
                           state=12;
                         }
     
-                 else if ( ((xt >=130) && (xt<=195)) && ( (yt>= 135) && (yt<= 185) ) ) // erase
+                 else if ( ((xt >=ERASE_MAIN_X_MIN) && (xt<=ERASE_MAIN_X_MAX)) && ( (yt>=ERASE_MAIN_Y_MIN) && (yt<=ERASE_MAIN_Y_MAX) ) ) // erase
                       {
                           // state=4;
                         
                           
                        }
-                 else if ( ((xt >= 35) && (xt<=100)) && ( (yt>= 65) && (yt<= 118) ) ) // file
+                 else if ( ((xt >=FILE_MAIN_X_MIN) && (xt<=FILE_MAIN_X_MAX)) && ( (yt>=FILE_MAIN_Y_MIN) && (yt<=FILE_MAIN_Y_MAX) ) ) // file
                       {
                                // state=5;
                          
                        }
-                 else if ( ((xt >= 130) && (xt<=195)) && ( (yt>= 65) && (yt<= 118) ) ) // home
+                 else if ( ((xt >=HOME_MAIN_X_MIN) && (xt<=HOME_MAIN_X_MAX)) && ( (yt>=HOME_MAIN_Y_MIN) && (yt<=HOME_MAIN_Y_MAX) ) ) // home
                        {
                                  state=1;         //////////
                         
@@ -107,24 +107,24 @@
     
     unsigned char state;
         
-                  if ( ((xt >=35) && (xt<=100)) && ( (yt>= 135) && (yt<= 185) ) ) // GLC
+                  if ( ((xt >=BG_MAIN_X_MIN) && (xt<=BG_MAIN_X_MAX)) && ( (yt>=BG_MAIN_Y_MIN) && (yt<=BG_MAIN_Y_MAX) ) ) // GLC
                        {
                           
                           state=4;
                         }
     
-                 else if ( ((xt >=130) && (xt<=195)) && ( (yt>= 135) && (yt<= 185) ) ) // ECG
+                 else if ( ((xt >=ECG_MAIN_X_MIN) && (xt<=ECG_MAIN_X_MAX)) && ( (yt>=ECG_MAIN_Y_MIN) && (yt<=ECG_MAIN_Y_MAX) ) ) // ECG
                       {
                            state=5;
                         
                           
                        }
-                 else if ( ((xt >= 35) && (xt<=100)) && ( (yt>= 65) && (yt<= 118) ) ) // BP
+                 else if ( ((xt >=BP_MAIN_X_MIN) && (xt<=BP_MAIN_X_MAX)) && ( (yt>=BP_MAIN_Y_MIN) && (yt<=BP_MAIN_Y_MAX) ) ) // BP
                       {
                                 state=6;
                          
                        }
-                 else if ( ((xt >= 130) && (xt<=195)) && ( (yt>= 65) && (yt<= 118) ) ) // Home
+                 else if ( ((xt >= HOME_MAIN_X_MIN) && (xt<= HOME_MAIN_X_MAX)) && ( (yt>=HOME_MAIN_Y_MIN) && (yt<= HOME_MAIN_Y_MAX) ) ) // Home
                        {
                                  state=1;
                         
@@ -145,13 +145,13 @@
 {
       
       unsigned char state;
-                 if ( ((xt >=70) && (xt<=170)) && ( (yt>= 140) && (yt<= 195) ) ) // START
+                 if ( ((xt >=START_MAIN_X_MIN) && (xt<=START_MAIN_X_MAX)) && ( (yt>=START_MAIN_Y_MIN) && (yt<=START_MAIN_Y_MAX) ) ) // START
                        {
                           
                           state=8;
                         }
     
-                 else if ( ((xt >=70) && (xt<=170)) && ( (yt>=70) && (yt<=140) ) ) // RETURN
+                 else if ( ((xt >=RET_MAIN_X_MIN) && (xt<=RET_MAIN_X_MAX)) && ( (yt>=RET_MAIN_Y_MIN) && (yt<=RET_MAIN_Y_MAX) ) ) // RETURN
                       {
                           state=3;
                  } 
@@ -169,12 +169,12 @@
       int8_t type=0;
        type=eprom_read_8(30);
                  
-                  if ( ((xt >= 35) && (xt<=100)) && ( (yt>= 65) && (yt<= 118) ) ) // RET   //CHANGED 12/06/17// 
+                  if ( ((xt >=RET_TEST_X_MIN) && (xt<=RET_TEST_X_MAX)) && ( (yt>=RET_TEST_Y_MIN) && (yt<=RET_TEST_Y_MAX) ) ) // RET   //CHANGED 12/06/17// 
                       {
                                 state=3;
                          
                        }
-                 else if ( ((xt >= 130) && (xt<=195)) && ( (yt>= 65) && (yt<= 118) ) ) // RETEST
+                 else if ( ((xt >=RETEST_MAIN_X_MIN) && (xt<=RETEST_MAIN_X_MAX)) && ( (yt>=RETEST_MAIN_Y_MIN) && (yt<=RETEST_MAIN_Y_MAX) ) ) // RETEST
                        {
                                  if (type==0)
                                      state=7;
@@ -195,13 +195,13 @@
 
 {
         unsigned char state;
-                if ( ((xt >=70) && (xt<=170)) && ( (yt>= 140) && (yt<= 195) ) ) // START
+                if ( ((xt >=START_MAIN_X_MIN) && (xt<=START_MAIN_X_MAX)) && ( (yt>=START_MAIN_Y_MIN) && (yt<=START_MAIN_Y_MAX) ) ) // START
                        {
                           
                           state=9;
                         }
     
-                 else if ( ((xt >=70) && (xt<=170)) && ( (yt>=70) && (yt<=140) ) ) // RETURN
+                 else if ( ((xt >=RET_MAIN_X_MIN) && (xt<=RET_MAIN_X_MAX)) && ( (yt>=RET_MAIN_Y_MIN) && (yt<=RET_MAIN_Y_MAX) ) ) // RETURN
                       {
                           state=3;
                  } 
@@ -228,27 +228,27 @@
                            state=3;
                  } */
                  
-                   if ( ((xt >=35) && (xt<=100)) && ( (yt>= 135) && (yt<= 185) ) ) //fasting     // 12/06/17       newly added
+                   if ( ((xt >=FPS_MAIN_X_MIN) && (xt<=FPS_MAIN_X_MAX)) && ( (yt>=FPS_MAIN_Y_MIN) && (yt<=FPS_MAIN_Y_MAX) ) ) //fasting     // 12/06/17       newly added
                        {
                           
                           state=7;
                           eprom_write_16(20,0);  
                         }
     
-                 else if ( ((xt >=130) && (xt<=195)) && ( (yt>= 135) && (yt<= 185) ) ) // pp
+                 else if ( ((xt >=PP_MAIN_X_MIN) && (xt<=PP_MAIN_X_MAX)) && ( (yt>=PP_MAIN_Y_MIN) && (yt<=PP_MAIN_Y_MAX) ) ) // pp
                       {
                            state=7;
                            eprom_write_16(20,1);    
                         
                           
                        }
-                 else if ( ((xt >= 35) && (xt<=100)) && ( (yt>= 65) && (yt<= 118) ) ) // random
+                 else if ( ((xt >= RANDOM_MAIN_X_MIN) && (xt<=RANDOM_MAIN_X_MAX)) && ( (yt>=RANDOM_MAIN_Y_MIN) && (yt<=RANDOM_MAIN_Y_MAX) ) ) // random
                       {
                            state=7;
                            eprom_write_16(20,2); 
                          
                        }
-                 else if ( ((xt >= 130) && (xt<=195)) && ( (yt>= 65) && (yt<= 118) ) ) // return
+                 else if ( ((xt >=HOME_MAIN_X_MIN) && (xt<=HOME_MAIN_X_MAX)) && ( (yt>=HOME_MAIN_Y_MIN) && (yt<=HOME_MAIN_Y_MAX) ) ) // return
                        {
                            state=3;         //////////
                  
@@ -268,12 +268,12 @@
     
     unsigned char state;
         
-                    if ( ((xt >= 35) && (xt<=100)) && ( (yt>= 65) && (yt<= 118) ) ) // YES
+                    if ( ((xt >=YES_MAIN_X_MIN) && (xt<=YES_MAIN_X_MAX)) && ( (yt>=YES_MAIN_Y_MIN) && (yt<=YES_MAIN_Y_MAX) ) ) // YES
                       {
                                 state=8;
                          
                        }
-                 else if ( ((xt >= 130) && (xt<=195)) && ( (yt>= 65) && (yt<= 118) ) ) // NO
+                 else if ( ((xt >=NO_MAIN_X_MIN) && (xt<=NO_MAIN_X_MAX)) && ( (yt>=NO_MAIN_Y_MIN) && (yt<=NO_MAIN_Y_MAX) ) ) // NO
                        {
                                  state=3;
                         
@@ -289,12 +289,12 @@
     
     unsigned char state;
         
-                    if ( ((xt >= 35) && (xt<=100)) && ( (yt>= 65) && (yt<= 118) ) ) // YES
+                    if ( ((xt >=YES_MAIN_X_MIN) && (xt<=YES_MAIN_X_MAX)) && ( (yt>=YES_MAIN_Y_MIN) && (yt<=YES_MAIN_Y_MAX) ) ) // YES
                       {
                                 state=7;
                          
                        }
-                 else if ( ((xt >= 130) && (xt<=195)) && ( (yt>= 65) && (yt<= 118) ) ) // NO
+                 else if ( ((xt >=YES_MAIN_Y_MAX) && (xt<=NO_MAIN_Y_MIN)) && ( (yt>=NO_MAIN_Y_MIN) && (yt<=NO_MAIN_Y_MAX) ) ) // NO
                        {
                                  state=3;
                         
@@ -309,12 +309,12 @@
     
     unsigned char state;
         
-                    if ( ((xt >= 35) && (xt<=100)) && ( (yt>= 65) && (yt<= 118) ) ) // YES
+                    if ( ((xt >=YES_MAIN_X_MIN) && (xt<=YES_MAIN_X_MAX)) && ( (yt>=YES_MAIN_Y_MIN) && (yt<=YES_MAIN_Y_MAX) ) ) // YES
                       {
                                 state=9;
                          
                        }
-                 else if ( ((xt >= 130) && (xt<=195)) && ( (yt>= 65) && (yt<= 118) ) ) // NO
+                 else if ( ((xt >=NO_MAIN_X_MIN) && (xt<=NO_MAIN_X_MAX)) && ( (yt>=NO_MAIN_Y_MIN) && (yt<=NO_MAIN_Y_MAX) ) ) // NO
                        {
                                  state=3;
                         
@@ -326,9 +326,9 @@
  
  
  
- //TOUCH Functionalities//    
+ //TOUCH Functionalities for old display//    
 
-int readTouchY(void)      // read the Y co-ordinate
+/*int readTouchY(void)      // read the Y co-ordinate
 {      
     DigitalOut YD(PTD6);
      DigitalIn XL(PTD7);
@@ -380,7 +380,63 @@
     DigitalOut YU(PTC0);
     DigitalOut XR(PTB0);
     }
+ */
+ 
+ 
+ //TOUCH Functionalities for new display// 
+ 
+ int readTouchY(void)      // read the Y co-ordinate
+{      
+    DigitalOut YD(PTD2);
+     DigitalIn XL(PTC13);
+     DigitalOut YU(PTC0);
+     YU = 1;
+     YD = 0;
+     AnalogIn XR(PTB0);
+     XL.mode(PullNone);
+     return XR.read_u16();
+}
     
     
+int readTouchX(void)    // // read the X co-ordinate
+{
+    DigitalOut XR(PTB0);
+    DigitalIn YD(PTD2);
+     DigitalOut XL(PTC13);
+     
+     XR = 1;
+     XL = 0;
+     AnalogIn YU(PTC0);
+     YD.mode(PullNone);
+     return YU.read_u16();
+}
+
+void EnableTouch(void)       // Enable touch 
+{
+    
+    DigitalIn YD(PTD2);
+    DigitalOut XL(PTC13);
+    DigitalIn YU(PTC0);
+    DigitalIn XR(PTB0);
+     XL=0;
+      YD.mode(PullUp);
+     YU.mode(PullNone);
+     XR.mode(PullNone);
+    i=1;
+    Touch_D.fall(&touch1);
+    Touch_D.enable_irq();
+   
+ }
+
+void DisableTouch (void)    // Disable touch 
+{
+    Touch_D.disable_irq();
+    i=0;
+    DigitalOut YD(PTD2);
+    DigitalOut XL(PTC13);
+    DigitalOut YU(PTC0);
+    DigitalOut XR(PTB0);
+    }   
+    
    
  
\ No newline at end of file