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:
- 34:8f6b0dc124e8
- Parent:
- 33:a80eed071fdc
- Child:
- 35:43133f017ed4
--- 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