From 37c1266a51da4456648bf3b3bbe7777692bd77ec Mon Sep 17 00:00:00 2001 From: Andrew Hannam Date: Sat, 4 Aug 2012 02:23:05 +1000 Subject: Fix fonts nd fix debug symbols Fixed fonts for draw/fill char/string. On my display I require GDISP_SOFTWARE_TEXTFILLDRAW for filled char/string but that may because my display blit may be broken. Also found that code in header files doesn't have debug symbols generated for it so I converted the include files that contained code into real C files and altered the halext.mk to match. --- halext/drivers/gdispS6d1121/gdisp_lld.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'halext/drivers/gdispS6d1121') diff --git a/halext/drivers/gdispS6d1121/gdisp_lld.c b/halext/drivers/gdispS6d1121/gdisp_lld.c index 8b98222c..fd7339c2 100644 --- a/halext/drivers/gdispS6d1121/gdisp_lld.c +++ b/halext/drivers/gdispS6d1121/gdisp_lld.c @@ -29,7 +29,6 @@ #include "ch.h" #include "hal.h" #include "gdisp.h" -#include "gdisp_fonts.h" #if HAL_USE_GDISP || defined(__DOXYGEN__) @@ -72,9 +71,6 @@ /* Driver exported functions. */ /*===========================================================================*/ -/* Include the software emulation routines */ -#include "gdisp_lld_inc_emulation.c.h" - /* ---- Required Routines ---- */ /* The following 2 routines are required. @@ -535,6 +531,10 @@ void gdisp_lld_drawpixel(coord_t x, coord_t y, color_t color) { } #endif +#if (GDISP_NEED_TEXT && GDISP_HARDWARE_TEXT) || defined(__DOXYGEN__) + #include "gdisp_fonts.h" +#endif + #if (GDISP_NEED_TEXT && GDISP_HARDWARE_TEXT) || defined(__DOXYGEN__) /** * @brief Draw a character using a transparent background. -- cgit v1.2.3