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:
- 53:cc6e65480a67
- Parent:
- 52:7d9ff7781bdc
- Child:
- 54:f2a413d5dffd
diff -r 7d9ff7781bdc -r cc6e65480a67 main.cpp --- a/main.cpp Wed Sep 20 10:33:17 2017 +0000 +++ b/main.cpp Wed Sep 20 11:02:08 2017 +0000 @@ -31,8 +31,7 @@ uint8_t display(uint8_t state1); // display state static uint8_t nstate=0; -static uint8_t nstate1=0; -static uint32_t pid = 0; // patient ID +static uint8_t nstate1=0; static bool file_created_status = false; //initialise file created to 0 static uint32_t filepid_btpid[2] = {}; Timer timer_bt; // timer for bluetooth @@ -58,7 +57,6 @@ gc.baud(115200); blue1.baud(115200); init_screen(); //initialize lcd - pid = get_filepid(); screen_main(); // display of main screen battery_monitor(); // monitor battery at the start only battery_status_display(); // display of main screen @@ -319,7 +317,7 @@ static uint8_t ecg_flag=0; // ecg_flag to indicate the ecg test is already done for the same pid static uint8_t glc_flag=0; // glc_flag to indicate the glc test is already done for the same pid uint16_t heart_rate=0; - + static uint32_t pid = 0; // patient ID switch(state1) // state for display screens { @@ -334,9 +332,8 @@ ecg_flag=0; // ecg, glc flag to determine whether the readings are taken more than once glc_flag=0; clear_filecreated_status(); - pid = get_filepid(); battery_status_display(); //Display battery status on LCD - // debug_mode = 0; + pid = get_filepid() + 1; EnableTouch(); break;