uGFX/ugfx
2
0
Fork 0
Code Issues 2 Pull requests Projects Releases Wiki Activity

Merge pull request #35 from trsaunders/upstream

Browse source 
fix grammar, vertical scroll, missing function definition
This commit is contained in:
Tectu 2012-08-07 10:15:36 -07:00
commit f61404305e
4 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
halext/drivers/gdispS6d1121/gdisp_lld.c
View file

@ -568,7 +568,7 @@ void gdisp_lld_drawpixel(coord_t x, coord_t y, color_t color) {
lld_lcdSetViewPort(x, lines > 0 ? (y+gap) : y, cx, abslines); lld_lcdSetViewPort(x, lines > 0 ? (y+gap) : y, cx, abslines);
lld_lcdWriteStreamStart(); lld_lcdWriteStreamStart();
gap = cx*abslines; gap = cx*abslines;
for(i = 0; i < gap; i++) lld_lcdWriteData(color); for(i = 0; i < gap; i++) lld_lcdWriteData(bgcolor);
lld_lcdWriteStreamStop(); lld_lcdWriteStreamStop();
lld_lcdResetViewPort(); lld_lcdResetViewPort();
} }

2
halext/drivers/gdispS6d1121/gdisp_lld_config.h
View file

@ -45,7 +45,7 @@
#define GDISP_HARDWARE_ELLIPSEFILLS FALSE #define GDISP_HARDWARE_ELLIPSEFILLS FALSE
#define GDISP_HARDWARE_TEXT FALSE #define GDISP_HARDWARE_TEXT FALSE
#define GDISP_HARDWARE_TEXTFILLS FALSE #define GDISP_HARDWARE_TEXTFILLS FALSE
#define GDISP_HARDWARE_SCROLL FALSE #define GDISP_HARDWARE_SCROLL TRUE
#define GDISP_HARDWARE_PIXELREAD FALSE #define GDISP_HARDWARE_PIXELREAD FALSE
#define GDISP_HARDWARE_CONTROL TRUE #define GDISP_HARDWARE_CONTROL TRUE

3
halext/include/gdisp.h
View file

@ -218,6 +218,7 @@ extern "C" {
#if GDISP_NEED_TEXT #if GDISP_NEED_TEXT
void gdispDrawChar(coord_t x, coord_t y, char c, font_t font, color_t color); void gdispDrawChar(coord_t x, coord_t y, char c, font_t font, color_t color);
void gdispFillChar(coord_t x, coord_t y, char c, font_t font, color_t color, color_t bgcolor); void gdispFillChar(coord_t x, coord_t y, char c, font_t font, color_t color, color_t bgcolor);
void gdispDrawString(coord_t x, coord_t y, const char *str, font_t font, color_t color);
#endif #endif
/* Read a pixel Function */ /* Read a pixel Function */
@ -232,7 +233,7 @@ extern "C" {
/* Set driver specific control */ /* Set driver specific control */
#if GDISP_NEED_CONTROL #if GDISP_NEED_CONTROL
void gdispControl(unsigned what, void *value); void gdispControl(int what, void *value);
#endif #endif
#else #else

2
halext/include/gdisp_fonts.h
View file

@ -80,7 +80,7 @@ struct font {
}; };
/** /**
* @brief Macro's to get to the complex parts of the font structure. * @brief Macros to get to the complex parts of the font structure.
*/ */
#define _getCharWidth(f,c) (((c) < (f)->minChar || (c) > (f)->maxChar) ? 0 : (f)->widthTable[(c) - (f)->minChar]) #define _getCharWidth(f,c) (((c) < (f)->minChar || (c) > (f)->maxChar) ? 0 : (f)->widthTable[(c) - (f)->minChar])
#define _getCharOffset(f,c) ((f)->offsetTable[(c) - (f)->minChar]) #define _getCharOffset(f,c) ((f)->offsetTable[(c) - (f)->minChar])