Removed EEPROM define (bug)

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

diff --git a/project/commands/drawing/cmd_text.c b/project/commands/drawing/cmd_text.c
index ac3bc7c..ad669d0 100644 (file)
--- a/project/commands/drawing/cmd_text.c
+++ b/project/commands/drawing/cmd_text.c
@@ -44,9 +44,15 @@
 #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"
+  #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/displays/tft/fonts/dejavusansmono8.h"
+  #include "drivers/displays/tft/fonts/dejavusansbold9.h"
+  #endif

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


@@ -77,8 +83,24 @@ void cmd_text(uint8_t argc, char **argv)
   }
   *data_ptr++ = '\0';
 
   }
   *data_ptr++ = '\0';
 

-  // Only Vera Mono 9 is used by default
-  drawString((uint16_t)x, (uint16_t)y, (uint16_t)color, &dejaVuSans9ptFontInfo, (char *)&data);
+  // Only include this w/UART since there isn't enough space otherwise!
+  #ifdef CFG_PRINTF_UART
+    switch (font)
+    {
+      case 1:   // DejaVu Sans Mono 8
+        fontsDrawString((uint16_t)x, (uint16_t)y, (uint16_t)color, &dejaVuSansMono8ptFontInfo, (char *)&data);
+        break;
+      case 2:   // DejaVu Sans Bold 9
+        fontsDrawString((uint16_t)x, (uint16_t)y, (uint16_t)color, &dejaVuSansBold9ptFontInfo, (char *)&data);
+        break;
+      default:  // DejaVu Sans 9        
+        fontsDrawString((uint16_t)x, (uint16_t)y, (uint16_t)color, &dejaVuSans9ptFontInfo, (char *)&data);
+        break;
+    }
+  #else
+    // Always use Vera Mono 9 is used by default
+    fontsDrawString((uint16_t)x, (uint16_t)y, (uint16_t)color, &dejaVuSans9ptFontInfo, (char *)&data);
+  #endif

 }
 
 #endif  
 }
 
 #endif