Prep for v1.2.0

[hackover2013-badge-firmware.git] / project / commands / drawing / cmd_textw.c

diff --git a/project/commands/drawing/cmd_textw.c b/project/commands/drawing/cmd_textw.c
index d116b77..151c344 100644 (file)
--- a/project/commands/drawing/cmd_textw.c
+++ b/project/commands/drawing/cmd_textw.c
@@ -44,15 +44,8 @@
 #include "project/commands.h"       // Generic helper functions
 
 #ifdef CFG_TFTLCD    
 #include "project/commands.h"       // Generic helper functions
 
 #ifdef CFG_TFTLCD    

-  #include "drivers/lcd/tft/lcd.h"    
-  #include "drivers/lcd/tft/drawing.h"  
-  #include "drivers/lcd/tft/fonts/dejavusans9.h"
-
-  // Only include this w/UART since there isn't enough space otherwise!
-  #ifdef CFG_PRINTF_UART
-  #include "drivers/lcd/tft/fonts/dejavusansmono8.h"
-  #include "drivers/lcd/tft/fonts/dejavusansbold9.h"
-  #endif
+  #include "drivers/displays/tft/lcd.h"    
+  #include "drivers/displays/tft/drawing.h"  

 
 /**************************************************************************/
 /*! 
 
 /**************************************************************************/
 /*! 


@@ -79,26 +72,22 @@ void cmd_textw(uint8_t argc, char **argv)
   }
   *data_ptr++ = '\0';
 
   }
   *data_ptr++ = '\0';
 

-  // Only include this w/UART since there isn't enough space otherwise!
-  #ifdef CFG_PRINTF_UART
+  #if CFG_TFTLCD_USEAAFONTS

     switch (font)
     {
     switch (font)
     {

-      case 1:   // DejaVu Sans Mono 8
-        printf("%d %s", drawGetStringWidth(&dejaVuSansMono8ptFontInfo, data), CFG_PRINTF_NEWLINE);
-        break;
-      case 2:   // DejaVu Sans Bold 9
-        printf("%d %s", drawGetStringWidth(&dejaVuSansBold9ptFontInfo, data), CFG_PRINTF_NEWLINE);
-        break;
-      default:  // DejaVu Sans 9        
-        printf("%d %s", drawGetStringWidth(&dejaVuSans9ptFontInfo, data), CFG_PRINTF_NEWLINE);
+      default:  // Only enough space for one font for now
+        printf("%d %s", aafontsGetStringWidth(&THEME_FONT, data), CFG_PRINTF_NEWLINE);

         break;
     }
   #else
         break;
     }
   #else

-    // Always use DejaVu Sans 9 by default
-    printf("%d %s", drawGetStringWidth(&dejaVuSans9ptFontInfo, data), CFG_PRINTF_NEWLINE);
+    switch (font)
+    {
+      default:  // Only enough space for one font for now
+        printf("%d %s", fontsGetStringWidth(&THEME_FONT, data), CFG_PRINTF_NEWLINE);
+        break;
+    }

   #endif
 
   #endif
 

-

   return;
 }
 
   return;
 }