Engravity-CDU
Modifications in 4DGL library. Added CDU_hw_sw.h for version info. Added pins.h for hardware pin remapping
Dependencies: 4DGL-UC MODSERIAL mbed mbos
Fork of
CDU_Mbed_30
by 
Engravity-CDU
Diff: display.cpp
- Revision:
- 21:f348e6f0f7d4
- Parent:
- 20:150afde94910
diff -r 150afde94910 -r f348e6f0f7d4 display.cpp
--- a/display.cpp Thu Sep 25 11:34:21 2014 +0000
+++ b/display.cpp Fri Oct 10 18:23:36 2014 +0000
@@ -53,7 +53,6 @@
*/
-
//Control lines for VGA driver board
TFT_4DGL display(VGA_TX,VGA_RX,VGA_RESET); // serial tx, serial rx, reset pin
@@ -274,8 +273,8 @@
void CDU_LogoScreen()
{
+ display.cls();
display.display_control(IMAGE_FORMAT, NEW); //set correct image for reading from SD
- display.cls();
display.showpicture( 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00); // Engravity logo
}
@@ -287,23 +286,23 @@
display.cls();
- display.graphic_string( str2char( cTitle1 ), centertext( cTitle1, 24, LARGECHAR), LINE6, FONT_24X34, WHITE, 1, 1 );
+ display.graphic_string( str2char( cTitle1 ), centertext( cTitle1, 24, LARGECHAR), LINE6, FONT_24X34, WHITE, TEXT_SCALE, TEXT_SCALE );
wait_ms(100);
- display.graphic_string( str2char( cTitle2 ), centertext( cTitle2, 24, LARGECHAR), LINE8, FONT_24X34, RED, 1, 1 );
+ display.graphic_string( str2char( cTitle2 ), centertext( cTitle2, 24, LARGECHAR), LINE8, FONT_24X34, RED, TEXT_SCALE, TEXT_SCALE );
wait_ms(100);
- display.graphic_string( str2char( cTitle2 ), centertext( cTitle2, 24, LARGECHAR), LINE8, FONT_24X34, GREEN, 1, 1 );
+ display.graphic_string( str2char( cTitle2 ), centertext( cTitle2, 24, LARGECHAR), LINE8, FONT_24X34, GREEN, TEXT_SCALE, TEXT_SCALE );
wait_ms(100);
- display.graphic_string( str2char( cTitle2) , centertext( cTitle2, 24, LARGECHAR), LINE8, FONT_24X34, BLUE, 1, 1 );
+ display.graphic_string( str2char( cTitle2) , centertext( cTitle2, 24, LARGECHAR), LINE8, FONT_24X34, BLUE, TEXT_SCALE, TEXT_SCALE );
wait_ms(100);
display.cls();
//Hardware & Firmware information
- display.graphic_string( str2char( CDU_Hardware() ), centertext( CDU_Hardware(), 48, SMALLCHAR), LINE6, FONT_12X34, WHITE, 1, 1 );
- display.graphic_string( str2char( CDU_Firmware() ), centertext( CDU_Firmware(), 48, SMALLCHAR), LINE7, FONT_12X34, WHITE, 1, 1 );
- display.graphic_string( str2char( CDU_Compile() ) , centertext( CDU_Compile() , 48, SMALLCHAR), LINE8, FONT_12X34, WHITE, 1, 1 );
- display.graphic_string( str2char( CDU_MAC() ) , centertext( CDU_MAC() , 48, SMALLCHAR), LINE10, FONT_12X34, WHITE, 1, 1 );
- display.graphic_string( str2char( CDU_IP() ) , centertext( CDU_IP() , 48, SMALLCHAR), LINE11, FONT_12X34, WHITE, 1, 1 );
+ display.graphic_string( str2char( CDU_Hardware() ), centertext( CDU_Hardware(), 48, SMALLCHAR), LINE6, FONT_12X34, WHITE, TEXT_SCALE, TEXT_SCALE );
+ display.graphic_string( str2char( CDU_Firmware() ), centertext( CDU_Firmware(), 48, SMALLCHAR), LINE7, FONT_12X34, WHITE, TEXT_SCALE, TEXT_SCALE );
+ display.graphic_string( str2char( CDU_Compile() ) , centertext( CDU_Compile() , 48, SMALLCHAR), LINE8, FONT_12X34, WHITE, TEXT_SCALE, TEXT_SCALE );
+ display.graphic_string( str2char( CDU_MAC() ) , centertext( CDU_MAC() , 48, SMALLCHAR), LINE10, FONT_12X34, WHITE, TEXT_SCALE, TEXT_SCALE );
+ display.graphic_string( str2char( CDU_IP() ) , centertext( CDU_IP() , 48, SMALLCHAR), LINE11, FONT_12X34, WHITE, TEXT_SCALE, TEXT_SCALE );
wait_ms(5000);
}
@@ -329,51 +328,54 @@
display.line(XMIN,LINE14,XMAX,LINE14, WHITE);
//Hardware & Firmware information
- display.graphic_string( str2char( CDU_Hardware() ), centertext( CDU_Hardware(), 48, SMALLCHAR), LINE6, FONT_12X34, WHITE, 1, 1 );
- display.graphic_string( str2char( CDU_Firmware() ), centertext( CDU_Firmware(), 48, SMALLCHAR), LINE7, FONT_12X34, WHITE, 1, 1 );
- display.graphic_string( str2char( CDU_Compile() ) , centertext( CDU_Compile() , 48, SMALLCHAR), LINE8, FONT_12X34, WHITE, 1, 1 );
- display.graphic_string( str2char( CDU_MAC() ) , centertext( CDU_MAC() , 48, SMALLCHAR), LINE10, FONT_12X34, WHITE, 1, 1 );
- display.graphic_string( str2char( CDU_IP() ) , centertext( CDU_IP() , 48, SMALLCHAR), LINE11, FONT_12X34, WHITE, 1, 1 );
+ display.graphic_string( str2char( CDU_Hardware() ), centertext( CDU_Hardware(), 48, SMALLCHAR), LINE6, FONT_12X34, WHITE, TEXT_SCALE, TEXT_SCALE );
+ display.graphic_string( str2char( CDU_Firmware() ), centertext( CDU_Firmware(), 48, SMALLCHAR), LINE7, FONT_12X34, WHITE, TEXT_SCALE, TEXT_SCALE );
+ display.graphic_string( str2char( CDU_Compile() ) , centertext( CDU_Compile() , 48, SMALLCHAR), LINE8, FONT_12X34, WHITE, TEXT_SCALE, TEXT_SCALE );
+ display.graphic_string( str2char( CDU_MAC() ) , centertext( CDU_MAC() , 48, SMALLCHAR), LINE10, FONT_12X34, WHITE, TEXT_SCALE, TEXT_SCALE );
+ display.graphic_string( str2char( CDU_IP() ) , centertext( CDU_IP() , 48, SMALLCHAR), LINE11, FONT_12X34, WHITE, TEXT_SCALE, TEXT_SCALE );
}
-
-
void CDU_Page()
{
display.cls();
- display.graphic_string( "PERF INIT" , 8*24, LINE1, FONT_24X34, WHITE, 1, 1 );
+ display.graphic_string( "PERF INIT" , 8*24, LINE1, FONT_24X34, WHITE, TEXT_SCALE, TEXT_SCALE );
- display.graphic_string( "GW/CRZ CG" , 0, LINE2, FONT_12X34, WHITE, 1, 1 );
- display.graphic_string( "CRZ ALT" , 41*12, LINE2, FONT_12X34, WHITE, 1, 1 );
+ display.graphic_string( "GW/CRZ CG" , 0, LINE2, FONT_12X34, WHITE, TEXT_SCALE, TEXT_SCALE );
+ display.graphic_string( "CRZ ALT" , 41*12, LINE2, FONT_12X34, WHITE, TEXT_SCALE, TEXT_SCALE );
- display.graphic_string( "___._ / 26.2%" , 0, LINE3, FONT_24X34, WHITE, 1, 1 );
- display.graphic_string( "_____" , 19*24, LINE3, FONT_24X34, WHITE, 1, 1 );
- display.graphic_string( "FUEL" , 0, LINE4, FONT_12X34, WHITE, 1, 1 );
- display.graphic_string( "CRZ/WIND" , 40*12, LINE4, FONT_12X34, WHITE, 1, 1 );
+ display.graphic_string( "___._ / 26.2%" , 0, LINE3, FONT_24X34, WHITE, TEXT_SCALE, TEXT_SCALE );
+ display.graphic_string( "_____" , 19*24, LINE3, FONT_24X34, WHITE, TEXT_SCALE, TEXT_SCALE );
+ display.graphic_string( "FUEL" , 0, LINE4, FONT_12X34, WHITE, TEXT_SCALE, TEXT_SCALE );
+ display.graphic_string( "CRZ/WIND" , 40*12, LINE4, FONT_12X34, WHITE, TEXT_SCALE, TEXT_SCALE );
- display.graphic_string( "0.0" , 0, LINE5, FONT_24X34, WHITE, 1, 1 );
- display.graphic_string( "000$ /---" , 15*24, LINE5, FONT_24X34, WHITE, 1, 1 );
+ display.graphic_string( "0.0" , 0, LINE5, FONT_24X34, WHITE, TEXT_SCALE, TEXT_SCALE );
+ display.graphic_string( "000$ /---" , 15*24, LINE5, FONT_24X34, WHITE, TEXT_SCALE, TEXT_SCALE );
- display.graphic_string( "ZFW" , 0, LINE6, FONT_12X34, WHITE, 1, 1 );
- display.graphic_string( "___._ " , 0, LINE7, FONT_24X34, WHITE, 1, 1 );
+ display.graphic_string( "ZFW" , 0, LINE6, FONT_12X34, WHITE, TEXT_SCALE, TEXT_SCALE );
+ display.graphic_string( "___._ " , 0, LINE7, FONT_24X34, WHITE, TEXT_SCALE, TEXT_SCALE );
- display.graphic_string( "RESERVES" , 0, LINE8, FONT_12X34, WHITE, 1, 1 );
- display.graphic_string( "__._ " , 0, LINE9, FONT_24X34, WHITE, 1, 1 );
+ display.graphic_string( "RESERVES" , 0, LINE8, FONT_12X34, WHITE, TEXT_SCALE, TEXT_SCALE );
+ display.graphic_string( "__._ " , 0, LINE9, FONT_24X34, WHITE, TEXT_SCALE, TEXT_SCALE );
- display.graphic_string( "COST INDEX" , 0, LINE10, FONT_12X34, WHITE, 1, 1 );
- display.graphic_string( "TRANS ALT" , 39*12, LINE10, FONT_12X34, WHITE, 1, 1 );
+ display.graphic_string( "COST INDEX" , 0, LINE10, FONT_12X34, WHITE, TEXT_SCALE, TEXT_SCALE );
+ display.graphic_string( "TRANS ALT" , 39*12, LINE10, FONT_12X34, WHITE, TEXT_SCALE, TEXT_SCALE );
- display.graphic_string( "___" , 0, LINE11, FONT_24X34, WHITE, 1, 1 );
- display.graphic_string( "_____" , 19*24, LINE11, FONT_24X34, WHITE, 1, 1 );
+ display.graphic_string( "___" , 0, LINE11, FONT_24X34, WHITE, TEXT_SCALE, TEXT_SCALE );
+ display.graphic_string( "_____" , 19*24, LINE11, FONT_24X34, WHITE, TEXT_SCALE, TEXT_SCALE );
- display.graphic_string( "------------------------------------------------" , 0, LINE12, FONT_12X34, WHITE, 1, 1 );
+ display.graphic_string( "------------------------------------------------" , 0, LINE12, FONT_12X34, WHITE, TEXT_SCALE, TEXT_SCALE );
- display.graphic_string( "<INDEX" , 0, LINE13, FONT_24X34, WHITE, 1, 1 );
- display.graphic_string( "N1 LIMIT>" , 15*24, LINE13, FONT_24X34, WHITE, 1, 1 );
+ display.graphic_string( "<INDEX" , 0, LINE13, FONT_24X34, WHITE, TEXT_SCALE, TEXT_SCALE );
+ display.graphic_string( "N1 LIMIT>" , 15*24, LINE13, FONT_24X34, WHITE, TEXT_SCALE, TEXT_SCALE );
- display.graphic_string( "SCRATCHPAD DATA LINE", centertext("SCRATCHPAD DATA LINE", 24, LARGECHAR) , LINE14, FONT_24X34, RED, 1, 1 );
-
+ display.graphic_string( "SCRATCHPAD DATA LINE", centertext("SCRATCHPAD DATA LINE", 24, LARGECHAR) , LINE14, FONT_24X34, RED, TEXT_SCALE, TEXT_SCALE );
+}
+
+ void CDU_Waiting()
+{
+ display.cls();
+ display.graphic_string( "WAITING" , 0, LINE1, FONT_12X34, WHITE, TEXT_SCALE, TEXT_SCALE );
}
void CDU_displayclear(){