Diff: main.cpp

Revision:

66:d7fc45e328d0

Parent:

65:8acfba0ce49a

Child:

67:7e07cdb1b150

--- a/main.cpp	Fri Nov 17 12:08:45 2017 +0000
+++ b/main.cpp	Mon Nov 20 09:52:59 2017 +0000
@@ -26,6 +26,11 @@
 
 typedef enum
 {
+    HOME_SCREEN = 0x01U,
+    TEST_SCREEN
+}DEVICE_STATE;
+typedef enum
+{
     GET_TOUCH_DISP_STATE = 0x00U,
     BT_TX_STATE,
     BT_RX_STATE
@@ -474,17 +479,16 @@
                 state=6;
                 eprom_write_8(30,0);
                 nstate=state;  
-                wait(2);                                                        //added on 16-NOV rashmi
+                //wait(2);                                                        //added on 16-NOV rashmi
                 screen_main_2(pid);                                             //added on 16-NOV rashmi   
                 state_touch = TOUCH_STATE_TEST_SCREEN;                          //added on 16-Nov rashmi    
                 EnableTouch();
                 break;
     
     case 8:     DisableTouch();
-                ecg_countdown();                                                // countdown before ecg capture
-
                 // send ECG test in progress messages to mobile application
                 poc2p0_send_device_msg_res(ECG_TEST_IN_PROGRESS_RES);
+                ecg_countdown();                                                // countdown before ecg capture
 
                 ecg(pid);                                            // capturing ecg
                 state1=0;
@@ -493,7 +497,7 @@
                 eprom_write_8(30,1);
                 nstate=state;
                 screen_ecg_bp();
-                wait(2);                                                        //added on 16-NOV rashmi
+                //wait(2);                                                        //added on 16-NOV rashmi
                 screen_main_2(pid);                                             //added on 16-NOV rashmi
                 state_touch = TOUCH_STATE_TEST_SCREEN;                          //added on 16-Nov rashmi
                 EnableTouch();
@@ -502,17 +506,18 @@
       case 9:
                 DisableTouch();
                 screen_bp2();                                                   // bp main screen
-                bp_countdown();                                                 // countdown for bp 
-
+                
                 // send BP test in progress response to mobile application
                 poc2p0_send_device_msg_res(BP_TEST_IN_PROGRESS_RES);
 
+                bp_countdown();                                                 // countdown for bp 
+
                 bp(pid);                                                        // measuring bp   earlier bp() changed to bp(pid) 28/4/2017
                 state1=0;
                 state=6;
                 eprom_write_8(30,2);
                 nstate=state;
-                wait(2);                                                        //added on 16-NOV rashmi
+                //wait(2);                                                        //added on 16-NOV rashmi
                 screen_main_2(pid);                                             //added on 16-NOV rashmi 
                 state_touch = TOUCH_STATE_TEST_SCREEN;                          //added on 16-Nov rashmi
                 EnableTouch();
@@ -681,10 +686,6 @@
 
 void debug_status_monitoring()
 {
-
-
-//if(get_timer_debug()<TIMER_ENTER_DEBUG_MODE)
-//{
  if (gc.readable())                                                             // check for the user input
         {
             
@@ -705,7 +706,6 @@
                  timer_debug.start();                                           // timer is started in orede
             } 
         }        
-//}
     
 }  
     
@@ -735,23 +735,6 @@
     
     send_thru_terminal(device_res_buffer,DEVICE_RES_LEN,(uint8_t *)&poc2p0_device_msg_res,sizeof(poc2p0_device_msg_res));
     
-    /*memcpy(device_res_buffer,&poc2p0_device_msg_res,sizeof(device_res_buffer));
-   
-    for (buffer_pointer = 0; buffer_pointer < sizeof(poc2p0_device_msg_res); buffer_pointer++)
-    {
-        blue1.printf("%2x",device_res_buffer[buffer_pointer]);
-    }
-    blue1.printf("\n");
-    
-    gc.printf("DEVICE RES: \n");
-    for (uint8_t buffer_pointer=0; buffer_pointer < sizeof(poc2p0_device_msg_res); buffer_pointer++)
-    {
-        gc.printf("%2x",device_res_buffer[buffer_pointer]);
-    }
-    gc.printf("\n");*/
-       
- 
-    
 }
 
 // this command response to heartbeat message request send by bluetooth device
@@ -794,13 +777,13 @@
     poc2p0_device_heartbeat_res.date_time.sec = (uint8_t)(*ptr_time_info_glc).tm_sec;
 
     // device state
-    if (curr_touch_state == TOUCH_STATE_TEST_SCREEN)
+    if (curr_touch_state == TOUCH_STATE_HOME_SCREEN)
     {
-        poc2p0_device_heartbeat_res.device_state = TOUCH_STATE_TEST_SCREEN;
+        poc2p0_device_heartbeat_res.device_state = HOME_SCREEN;
     }
     else
     {
-        poc2p0_device_heartbeat_res.device_state = 0x00u;
+        poc2p0_device_heartbeat_res.device_state = TEST_SCREEN;
     }
     
     //poc2p0_device_heartbeat_res.device_state = device_state;
@@ -815,21 +798,6 @@
    
     send_thru_terminal(heartbeat_res_buffer,HEARTBEAT_RES_LEN,(uint8_t *)&poc2p0_device_heartbeat_res,sizeof(poc2p0_device_heartbeat_res));
     
-    /*memcpy(heartbeat_res_buffer,&poc2p0_device_heartbeat_res,sizeof(heartbeat_res_buffer));
-    
-    for (buffer_pointer = 0; buffer_pointer < sizeof(poc2p0_device_heartbeat_res); buffer_pointer++)
-    {
-        blue1.printf("%2x",heartbeat_res_buffer[buffer_pointer]);
-    }
-    blue1.printf("\n");
-    
-    gc.printf("Hearbeat RES: \n");
-    for (buffer_pointer = 0; buffer_pointer < sizeof(poc2p0_device_heartbeat_res); buffer_pointer++)
-    {
-            gc.printf("%2x",heartbeat_res_buffer[buffer_pointer]);
-    }
-    gc.printf("\n");*/
-
 }
 
 // this command send final test result response to bluetooth device
@@ -851,21 +819,6 @@
     poc2p0_device_tst_result_res.chksum = checksum_struct((uint8_t *)&poc2p0_device_tst_result_res.cmd, (sizeof(poc2p0_device_tst_result_res)-1));
    
     send_thru_terminal(test_res_buffer,TEST_RES_LEN,(uint8_t *)&poc2p0_device_tst_result_res,sizeof(poc2p0_device_tst_result_res));
-    
-    /*memcpy(test_res_buffer,&poc2p0_device_tst_result_res,sizeof(test_res_buffer));
-    
-    for (buffer_pointer = 0; buffer_pointer < sizeof(poc2p0_device_tst_result_res); buffer_pointer++)
-    {
-        blue1.printf("%2x",test_res_buffer[buffer_pointer]);
-    }
-    blue1.printf("\n");
-    
-    gc.printf("TEST RES: \n");
-    for (buffer_pointer = 0; buffer_pointer < sizeof(poc2p0_device_tst_result_res); buffer_pointer++)
-    {
-            gc.printf("%2x",test_res_buffer[buffer_pointer]);
-    }
-    gc.printf("\n");*/
      
 }
 
@@ -873,18 +826,20 @@
 {
     memcpy(input_buf,struct_data, len_buff);
     
-    for (buffer_pointer = 0; buffer_pointer < len_struct; buffer_pointer++)
-    {
-        blue1.printf("%2x",input_buf[buffer_pointer]);
-    }
-    blue1.printf("\n");
-    
     gc.printf("RESPONSE: \n");
     for (buffer_pointer = 0; buffer_pointer < len_struct; buffer_pointer++)
     {
+        blue1.printf("%02x",input_buf[buffer_pointer]);
+        gc.printf("%02x",input_buf[buffer_pointer]);
+    }
+    blue1.printf("\n");
+    gc.printf("\n"); 
+    
+    /*for (buffer_pointer = 0; buffer_pointer < len_struct; buffer_pointer++)
+    {
         gc.printf("%2x",input_buf[buffer_pointer]);
     }
-    gc.printf("\n"); 
+    gc.printf("\n"); */
     
     
 }