Engravity-CDU / 4DGL

uVGA III library

Dependents:   CDUFinal CDU_Mbed_21 CDU_Mbed_26 CDU_Mbed_30

Fork of 4DGL by Adam Green

Files at this revision

API Documentation at this revision

Revision 3:f34ce48346bc, committed 2014-07-05

Comitter:
WillemBraat
Date:
Sat Jul 05 16:31:43 2014 +0000
Parent:
2:aa719945d0e4
Commit message:
Font references have changed

Changed in this revision

TFT_4DGL.h Show annotated file Show diff for this revision Revisions of this file
TFT_4DGL_Text.cpp Show annotated file Show diff for this revision Revisions of this file
TFT_4DGL_main.cpp Show annotated file Show diff for this revision Revisions of this file 
diff -r aa719945d0e4 -r f34ce48346bc TFT_4DGL.h
--- a/TFT_4DGL.h	Tue Jul 01 13:20:11 2014 +0000
+++ b/TFT_4DGL.h	Sat Jul 05 16:31:43 2014 +0000
@@ -74,7 +74,7 @@
 #define OPAQUE       '\x01'
 
 // Fonts Sizes
-#define FONT_15X17   '\x00'
+#define FONT_12X34   '\x00'
 #define FONT_24X34   '\x01'
 
 // Touch Values

diff -r aa719945d0e4 -r f34ce48346bc TFT_4DGL_Text.cpp
--- a/TFT_4DGL_Text.cpp	Tue Jul 01 13:20:11 2014 +0000
+++ b/TFT_4DGL_Text.cpp	Sat Jul 05 16:31:43 2014 +0000
@@ -25,9 +25,9 @@
     }
 
     switch (mode) {
-        case FONT_15X17 :
-            fx = 15;
-            fy = 17;
+        case FONT_12X34:
+            fx = 12;
+            fy = 34;
             break;
         case FONT_24X34 :
             fx = 24; //was 24

diff -r aa719945d0e4 -r f34ce48346bc TFT_4DGL_main.cpp
--- a/TFT_4DGL_main.cpp	Tue Jul 01 13:20:11 2014 +0000
+++ b/TFT_4DGL_main.cpp	Sat Jul 05 16:31:43 2014 +0000
@@ -53,7 +53,7 @@
     current_color       = WHITE;        // initial text color
     current_orientation = IS_PORTRAIT;  // initial screen orientation
 
-    set_font(FONT_15X17);                 // initial font
+    set_font(FONT_12X34);                 // initial font
     text_mode(OPAQUE);                  // initial texr mode
 }