Diff: main.cpp

Revision:

9:bae7cfbe8d85

Parent:

8:bb11edbf5708

Child:

10:56ef6053ffc7

--- a/main.cpp	Fri Apr 24 10:11:59 2015 +0000
+++ b/main.cpp	Tue Apr 28 11:55:40 2015 +0000
@@ -18,7 +18,8 @@
 #include "SharpLCD.hpp"
 #include "BLEDevice.h"
 #include "icon.h"
-#include "font.h"
+//#include "font.h"
+#include "dotfont.h"
 
 Serial pc (USBTX,USBRX);
 
@@ -68,6 +69,9 @@
 GattCharacteristic *uartChars[] = {&txCharacteristic, &rxCharacteristic};
 GattService         uartService(uart_base_uuid, uartChars, sizeof(uartChars) / sizeof(GattCharacteristic *));
 
+const FONT_INFO* mainFont;
+const FONT_INFO* exFont;
+const FONT_INFO* blackFont;
 
 void screenSetup()
 {
@@ -77,53 +81,27 @@
     fb.clear();
     lcd.clear();
 
-
+    mainFont = searchFontFace("Square Head 16pt", 16);
+    blackFont = searchFontFace("Square Head 16pt Black", 16);
+    exFont = searchFontFace("Lucida 8pt", 8);
 }
 
 void showPairing()
 {
     fb.clear();
-    fb.bitBlit( sScreen, 96, 96, 0, 0);
-    fb.bitBlit(rings[anim], 32, 32, 2, 57);  
-    switch (elip) {
+    fb.bitBlit(sScreen, 96, 96, 0, 0);
+    fb.bitBlit(rings[anim], 32, 32, 2, 57); 
+    char* dots[4] = {"", "..", "...", "..."};
+    char str[15] = "Pairing";
+    strcat(str, dots[elip]);
     
-    case 0: fb.printString(lookupFontFace("Lucida 8pt", 8),
-               38,
-               80,
-               BLACK,
-               "Pairing");
-               break;
-    case 1: fb.printString(lookupFontFace("Lucida 8pt", 8),
-               38,
-               80,
-               BLACK,
-               "Pairing..");
-               break;
-               
-    case 2: fb.printString(lookupFontFace("Lucida 8pt", 8),
-               38,
-               80,
-               BLACK,
-               "Pairing...");
-               break;
-
-    case 3: fb.printString(lookupFontFace("Lucida 8pt", 8),
-               38,
-               80,
-               BLACK,
-               "Pairing...");
-               break;                   
-               
-           
-}
-               
-               
+    fb.printString(exFont, 38, 80, str);
+    
     lcd.drawFrameBuffer(fb);
     elip++;
     anim++;
     wait(0.15);
     
-    
     if (anim>=2) {
         anim = 0;   
     }
@@ -180,38 +158,22 @@
     unixTime = newTime;
     struct tm* timeinfo = localtime (&unixTime);
     strftime (timeStr, 20, "%R", timeinfo);
-    strftime (dayStr, 20, "%A", timeinfo);
-    strftime (dateStr, 20, "%B %e", timeinfo);
+    strftime (dayStr, 20, "%a", timeinfo);
+    strftime (dateStr, 20, "%b %e", timeinfo);
 }
 
 // Main LCD display function, add all framebuffer updates here ONLY
 void updateLCD() {
     fb.clear();
-    
-    //fb.bitBlit(YO, 80, 50, 0, 40);  
-    fb.printString(lookupFontFace("Lucida 8pt", 8),
-                   60,
-                   65,
-                   BLACK,
-                   user);
-    
-    fb.printString(lookupFontFace("Lucida 8pt", 8),
-                   35,
-                   16,
-                   BLACK,
-                   timeStr);
-                   
-    fb.printString(lookupFontFace("Lucida 8pt", 8),
-                   35,
-                   35,
-                   BLACK,
-                   dayStr);
-    
-    fb.printString(lookupFontFace("Lucida 8pt", 8),
-                   35,
-                   60,
-                   BLACK,
-                   dateStr);
+    //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);
                    
     lcd.drawFrameBuffer(fb);
 }