diff options
| author | Thomas Saunders <trsaunders@gmail.com> | 2012-08-07 17:04:57 +0100 |
|---|---|---|
| committer | Thomas Saunders <trsaunders@gmail.com> | 2012-08-07 17:04:57 +0100 |
| commit | b87fc583d47a81328385da6392eb79abd0642b07 (patch) | |
| tree | 3993e952486e4acee5c6c5467353b48836989614 | |
| parent | fc2a9900d1cf3c02c6e11accfcd8bd378e57a812 (diff) | |
| download | uGFX-b87fc583d47a81328385da6392eb79abd0642b07.tar.gz uGFX-b87fc583d47a81328385da6392eb79abd0642b07.tar.bz2 uGFX-b87fc583d47a81328385da6392eb79abd0642b07.zip | |
fix grammar, vertical scroll, missing function definition
| -rw-r--r-- | halext/drivers/gdispS6d1121/gdisp_lld.c | 2 | ||||
| -rw-r--r-- | halext/drivers/gdispS6d1121/gdisp_lld_config.h | 2 | ||||
| -rw-r--r-- | halext/include/gdisp.h | 3 | ||||
| -rw-r--r-- | halext/include/gdisp_fonts.h | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/halext/drivers/gdispS6d1121/gdisp_lld.c b/halext/drivers/gdispS6d1121/gdisp_lld.c index dfac4e82..4e83fc82 100644 --- a/halext/drivers/gdispS6d1121/gdisp_lld.c +++ b/halext/drivers/gdispS6d1121/gdisp_lld.c @@ -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_lcdWriteStreamStart();
gap = cx*abslines;
- for(i = 0; i < gap; i++) lld_lcdWriteData(color);
+ for(i = 0; i < gap; i++) lld_lcdWriteData(bgcolor);
lld_lcdWriteStreamStop();
lld_lcdResetViewPort();
}
diff --git a/halext/drivers/gdispS6d1121/gdisp_lld_config.h b/halext/drivers/gdispS6d1121/gdisp_lld_config.h index 83f5ce3d..9e01b901 100644 --- a/halext/drivers/gdispS6d1121/gdisp_lld_config.h +++ b/halext/drivers/gdispS6d1121/gdisp_lld_config.h @@ -45,7 +45,7 @@ #define GDISP_HARDWARE_ELLIPSEFILLS FALSE
#define GDISP_HARDWARE_TEXT FALSE
#define GDISP_HARDWARE_TEXTFILLS FALSE
-#define GDISP_HARDWARE_SCROLL FALSE
+#define GDISP_HARDWARE_SCROLL TRUE
#define GDISP_HARDWARE_PIXELREAD FALSE
#define GDISP_HARDWARE_CONTROL TRUE
diff --git a/halext/include/gdisp.h b/halext/include/gdisp.h index 454f5c4c..ddb12137 100644 --- a/halext/include/gdisp.h +++ b/halext/include/gdisp.h @@ -218,6 +218,7 @@ extern "C" { #if GDISP_NEED_TEXT
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 gdispDrawString(coord_t x, coord_t y, const char *str, font_t font, color_t color);
#endif
/* Read a pixel Function */
@@ -232,7 +233,7 @@ extern "C" { /* Set driver specific control */
#if GDISP_NEED_CONTROL
- void gdispControl(unsigned what, void *value);
+ void gdispControl(int what, void *value);
#endif
#else
diff --git a/halext/include/gdisp_fonts.h b/halext/include/gdisp_fonts.h index a271030e..a1a4c3cb 100644 --- a/halext/include/gdisp_fonts.h +++ b/halext/include/gdisp_fonts.h @@ -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 _getCharOffset(f,c) ((f)->offsetTable[(c) - (f)->minChar])
|