Diff: main.cpp

Revision:

20:7c64e6ecad76

Parent:

19:1650bbc923cc

Child:

22:ffa88619551d

--- a/main.cpp	Fri Jun 09 17:12:21 2017 +0000
+++ b/main.cpp	Sat Jun 17 09:36:18 2017 +0000
@@ -57,7 +57,7 @@
          case 1:  state_display=touch(state_touch);           // touch state
                 
                   
-                if(state_display==10)
+                if(state_display==12)
                     main_state=3;
                     
                 else 
@@ -119,7 +119,7 @@
                 
       case 3:  
                state1=touch_main_2();     //// determining the touch for TEST screen 
-                                    
+                                 
                 state=0;
                 nstate1=state1;
                 break;
@@ -137,6 +137,10 @@
                  break;   
      case 6: 
                 state1=touch_ret();     // determining the touch for returning back to the main screen 
+               /* if (ecg_flag==1)
+                     state1=8;
+                else if (glc_flag==1)
+                    state1=7; */     
                 state=0;
                 nstate1=state1;
                 break;
@@ -299,7 +303,8 @@
                 wait(5); 
                 state1=0;
                 screen_glc_2();
-                 state=6;;
+                 state=6;
+                 eprom_write(3,0);
               //  gc.printf("%d", state);
               nstate=state;         //////////////
                EnableTouch();
@@ -309,11 +314,22 @@
                 ecg_countdown();    // countdown before ecg capture
                 heart_rate=ecg(pid);           // capturing ecg
                 state1=0;
-                screen_ecg_2(heart_rate);
+                if (heart_rate==0)
+                    {
+                       gc.printf("hi");
+                       screen_ecg_lead();  
+                     }
+                     
+                     else 
+                     {
+                        gc.printf("hif");
+                         screen_ecg_2(heart_rate);
+                         ecg_flag=1;
+                         }   
                 state=6;
-                 nstate=state;
-                 ecg_flag=1;
-        //    ble.printf("ecg");
+                eprom_write(3,1);
+                nstate=state;
+                screen_ecg_bp();
                 EnableTouch();
                 break;
      
@@ -335,6 +351,7 @@
                 state1=0;
                // wait(1);
                 state=6;
+                eprom_write(3,2);
                 nstate=state;
                 EnableTouch();
                  break;