X-Git-Url: https://git.rohieb.name/hackover2013-badge-firmware.git/blobdiff_plain/a7be12a4e68fcaaa92f81a394bc316a592ec6270..bc86734f505f763ba5d69c6b8e62a1443b5154b6:/drivers/displays/tft/touchscreen.c diff --git a/drivers/displays/tft/touchscreen.c b/drivers/displays/tft/touchscreen.c index 90af15f..97f448b 100644 --- a/drivers/displays/tft/touchscreen.c +++ b/drivers/displays/tft/touchscreen.c @@ -40,7 +40,7 @@ #include "core/adc/adc.h" #include "core/gpio/gpio.h" #include "core/systick/systick.h" -#include "drivers/eeprom/eeprom.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" @@ -170,7 +170,7 @@ uint32_t tsReadY(void) /**************************************************************************/ void tsCalibCenterText(char* text, uint16_t y, uint16_t color) { - drawString((lcdGetWidth() - drawGetStringWidth(&dejaVuSans9ptFontInfo, text)) / 2, y, color, &dejaVuSans9ptFontInfo, text); + fontsDrawString((lcdGetWidth() - fontsGetStringWidth(&dejaVuSans9ptFontInfo, text)) / 2, y, color, &dejaVuSans9ptFontInfo, text); } /**************************************************************************/ @@ -300,7 +300,6 @@ int getDisplayPoint( tsPoint_t * displayPtr, tsPoint_t * screenPtr, tsMatrix_t * } else { - // ToDo: Default values required or you can never read LCD position! // return TS_ERROR_NOTCALIBRATED; return -1; }