Diff: glc.cpp

Revision:

16:8fa1d7fd7953

Parent:

15:208b146151ba

Child:

17:22a87e12fb3a

--- a/glc.cpp	Mon Jun 05 09:14:44 2017 +0000
+++ b/glc.cpp	Tue Jun 06 11:14:03 2017 +0000
@@ -190,7 +190,7 @@
 void i2c_spec();
 Ticker flipper;
 Ticker flipper1;
-
+ unsigned char GLC_START = 0;
 //osTimerDef (sample_data, sample);                      // define timers
 //osTimerDef (Compute_GLC, Compute);  
 DigitalIn test_strip(PTA12);
@@ -204,18 +204,18 @@
 
 //signed char test_strip = 0;
 static uint16_t mgdl = 0;
-uint16_t mgdll = 0;
-uint32_t  daata1= 0;
-uint32_t  data2 = 0;
+static uint16_t mgdll = 0;
+uint16_t  daata1= 0;
+uint16_t  data2 = 0;
 
-static uint32_t  data1n= 0;
-static uint32_t  data2n = 0;
-uint32_t  datafinal1 = 0;
-uint32_t  datafinal2 = 0;
+static uint16_t  data1n= 0;
+static uint16_t  data2n = 0;
+uint16_t  datafinal1 = 0;
+uint16_t  datafinal2 = 0;
 //unsigned int data_diff = 0;
 unsigned char err = 0;
 
-uint32_t glcraw[2]; // Nidhin 31/5/2017
+uint16_t glcraw[2]; // Nidhin 31/5/2017
 uint8_t chk_glc_data = 0;
 
 Serial ble(PTC4,PTC3);
@@ -250,9 +250,9 @@
 {
    
    
-   datafinal1 = (uint32_t ) NUMB1*(data2*VREF/(TOTAL))-NUMB2;
-   datafinal2 = (uint32_t ) NUMB1*(daata1*VREF/(TOTAL))-NUMB2;
-   mgdl = (uint16_t) NUMB1*(((daata1+data2)/2)*VREF/(TOTAL))-NUMB2;  // Nidhin 5/6/17 mgdl = (uint32_t) NUMB1*(((daata1+data2)/2)*VREF/(TOTAL))-NUMB2;
+   datafinal1 = (uint16_t ) NUMB1*(data2*VREF/(TOTAL))-NUMB2;
+   datafinal2 = (uint16_t ) NUMB1*(daata1*VREF/(TOTAL))-NUMB2;
+   mgdl = (uint16_t) NUMB1*(((daata1+data2)/2)*VREF/(TOTAL))-NUMB2;  // Nidhin 5/6/17 mgdl = (uint16_t) NUMB1*(((daata1+data2)/2)*VREF/(TOTAL))-NUMB2;
    
    
 
@@ -279,13 +279,12 @@
         // lcd1.Print( " ERROR RESULT", 5,220,COLOR_RED,COLOR_BLACK, 0);    
          //  ble.printf("E:");
     }
-  
- 
+   GLC_START = 0;
 }
 
 
 void  glc(int pid){
-    unsigned char GLC_START = 0;
+   
     char t_s_d = 0;
      i2c_spec();        
      
@@ -348,7 +347,7 @@
     
     // Loading values of Length ,  PID, DID, sampling frequency, number of samples, calculated data.
     BLEMsg_info_glc.device_id = 01;                   // Device ID fixed
-    BLEMsg_info_glc.patient_id = (uint32_t)pid;      // Patient ID
+    BLEMsg_info_glc.patient_id = (uint16_t)pid;      // Patient ID
     BLEMsg_info_glc.sampling_freq = 0;              // sampling frrquency
     BLEMsg_info_glc.length = 30;                   //Total length of data in bytes  22 B+10752 B
     
@@ -382,8 +381,8 @@
                                 //if(chk_glc_data == 0)       //Nidhin 31/5/2017
                                 //{
                                 /*    
-                                glcraw[0] = (uint32_t) data1n; //Nidhin 31/5/2017
-                                glcraw[1] = (uint32_t) data2n; // Nidhin 31/5/2017
+                                glcraw[0] = (uint16_t) data1n; //Nidhin 31/5/2017
+                                glcraw[1] = (uint16_t) data2n; // Nidhin 31/5/2017
                                 
                                 gtc.printf("datain is  =%d\n", data1n);
                                 gtc.printf("data2n is = %d\n", data2n);
@@ -397,8 +396,8 @@
                                 
                                 if ((daata1 >= THRESHOLD) || (data2 >= THRESHOLD)) 
                                     { 
-                                //glcraw[0] = (uint32_t) data1n; //Nidhin 5/6/2017
-                                //glcraw[1] = (uint32_t) data2n; // Nidhin 5/6/2017
+                                //glcraw[0] = (uint16_t) data1n; //Nidhin 5/6/2017
+                                //glcraw[1] = (uint16_t) data2n; // Nidhin 5/6/2017
                                 
                                 //gtc.printf("data1n is  =%d\n", data1n);
                                 //gtc.printf("data2n is = %d\n", data2n);
@@ -417,13 +416,15 @@
                             }
                         wait_ms(800);          
                     }
+                    
+                      gtc.printf("mgdl is - %d\n", mgdll);
             } 
-        
+        wait(2.25);
         gtc.printf("DATA1 is - %d\n", data1n); 
         gtc.printf("DATA2 is - %d\n", data2n);  
-        gtc.printf("mgdl is - %d\n", mgdl);   
+        gtc.printf("mgdl is - %d\n", mgdll);   
         
-        sd_glcwrite(glcraw, pid);  //Writes the raw data into GLC file 
+       // sd_glcwrite(glcraw, pid);  //Writes the raw data into GLC file 
  
         //Results Stored to Bluetooth structure 
         BLEMsg_info_glc.cal_data.cal_sbp_dummy = 0;