Diff: touch_modules.cpp

Revision:

5:a3ea7c82b7e1

Parent:

4:6bd81bb1790d

diff -r 6bd81bb1790d -r a3ea7c82b7e1 touch_modules.cpp
--- a/touch_modules.cpp	Wed Mar 01 18:49:33 2017 +0000
+++ b/touch_modules.cpp	Thu Mar 30 11:34:04 2017 +0000
@@ -152,7 +152,7 @@
     
                  else if ( ((xt >=70) && (xt<=170)) && ( (yt>=90) && (yt<=140) ) ) // RETURN
                       {
-                         //  state=2;
+                          state=3;
                  } 
                else 
                      state=10;   
@@ -187,12 +187,12 @@
                 if ( ((xt >=70) && (xt<=170)) && ( (yt>= 140) && (yt<= 195) ) ) // START
                        {
                           
-                          state=11;
+                          state=9;
                         }
     
                  else if ( ((xt >=70) && (xt<=170)) && ( (yt>=90) && (yt<=140) ) ) // RETURN
                       {
-                         //  state=2;
+                          state=3;
                  } 
                 else 
                      state=10;
@@ -214,7 +214,7 @@
     
                  else if ( ((xt >=70) && (xt<=170)) && ( (yt>=85) && (yt<=140) ) ) // RETURN
                       {
-                          // state=2;
+                           state=3;
                  }  
             else 
                   state=10;
@@ -224,7 +224,7 @@
       
  
  
- unsigned char touch_again()    //determining the touch for Repeat test 
+ unsigned char touch_again_ecg()    //determining the touch for Repeat test 
 {
     
     unsigned char state;
@@ -245,6 +245,46 @@
     }
  
  
+ unsigned char touch_again_glc()    //determining the touch for Repeat test 
+{
+    
+    unsigned char state;
+        
+                    if ( ((xt >= 35) && (xt<=100)) && ( (yt>= 65) && (yt<= 118) ) ) // YES
+                      {
+                                state=7;
+                         
+                       }
+                 else if ( ((xt >= 130) && (xt<=195)) && ( (yt>= 65) && (yt<= 118) ) ) // NO
+                       {
+                                 state=3;
+                        
+                       }
+                   else 
+                     state=10; 
+         return state;     
+    }
+    
+   unsigned char touch_again_bp()    //determining the touch for Repeat test 
+{
+    
+    unsigned char state;
+        
+                    if ( ((xt >= 35) && (xt<=100)) && ( (yt>= 65) && (yt<= 118) ) ) // YES
+                      {
+                                state=9;
+                         
+                       }
+                 else if ( ((xt >= 130) && (xt<=195)) && ( (yt>= 65) && (yt<= 118) ) ) // NO
+                       {
+                                 state=3;
+                        
+                       }
+                   else 
+                     state=10; 
+         return state;     
+    } 
+ 
  
  
  //TOUCH Functionalities//