Diff: display.cpp

Revision:

20:2d6ac4577e68

Parent:

19:9d8032cb0f12

--- a/display.cpp	Thu Aug 28 14:39:32 2014 +0000
+++ b/display.cpp	Wed Oct 08 14:14:52 2014 +0000
@@ -13,6 +13,8 @@
 extern string CDU_MAC();
 extern string CDU_IP();
 
+
+
 DigitalOut VGA_SOURCE( VGA_SOURCE_SELECT ); //control line for video switch between INT and EXT video
 DigitalOut VGA_SELECT( VGA_ON_OFF ); //control line to select/deselect video switch
 /*
@@ -301,10 +303,33 @@
 
 void CDU_InitDisplay()
 {
-    display.baudrate( 9600 );       //init uVGAIII card
-    VGA_SIGNAL( VGA_INT, VGA_ON );  //select INTERNTAL video and set VGA switch ON
+    display.baudrate( BAUD_38400 );       //init uVGAIII card
+    VGA_SIGNAL( VGA_INT, VGA_ON );        //select INTERNTAL video and set VGA switch ON
 }
 
+void CDU_ScreenAlign()
+//Draw a wireframe for aligning the screen on display with keys
+{
+    display.cls();
+   
+    display.pen_size(WIREFRAME);
+    display.rectangle(XMIN,YMIN,XMAX,YMAX, WHITE);
+    display.line(XMIN,LINE2,XMAX,LINE2, WHITE);
+    display.line(XMIN,LINE3,XMAX,LINE3, WHITE);
+    display.line(XMIN,LINE4,XMAX,LINE4, WHITE);
+    display.line(XMIN,LINE5,XMAX,LINE5, WHITE);
+    display.line(XMIN,LINE6,XMAX,LINE6, WHITE);
+    display.line(XMIN,LINE7,XMAX,LINE7, WHITE);
+    display.line(XMIN,LINE8,XMAX,LINE8, WHITE);
+    display.line(XMIN,LINE9,XMAX,LINE9, WHITE);
+    display.line(XMIN,LINE10,XMAX,LINE10, WHITE);
+    display.line(XMIN,LINE11,XMAX,LINE11, WHITE);
+    display.line(XMIN,LINE12,XMAX,LINE12, WHITE);
+    display.line(XMIN,LINE13,XMAX,LINE13, WHITE);
+    display.line(XMIN,LINE14,XMAX,LINE14, WHITE);
+}
+
+
 
 void CDU_StartScreen()
 {
@@ -333,38 +358,24 @@
     wait_ms(5000);    
 }
 
-void CDU_ScreenAlign()
-//Draw a wireframe for aligning the screen on display with keys
+
+void CDU_TestScreen()
 {
     display.cls();
-   
-    display.pen_size(WIREFRAME);
-    display.rectangle(XMIN,YMIN,XMAX,YMAX, WHITE);
-    display.line(XMIN,LINE2,XMAX,LINE2, WHITE);
-    display.line(XMIN,LINE3,XMAX,LINE3, WHITE);
-    display.line(XMIN,LINE4,XMAX,LINE4, WHITE);
-    display.line(XMIN,LINE5,XMAX,LINE5, WHITE);
-    display.line(XMIN,LINE6,XMAX,LINE6, WHITE);
-    display.line(XMIN,LINE7,XMAX,LINE7, WHITE);
-    display.line(XMIN,LINE8,XMAX,LINE8, WHITE);
-    display.line(XMIN,LINE9,XMAX,LINE9, WHITE);
-    display.line(XMIN,LINE10,XMAX,LINE10, WHITE);
-    display.line(XMIN,LINE11,XMAX,LINE11, WHITE);
-    display.line(XMIN,LINE12,XMAX,LINE12, WHITE);
-    display.line(XMIN,LINE13,XMAX,LINE13, WHITE);
-    display.line(XMIN,LINE14,XMAX,LINE14, WHITE);
-}
-void CDU_TestScreen()
-{
-    display.display_control(IMAGE_FORMAT, NEW); //set correct image for reading from SD
-    display.cls();
-    display.showpicture(0x00, 0x00, 0x00, 0x14, 0x00, 0x01, 0xB5);    // Testscreen
+    display.display_control(IMAGE_FORMAT, NEW); //set correct image type for reading from SD
+    display.showpicture(0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xCD);    // Testscreen
 }
 void CDU_LogoScreen()
 {
-    display.display_control(IMAGE_FORMAT, NEW); //set correct image for reading from SD   
     display.cls();
-    display.showpicture(0x00, 0x00, 0x00, 0x87, 0x00, 0x00, 0x00);    // Engravity logo
+    display.display_control(IMAGE_FORMAT, NEW); //set correct image for reading from SD   
+    display.showpicture(0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00);    // Engravity logo
+}
+
+void CDU_Waiting()
+{
+    display.cls();
+    display.graphic_string( "WAITING" , 0,  LINE1, FONT_12X34, WHITE, 1, 1 );
 }
  
 void CDU_Page()
@@ -404,7 +415,8 @@
    
 }
  
-void  CDU_displayclear(){
+void  CDU_displayclear()
+{
     display.cls();
 }