Prep for v1.1.2

[hackover2013-badge-firmware.git] / drivers / displays / tft / touchscreen.c

diff --git a/drivers/displays/tft/touchscreen.c b/drivers/displays/tft/touchscreen.c
index 3370c5f..1ac7821 100644 (file)
--- a/drivers/displays/tft/touchscreen.c
+++ b/drivers/displays/tft/touchscreen.c
@@ -43,7 +43,7 @@
 #include "drivers/storage/eeprom/eeprom.h"
 #include "drivers/displays/tft/lcd.h"
 #include "drivers/displays/tft/drawing.h"
 #include "drivers/storage/eeprom/eeprom.h"
 #include "drivers/displays/tft/lcd.h"
 #include "drivers/displays/tft/drawing.h"

-#include "drivers/displays/tft/fonts/dejavusans9.h"
+#include "drivers/displays/tft/controls/labelcentered.h"

 
 #define TS_LINE1 "Touch the center of"
 #define TS_LINE2 "the red circle using"
 
 #define TS_LINE1 "Touch the center of"
 #define TS_LINE2 "the red circle using"


@@ -170,7 +170,7 @@ uint32_t tsReadY(void)
 /**************************************************************************/
 void tsCalibCenterText(char* text, uint16_t y, uint16_t color)
 {
 /**************************************************************************/
 void tsCalibCenterText(char* text, uint16_t y, uint16_t color)
 {

-  drawString((lcdGetWidth() - drawGetStringWidth(&dejaVuSans9ptFontInfo, text)) / 2, y, color, &dejaVuSans9ptFontInfo, text);
+  labelcenteredRender(lcdGetWidth()/2, y, COLOR_WHITE, color, text, themeGetDefault());

 }
 
 /**************************************************************************/
 }
 
 /**************************************************************************/


@@ -300,7 +300,6 @@ int getDisplayPoint( tsPoint_t * displayPtr, tsPoint_t * screenPtr, tsMatrix_t *
   }
   else
   {
   }
   else
   {

-    // ToDo: Default values required or you can never read LCD position!

     // return TS_ERROR_NOTCALIBRATED;
     return -1;
   }
     // return TS_ERROR_NOTCALIBRATED;
     return -1;
   }