Changes done in ECG and BT
Dependencies: SDFileSystem ds3231 eeprom_Nikita mbed testUniGraphic_150217
Fork of merged_code2_20sept_2017_4th_oct_2017 by
Diff: main.cpp
- Revision:
- 13:5d3b478ea9c7
- Parent:
- 8:adf2ba7e6412
- Child:
- 14:f5c62d30c6fc
--- a/main.cpp Mon May 08 05:19:22 2017 +0000 +++ b/main.cpp Sat May 27 05:47:55 2017 +0000 @@ -29,7 +29,7 @@ unsigned char flag=0; unsigned char ecg_flag=0; unsigned char glc_flag=0; - +float heart_rate=0; DisableTouch(); gc.baud(115200); @@ -240,9 +240,9 @@ case 8: DisableTouch(); ecg_countdown(); // countdown before ecg capture - ecg(pid); // capturing ecg + heart_rate=ecg(pid); // capturing ecg state1=0; - screen_ecg_2(); + screen_ecg_2(heart_rate); state=6; nstate=state; ecg_flag=1;