Diff: main.cpp

Revision:

64:5a76653792e8

Parent:

63:76be11c4a208

Child:

65:8acfba0ce49a

--- a/main.cpp	Thu Nov 16 09:51:07 2017 +0000
+++ b/main.cpp	Thu Nov 16 11:36:45 2017 +0000
@@ -90,12 +90,13 @@
 char debug_message[6]={"debug"};                                        //debug message to be received
 void debug_status_monitoring();                                         // debug status monitoring
 static uint32_t pid = 0;                                                    // patient ID    
+static uint8_t state_touch = 1;                                                 //added on 16-NOV rashmi                                     
 
 int main()
 {
     static DEVICE_MAIN_STATE main_state = GET_TOUCH_DISP_STATE;
     static uint8_t state_display = 0;
-    static uint8_t state_touch = 1;
+    //static uint8_t state_touch = 1;                                           //commented on 16-NOV rashmi 
     uint8_t state_t = 1;                                     // state to transmit to bluetooth
     uint8_t state_r = 0;                                     // state to receive from bluetooth
   
@@ -362,21 +363,22 @@
     //uint16_t heart_rate=0; 
 
     
-    switch(state1)                                              // state for display screens
+    switch(state1)                                                              // state for display screens
     {
 
       
       case 1: 
                 DisableTouch();
-                screen_main();                                  //  main screen 
+                screen_main();                                                  //  main screen 
                 state1=0;
                 state=1;
                 nstate=state;
-                ecg_flag=0;                                     // ecg, glc flag to determine whether the readings are taken more than once
+                ecg_flag=0;                                                     // ecg, glc flag to determine whether the readings are taken more than once
                 glc_flag=0;
                 clear_filecreated_status();
-                battery_status_display();                          //Display battery status on LCD
+                battery_status_display();                                       //Display battery status on LCD
                 pid = get_filepid() + 1;
+                state_touch = TOUCH_STATE_HOME_SCREEN;                          //added on 16-Nov rashmi
                 EnableTouch();
                 break;
       
@@ -401,6 +403,7 @@
                 state=3;
                 nstate=state;
                 battery_status_display(); 
+                state_touch = TOUCH_STATE_TEST_SCREEN;                          //added on 16-Nov rashmi
                 EnableTouch();
                 break;
                 
@@ -464,7 +467,8 @@
                 eprom_write_8(30,0);
                 nstate=state;  
                 wait(2);                                                        //added on 16-NOV rashmi
-                screen_main_2(pid);                                             //added on 16-NOV rashmi       
+                screen_main_2(pid);                                             //added on 16-NOV rashmi   
+                state_touch = TOUCH_STATE_TEST_SCREEN;                          //added on 16-Nov rashmi    
                 EnableTouch();
                 break;
     
@@ -483,6 +487,7 @@
                 screen_ecg_bp();
                 wait(2);                                                        //added on 16-NOV rashmi
                 screen_main_2(pid);                                             //added on 16-NOV rashmi
+                state_touch = TOUCH_STATE_TEST_SCREEN;                          //added on 16-Nov rashmi
                 EnableTouch();
                 break;
              
@@ -501,6 +506,7 @@
                 nstate=state;
                 wait(2);                                                        //added on 16-NOV rashmi
                 screen_main_2(pid);                                             //added on 16-NOV rashmi 
+                state_touch = TOUCH_STATE_TEST_SCREEN;                          //added on 16-Nov rashmi
                 EnableTouch();
                  break;