Revision 34:8f6b0dc124e8, committed 2017-07-23

Comitter:

avp2417

Date:

Sun Jul 23 16:50:59 2017 +0000

Parent:

33:a80eed071fdc

Commit message:

Modification after review in 17th July New Display demo code

Changed in this revision

diff -r a80eed071fdc -r 8f6b0dc124e8 ecgg.cpp
--- a/ecgg.cpp	Tue Jul 18 04:15:30 2017 +0000
+++ b/ecgg.cpp	Sun Jul 23 16:50:59 2017 +0000
@@ -269,7 +269,7 @@
      {
  
         BLEMsg_info_ecg.cal_data.cal_sbp_dummy = 0;
-        BLEMsg_info_ecg.cal_data.cal_dbp_OTtyp = HR1;  //To be modified after HR code is added. 
+      BLEMsg_info_ecg.cal_data.cal_dbp_OTtyp = HR_avg;  //To be modified after HR code is added. // changed nikita
 
         structure_file(ptr_BLEMsg_info_ecg, pid); //copy the ECG structure to Main file  //COMMENTED Nidhin 10/6/2017 
         ecgfile_mainfile(pid);                        // copy raw data to the main file and ECG file is cleared. //COMMENTED Nidhin 10/6/2017
@@ -285,9 +285,9 @@
  else 
      {
         pc.printf("improper lead connection");
-        return 0;
+        return 0;                        // returning 0 for improper lead connection
     } 
 pc.printf("closing temporary file\n");
  // fclose(fpeecg1);
 //  pc.printf("temporary file closed\n");
-}   // End of main function
+}   // End of main function
\ No newline at end of file

diff -r a80eed071fdc -r 8f6b0dc124e8 glc.cpp
--- a/glc.cpp	Tue Jul 18 04:15:30 2017 +0000
+++ b/glc.cpp	Sun Jul 23 16:50:59 2017 +0000
@@ -435,13 +435,8 @@
   else if(err==1 || mgdl>200 || mgdl<40)      // added threshold to check value out of range   
     {  
          gtc.printf("replace teststip"); 
+         glc_error(); //disaply for showing error//10/7/17//nikita
     }  
 
 
- }   
-
-
-
-    
-
-
+ }
\ No newline at end of file

diff -r a80eed071fdc -r 8f6b0dc124e8 main.cpp
--- a/main.cpp	Tue Jul 18 04:15:30 2017 +0000
+++ b/main.cpp	Sun Jul 23 16:50:59 2017 +0000
@@ -114,7 +114,6 @@
                  if(state_t ==0)
                  {
                     BT_finished();
-                    wait(1);
                     screen_BT_return();  
                     EnableTouch();
                     main_state=1;
@@ -352,7 +351,7 @@
                 state1=0;
                 if (heart_rate==0)
                     {
-                       gc.printf("hi");
+                       
                        screen_ecg_lead();  
                      }
                 else if(heart_rate==1)   // if heart rate goes above or below range display error // 10/7/17 nikita
@@ -360,9 +359,9 @@
                           screen_ecg_error();
                          
                          }      
-                     else 
-                     {
-                        gc.printf("hif");
+                  else 
+                       {
+                       
                          screen_ecg_2(heart_rate);
                          ecg_flag=1;
                          }   
@@ -425,7 +424,4 @@
                 
          return state;       
                 
-}
-
-
-
+}
\ No newline at end of file