Removed EEPROM define (bug)

[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..fdcd0aa 100644 (file)
--- a/project/commands/drawing/cmd_textw.c
+++ b/project/commands/drawing/cmd_textw.c
@@ -44,14 +44,14 @@
 #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"
+  #include "drivers/displays/tft/lcd.h"    
+  #include "drivers/displays/tft/drawing.h"  
+  #include "drivers/displays/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"
+  #include "drivers/displays/tft/fonts/dejavusansmono8.h"
+  #include "drivers/displays/tft/fonts/dejavusansbold9.h"
   #endif
 
 /**************************************************************************/
@@ -84,18 +84,18 @@ void cmd_textw(uint8_t argc, char **argv)
     switch (font)
     {
       case 1:   // DejaVu Sans Mono 8
-        printf("%d %s", drawGetStringWidth(&dejaVuSansMono8ptFontInfo, data), CFG_PRINTF_NEWLINE);
+        printf("%d %s", fontsGetStringWidth(&dejaVuSansMono8ptFontInfo, data), CFG_PRINTF_NEWLINE);
         break;
       case 2:   // DejaVu Sans Bold 9
-        printf("%d %s", drawGetStringWidth(&dejaVuSansBold9ptFontInfo, data), CFG_PRINTF_NEWLINE);
+        printf("%d %s", fontsGetStringWidth(&dejaVuSansBold9ptFontInfo, data), CFG_PRINTF_NEWLINE);
         break;
       default:  // DejaVu Sans 9        
-        printf("%d %s", drawGetStringWidth(&dejaVuSans9ptFontInfo, data), CFG_PRINTF_NEWLINE);
+        printf("%d %s", fontsGetStringWidth(&dejaVuSans9ptFontInfo, data), CFG_PRINTF_NEWLINE);
         break;
     }
   #else
     // Always use DejaVu Sans 9 by default
-    printf("%d %s", drawGetStringWidth(&dejaVuSans9ptFontInfo, data), CFG_PRINTF_NEWLINE);
+    printf("%d %s", fontsGetStringWidth(&dejaVuSans9ptFontInfo, data), CFG_PRINTF_NEWLINE);
   #endif