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

Diff: main.cpp

Revision:
39:69b09bd87502
Parent:
37:92fcbf22bf91
Child:
41:1141a75eacc4
diff -r 7238f3531ce9 -r 69b09bd87502 main.cpp
--- a/main.cpp	Wed Aug 02 06:58:57 2017 +0000
+++ b/main.cpp	Fri Aug 11 12:19:25 2017 +0000
@@ -50,7 +50,7 @@
 
    while(1)
    {
-           DisableTouch();
+           /*DisableTouch();
            battery_voltage_condition=battery_voltage();
     
    if (battery_voltage_condition==3)
@@ -60,7 +60,7 @@
               
                          
   else
-       {             
+       {       */      
     
      EnableTouch();
      switch(main_state)                          // main state machine
@@ -101,7 +101,7 @@
                  }
                  break;
                  
-         case 4:  
+         case 4:  DisableTouch();  
                  state_t=bt_receive(state_r);               // bluetooth receive
                  main_state=3;
                 // gc.printf("statet=%d",state_t);
@@ -119,7 +119,7 @@
     }
 }
 
-}
+//}
 
 //}