Diff: display_modules.cpp

Revision:

35:43133f017ed4

Parent:

32:76892fdf5e4c

Child:

37:92fcbf22bf91

diff -r 8f6b0dc124e8 -r 43133f017ed4 display_modules.cpp
--- a/display_modules.cpp	Sun Jul 23 16:50:59 2017 +0000
+++ b/display_modules.cpp	Sat Jul 29 10:38:05 2017 +0000
@@ -60,7 +60,7 @@
     TFT.locate(65,170) ;
     TFT.printf("CONFIG") ;    
     TFT.fillrect( 60,230,180,300,Olive);
-    TFT.locate(90,250) ;        
+    TFT.locate(88,252) ;                //y :changed from 250 to 252 //x: changed from 90 to 88 //rashmi 22/7/17 //rashmi 22/7/17
     TFT.printf("TEST") ;          
     TFT.BusEnable(false) ;
     backlight = 1 ;
@@ -115,14 +115,14 @@
     TFT.set_font((unsigned char*) Arial24x23);
     TFT.foreground(Black);
     TFT.fillrect( 10,130,100,200,GreenYellow);
-    TFT.locate(40,160) ;
-    TFT.printf("BLE") ;   
+    TFT.locate(38,160) ;                                //changed from 30 to 38 //rashmi 24/7/17            //changed from 40 to 30 //rashmi 22/7/17     
+    TFT.printf("BT") ;                                  ////changed from BLE to BT //rashmi 24/7/17
     TFT.fillrect( 130,130,220,200,GreenYellow);
-    TFT.locate(135,160) ;
-    TFT.printf("ERASE") ;    
+    TFT.locate(145,160) ;                               //changed from 135 to 145 //rashmi 22/7/17
+    TFT.printf("DEL") ;                                 //changed from ERASE to DEL //rashmi 22/7/17
     TFT.fillrect( 10,215,100,285,GreenYellow);
-    TFT.locate(30,245) ;        
-    TFT.printf("FILE") ;    
+    TFT.locate(22,245) ;                                //changed from 26 to 22 //rashmi 24/7/17            //changed from 30 to 26 //rashmi 22/7/17
+    TFT.printf("P-Inf") ;    
     TFT.fillrect(130,215,220,285,GreenYellow);
     TFT.locate(130,245) ;        
     TFT.printf("HOME") ;    
@@ -132,7 +132,7 @@
        
                 
   void screen_ecg()    //ECG screen 1
-   {
+{
     backlight = 0 ;
     TFT.BusEnable(true) ;
     TFT.fillrect(10,130,100,200,White);
@@ -148,12 +148,8 @@
     TFT.locate(85,250) ;        
     TFT.printf("MAIN") ;          
     TFT.BusEnable(false) ;
-    backlight = 1 ;  
-              
-              
-              
-     
-     } 
+    backlight = 1 ;       
+} 
       
       
                 
@@ -219,12 +215,12 @@
     TFT.foreground(Black) ;
     // TFT.printf("RET") ; 
     TFT.fillrect( 10,215,100,285,Green);
-    TFT.locate(30,245) ;        
+    TFT.locate(20,245) ;                    //changed from 30 to 20  //rashmi 22/7/17
     TFT.printf("MAIN") ;    
     TFT.fillrect(130,215,220,285,Green);
     TFT.locate(155,235) ;           // changed // points // 13/06
     TFT.printf("RE-") ;  
-    TFT.locate(145,255) ; 
+    TFT.locate(140,255) ;              //chnaged from 145 to 140 //rashmi 22/7/17 
     TFT.printf("TEST") ; 
     TFT.BusEnable(false) ;
     backlight = 1 ;
@@ -247,7 +243,7 @@
     TFT.locate(80,150) ;
     TFT.printf("START") ;    
     TFT.fillrect( 60,230,180,300,Green);
-    TFT.locate(100,250) ;        
+    TFT.locate(90,250) ;        //changed from 100 to 90 //rashmi 22/7/17
     TFT.printf("MAIN") ;          
     TFT.BusEnable(false) ;
     backlight = 1 ;     
@@ -314,10 +310,10 @@
     TFT.locate(155,160) ;
     TFT.printf("PP") ;     
     TFT.fillrect( 10,215,100,285,Green);
-    TFT.locate(20,245) ;        
+    TFT.locate(23,245) ;                      //changed from 20 to 23 //rashmi 22/7/17
     TFT.printf("RAN") ;   
     TFT.fillrect(130,215,220,285,Green); 
-    TFT.locate(155,245);       
+    TFT.locate(145,245);                    //changed from 150 to 145  //rashmi 22/7/17
     TFT.printf("MAIN") ;
   //  TFT.fillrect( 60,230,180,300,Green);
   //  TFT.locate(100,250) ;        
@@ -421,7 +417,7 @@
     TFT.background(Green); 
     //TFT.printf("RET") ;  
     TFT.fillrect( 10,215,100,285,Green);
-    TFT.locate(30,245) ;        
+    TFT.locate(25,245) ;               // changed from 30 to 25 //rashmi 22/7/17
     TFT.printf("MAIN") ;    
     TFT.fillrect(130,215,220,285,Green);
     TFT.locate(155,235) ;           // changed // points // 13/06
@@ -527,16 +523,16 @@
  } 
     
  void bat_screen_charge()
-   {
-        
+{   
        // lcd.FillRect(10,10,20,40,COLOR_GREEN); 
-            backlight = 0 ;
+    backlight = 0 ;
     TFT.BusEnable(true) ;
-     TFT.fillrect(10,10,20,40,Green);
+    TFT.fillrect(10,10,20,40,Green);
     TFT.BusEnable(false) ;
     backlight = 1 ;    
-    }     
-  void screen_ecg_error()
+}
+         
+void screen_ecg_error()
  {  
      backlight = 0 ;
     TFT.BusEnable(true) ;
@@ -571,17 +567,17 @@
   }  
   
   
-    void glc_error()
+void glc_error()                        //glc replace test strip
  {  
      backlight = 0 ;
     TFT.BusEnable(true) ;
     TFT.background(White) ;
     TFT.foreground(Red) ;
     TFT.fillrect(5,90,230,300,White);  
-    TFT.locate(50,100) ;  
-    TFT.printf("ERROR!") ;   
-    TFT.locate(20,130) ;  
-    TFT.printf("Take ReTest") ; 
+    TFT.locate(60,100) ;                //changed from 50 to 60 //rashmi 22/7/17
+    TFT.printf("Replace") ;   
+    TFT.locate(40,130) ;                //changed from 20 to 40 //rashmi 22/7/17
+    TFT.printf("Test Strip") ; 
     //TFT.locate(45,160) ;  
    // TFT.printf("") ; 
    TFT.BusEnable(false) ;
@@ -589,7 +585,7 @@
   }  
   
   
-     void BT_connection()
+void BT_connection()
  {  
      backlight = 0 ;
     TFT.BusEnable(true) ;
@@ -659,17 +655,18 @@
     
 void screen_patient_info(uint32_t current_test_pid,uint32_t  bt_file_sent_pid)
 {
+    
     char buf[10];
-    sprintf (buf, "current pid %d",current_test_pid);
+    sprintf (buf, "Test pid:%d",current_test_pid);      //changed from 'current pid' to 'Test pid' //rashmi 24/7/17
     backlight = 0 ;
     TFT.BusEnable(true) ;
     TFT.background(White);
     TFT.foreground(Blue);   
     TFT.fillrect(5,90,230,300,White);
-    TFT.locate(20,140) ;        
-    TFT.printf(buf) ;  
-    sprintf (buf, "Bt pid %d",bt_file_sent_pid);
-    TFT.locate(20,170) ;  
+    TFT.locate(15,140) ;                               //changed from 20 to 15 //rashmi 24/7/17      
+    TFT.printf(buf) ; 
+    sprintf (buf,"BT pid :%d",bt_file_sent_pid);
+    TFT.locate(15,170) ;                               //changed from 20 to 15 //rashmi 24/7/17  
     TFT.printf(buf) ;     
     TFT.background(Green) ;
     TFT.foreground(Black) ;