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

Fix some missing gBool conversions

Browse Source
This commit is contained in:
inmarket 2018-07-08 10:05:34 +10:00
parent 63d6955992
commit e8b789bfb1
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gdisp/WS29EPD/board_WS29EPD_template.h
View File

@ -18,7 +18,7 @@ static GFXINLINE void post_init_board(GDisplay *g) {
(void) g; (void) g;
} }
static GFXINLINE void setpin_reset(GDisplay *g, bool_t state) { static GFXINLINE void setpin_reset(GDisplay *g, gBool state) {
(void) g; (void) g;
(void) state; (void) state;
} }

6
src/gdisp/gdisp.c
View File

@ -3340,21 +3340,21 @@ void gdispGDrawBox(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, co
/* Callback to render string boxes with word wrap. */ /* Callback to render string boxes with word wrap. */
#if GDISP_NEED_TEXT_WORDWRAP #if GDISP_NEED_TEXT_WORDWRAP
static bool mf_countline_callback(mf_str line, uint16_t count, void *state) { static gBool mf_countline_callback(mf_str line, uint16_t count, void *state) {
(void) line; (void) line;
(void) count; (void) count;
((coord_t*)state)[0]++; ((coord_t*)state)[0]++;
return gTrue; return gTrue;
} }
static bool mf_drawline_callback(mf_str line, uint16_t count, void *state) { static gBool mf_drawline_callback(mf_str line, uint16_t count, void *state) {
#define GD ((GDisplay *)state) #define GD ((GDisplay *)state)
mf_render_aligned(GD->t.font, GD->t.wrapx, GD->t.wrapy, GD->t.lrj, line, count, drawcharglyph, state); mf_render_aligned(GD->t.font, GD->t.wrapx, GD->t.wrapy, GD->t.lrj, line, count, drawcharglyph, state);
GD->t.wrapy += GD->t.font->line_height; GD->t.wrapy += GD->t.font->line_height;
#undef GD #undef GD
return gTrue; return gTrue;
} }
static bool mf_fillline_callback(mf_str line, uint16_t count, void *state) { static gBool mf_fillline_callback(mf_str line, uint16_t count, void *state) {
#define GD ((GDisplay *)state) #define GD ((GDisplay *)state)
mf_render_aligned(GD->t.font, GD->t.wrapx, GD->t.wrapy, GD->t.lrj, line, count, fillcharglyph, state); mf_render_aligned(GD->t.font, GD->t.wrapx, GD->t.wrapy, GD->t.lrj, line, count, fillcharglyph, state);
GD->t.wrapy += GD->t.font->line_height; GD->t.wrapy += GD->t.font->line_height;

6
src/gdisp/mcufont/mf_config.h
View File

@ -16,6 +16,10 @@
#include "../../../gfx.h" #include "../../../gfx.h"
/* Ensure definitions are compatible with uGFX */
#undef bool
#define bool gBool
#if !GFX_USE_GDISP || !GDISP_NEED_TEXT #if !GFX_USE_GDISP || !GDISP_NEED_TEXT
#define MF_NO_COMPILE // Don't compile any font code #define MF_NO_COMPILE // Don't compile any font code
#endif #endif
@ -59,7 +63,7 @@
/* Encoding for the input data. /* Encoding for the input data.
* With the unicode encodings, the library supports the range of unicode * With the unicode encodings, the library supports the range of unicode
* characters 0x0000-0xFFFF (the Basic Multilingual Plane). * characters 0x0000-0xFFFF (the Basic Multilingual Plane).
* *
* ASCII: Plain ascii (somewhat works with ISO8859-1 also) * ASCII: Plain ascii (somewhat works with ISO8859-1 also)
* UTF8: UTF8 encoding (variable number of bytes) * UTF8: UTF8 encoding (variable number of bytes)
* UTF16: UTF16 encoding (2 bytes per character, compatible with UCS-2) * UTF16: UTF16 encoding (2 bytes per character, compatible with UCS-2)