Diff: sdcard.cpp

Revision:

50:b42238e7f46d

Parent:

49:3ff80c4bc1be

Child:

53:cc6e65480a67

--- a/sdcard.cpp	Fri Sep 15 19:44:48 2017 +0000
+++ b/sdcard.cpp	Sat Sep 16 06:54:42 2017 +0000
@@ -130,7 +130,7 @@
 
 uint32_t file_size()    
    {
-     int file_length;
+     uint32_t file_length;
      fseek (fp, 0, SEEK_END);
      file_length=ftell(fp);
      file_length=sizeof(char)*file_length;
@@ -141,7 +141,7 @@
      
 uint32_t file_size1()    
    {
-     int file_length;
+     uint32_t file_length;
     // fseek (fp, 0, SEEK_END);
 
      file_length=ftell(fp);
@@ -590,10 +590,19 @@
 
 
 
-void read_sdcard_file(uint32_t pid)
+void read_sdcard_file()
 {      
+     
+      
+      
       FILE *fp_read_sdcard_file ; // PPG and ECG File pointers for BP
       char buffer[32];
+      uint32_t pid = 0;
+      snd.scanf("%d", &pid);
+      snd.printf("%d\n",pid);
+      
+      
+      
       sprintf(buffer,"/sd/%d.csv",pid);
       fp_read_sdcard_file = fopen(buffer, "rb");
       
@@ -614,38 +623,43 @@
 void read_structure(FILE * fp_read_sdcard_file)
  
  {
-   BLEMsg_info bt_file2;     
-   uint32_t buf[1000];   
-   uint16_t sample = 0;
+   BLEMsg_info pid_file;     
+   uint32_t buf[1];                                                             // buffer to read the raw data
+   uint16_t sample = 0;                                                         // variable to hold the no of samples
+
+    fread(&pid_file,sizeof(BLEMsg_info),1,fp_read_sdcard_file);                 // reading the structure data
     while (!feof(fp_read_sdcard_file))
-    { 
-        fread(&bt_file2,sizeof(BLEMsg_info),1,fp_read_sdcard_file);
-        snd.printf("%d\n",bt_file2.length); 
-        snd.printf("%d\n",bt_file2.device_id); 
-        snd.printf("%d\n",bt_file2.patient_id);    
-        snd.printf("%d\n",bt_file2.date_time.date);     
-        snd.printf("%d\n",bt_file2.date_time.month);  
-        snd.printf("%d\n",bt_file2.date_time.year);  
-        snd.printf("%d\n",bt_file2.date_time.hour);      
-        snd.printf("%d\n",bt_file2.date_time.mins);  
-        snd.printf("%d\n",bt_file2.date_time.sec);  
-        snd.printf("%d\n",bt_file2.test_type);   
-        snd.printf("%d\n",bt_file2.sampling_freq); 
-        snd.printf("%d\n",bt_file2.num_samples.num_sample_ppg_dummy); 
-        snd.printf("%d\n",bt_file2.num_samples.num_sample_ecg_OTtyp); 
-        sample=(bt_file2.num_samples.num_sample_ppg_dummy + bt_file2.num_samples.num_sample_ecg_OTtyp);
-        snd.printf("%d\n",bt_file2.cal_data.cal_sbp_dummy);   
-        snd.printf("%d\n",bt_file2.cal_data.cal_dbp_OTtyp); 
-       
-    
-        switch(sample)
+    {       
+        snd.printf("length = %d\n",pid_file.length); 
+        snd.printf("device_id = %d\n",pid_file.device_id); 
+        snd.printf("patient_id = %d\n",pid_file.patient_id);    
+        snd.printf("date = %d\n",pid_file.date_time.date);     
+        snd.printf("month = %d\n",pid_file.date_time.month);  
+        snd.printf("year = %d\n",pid_file.date_time.year);  
+        snd.printf("hour = %d\n",pid_file.date_time.hour);      
+        snd.printf("mins = %d\n",pid_file.date_time.mins);  
+        snd.printf("sec = %d\n",pid_file.date_time.sec);  
+        snd.printf("test_type = %d\n",pid_file.test_type);   
+        snd.printf("sampling_freq = %d\n",pid_file.sampling_freq); 
+        snd.printf("sample1 = %d\n",pid_file.num_samples.num_sample_ppg_dummy); 
+        snd.printf("samples2 = %d\n",pid_file.num_samples.num_sample_ecg_OTtyp); 
+        sample=(pid_file.num_samples.num_sample_ppg_dummy + pid_file.num_samples.num_sample_ecg_OTtyp);
+        snd.printf("caldata1 = %d\n",pid_file.cal_data.cal_sbp_dummy);   
+        snd.printf("caldata2  = %d\n",pid_file.cal_data.cal_dbp_OTtyp); 
+        snd.printf("sample=%d\n", sample);
+        for(uint16_t file_start=0;file_start<sample;file_start++)                                       //reading the raw data
+                        {     
+                            fread(buf,sizeof(uint32_t),1,fp_read_sdcard_file);
+                            snd.printf("%08x\n", buf[0]);
+                        }
+      /* switch(sample)
             {
        
                 case 2:
                          fread(&buf,sizeof(uint32_t),sample,fp_read_sdcard_file);
                          for(uint16_t file_start1=0;file_start1<sample;file_start1++)
                         {     
-                            snd.printf("%08x", buf[file_start1]);
+                            snd.printf("%08x\n", buf[file_start1]);
                         }
                         break;
                 
@@ -656,20 +670,20 @@
                             fread(&buf,sizeof(uint32_t),1000,fp_read_sdcard_file);
                             for(uint16_t file_start1=0;file_start1<(1000);file_start1++)
                              {     
-                                snd.printf("%08x", buf[file_start1]);
+                                snd.printf("%08x\n", buf[file_start1]);
                              }
                     
                          }
                         break;
                 
-                case 2668:
+                case 2688:
                          for(uint16_t file_start=0;file_start<(sample/1000);file_start++)
                         {     
                             
                             fread(&buf,sizeof(uint32_t),1000,fp_read_sdcard_file);
                             for(uint16_t file_start1=0;file_start1<(1000);file_start1++)
                             {     
-                                snd.printf("%08x", buf[file_start1]);
+                                snd.printf("%08x\n", buf[file_start1]);
                             }
                     
                         }                  
@@ -684,12 +698,18 @@
                     
                         for(uint16_t file_start1=0;file_start1<(sample-(1000*(sample/1000)));file_start1++)
                         {     
-                        snd.printf("%08x", buf[file_start1]);
+                        snd.printf("%08x\n", buf[file_start1]);
                         }
                         break;
+                        
+                        
+                default: snd.printf("End\n");
+                            break;
+                                    
                     }
-                    
-                   
+                  */
+        fread(&pid_file,sizeof(BLEMsg_info),1,fp_read_sdcard_file);
+           
    }    
  
  }