Diff: main.cpp

Revision:

10:56ef6053ffc7

Parent:

9:bae7cfbe8d85

Child:

11:7fe2639ee5f6

--- a/main.cpp	Tue Apr 28 11:55:40 2015 +0000
+++ b/main.cpp	Tue Apr 28 13:21:30 2015 +0000
@@ -71,7 +71,7 @@
 
 const FONT_INFO* mainFont;
 const FONT_INFO* exFont;
-const FONT_INFO* blackFont;
+const FONT_INFO* subFont;
 
 void screenSetup()
 {
@@ -81,9 +81,9 @@
     fb.clear();
     lcd.clear();
 
-    mainFont = searchFontFace("Square Head 16pt", 16);
-    blackFont = searchFontFace("Square Head 16pt Black", 16);
-    exFont = searchFontFace("Lucida 8pt", 8);
+    mainFont = searchFontFace("Century Gothic Black", 28);
+    subFont = searchFontFace("Century Gothic Black", 9);
+    exFont = searchFontFace("Lucida", 8);
 }
 
 void showPairing()
@@ -165,15 +165,15 @@
 // Main LCD display function, add all framebuffer updates here ONLY
 void updateLCD() {
     fb.clear();
-    //fb.bitBlit(img, 96, 96, 0,0);
-fb.bitBlit(img2, 72, 80, 0, 0);  
-//    fb.printString(mainFont, 60, 65, user);
-//    
-//    fb.printString(mainFont, 25, 32, timeStr);
-//                   
-//    fb.printString(mainFont, 5, 55, dayStr);
-//    
-//    fb.printString(mainFont, 5, 75, dateStr);
+    fb.bitBlit(img, 96, 96, 0,0);
+    //fb.bitBlit(img2, 72, 80, 0, 0);  
+    fb.printString(mainFont, 60, 65, user);
+    
+    fb.printString(mainFont, 13, 63, timeStr);
+                   
+    fb.printString(subFont, 16, 80, dayStr);
+    
+    fb.printString(subFont, 43, 80, dateStr);
                    
     lcd.drawFrameBuffer(fb);
 }