nikita teggi / Mbed 2 deprecated merged_code2_3rd_nov_2017

Changes done in ECG and BT

Dependencies:   SDFileSystem ds3231 eeprom_Nikita mbed testUniGraphic_150217

Fork of merged_code2_20sept_2017_4th_oct_2017 by nikita teggi

Files at this revision

API Documentation at this revision

Revision 32:76892fdf5e4c, committed 2017-07-15

Comitter:
nikitateggi
Date:
Sat Jul 15 10:30:46 2017 +0000
Parent:
31:0f67acfc6236
Child:
33:a80eed071fdc
Commit message:
latest new display code

Changed in this revision

bt.cpp Show annotated file Show diff for this revision Revisions of this file
display_modules.cpp Show annotated file Show diff for this revision Revisions of this file
ecgg.cpp Show annotated file Show diff for this revision Revisions of this file 
--- a/bt.cpp	Sat Jul 15 05:39:45 2017 +0000
+++ b/bt.cpp	Sat Jul 15 10:30:46 2017 +0000
@@ -33,11 +33,11 @@
 static int32_t current_file=0;            // file of the test done for the current pid 
 static uint32_t counter=0;
 uint8_t file=0;
-
+static  uint32_t v1[no_of_samples];  
 
 uint8_t bt_send(uint8_t state_tx)
 {
-  uint32_t v1[no_of_samples];    
+   
   blue.baud(115200);                  // baud rate of bluetooth
   bt_file=&bt_file1;                      
   myBleMsg=&b; 

--- a/display_modules.cpp	Sat Jul 15 05:39:45 2017 +0000
+++ b/display_modules.cpp	Sat Jul 15 10:30:46 2017 +0000
@@ -415,7 +415,7 @@
     TFT.BusEnable(true) ;
     TFT.background(White) ;
     TFT.foreground(Black) ;
-    TFT.fillrect(5,127,230,320,White);
+   TFT.fillrect(10,215,230,290,White); 
     //TFT.fillrect(60,230,180,300,Green);
     //TFT.locate(85,250) ;  
     TFT.background(Green); 

--- a/ecgg.cpp	Sat Jul 15 05:39:45 2017 +0000
+++ b/ecgg.cpp	Sat Jul 15 10:30:46 2017 +0000
@@ -84,7 +84,7 @@
     BLEMsg_info_ecg.device_id = 01;                   // Device ID fixed
     BLEMsg_info_ecg.patient_id = (uint32_t)pid;       // Patient ID
     BLEMsg_info_ecg.sampling_freq = 500;              // sampling frrquency
-    BLEMsg_info_ecg.length = 4022;                   //Total length of data in bytes  22 B+ 4000 data
+    BLEMsg_info_ecg.length = 8022;                   //Total length of data in bytes  22 B+ 4000 data
     
     /*
     //Loading number of samples
@@ -94,7 +94,7 @@
     */
     
     BLEMsg_info_ecg.num_samples.num_sample_ppg_dummy =  0 ;// PPG  number of samples copied to master struct 
-    BLEMsg_info_ecg.num_samples.num_sample_ecg_OTtyp =  1000 ; // ECG  number of samples copied to master struct
+    BLEMsg_info_ecg.num_samples.num_sample_ecg_OTtyp =  2000 ; // ECG  number of samples copied to master struct
     
     //----------------------------------------END Structure for Bluetooth - Added Nidhin 1/6/2017-------