diff options
Diffstat (limited to 'src')
71 files changed, 739 insertions, 724 deletions
diff --git a/src/gadc/gadc_rules.h b/src/gadc/gadc_rules.h index af863765..ec1331f2 100644 --- a/src/gadc/gadc_rules.h +++ b/src/gadc/gadc_rules.h @@ -20,28 +20,28 @@ #if !GFX_USE_GTIMER #if GFX_DISPLAY_RULE_WARNINGS #if GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_DIRECT - #warning "GADC: GFX_USE_GTIMER is required if GFX_USE_GADC is TRUE. It has been turned on for you." + #warning "GADC: GFX_USE_GTIMER is required if GFX_USE_GADC is GFXON. It has been turned on for you." #elif GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_MACRO - COMPILER_WARNING("GADC: GFX_USE_GTIMER is required if GFX_USE_GADC is TRUE. It has been turned on for you.") + COMPILER_WARNING("GADC: GFX_USE_GTIMER is required if GFX_USE_GADC is GFXON. It has been turned on for you.") #endif #endif #undef GFX_USE_GTIMER - #define GFX_USE_GTIMER TRUE + #define GFX_USE_GTIMER GFXON #endif #if !GFX_USE_GQUEUE || !GQUEUE_NEED_GSYNC || !GQUEUE_NEED_BUFFERS #if GFX_DISPLAY_RULE_WARNINGS #if GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_DIRECT - #warning "GADC: GFX_USE_GQUEUE, GQUEUE_NEED_BUFFERS and GQUEUE_NEED_GSYNC are required if GFX_USE_GADC is TRUE. They have been turned on for you." + #warning "GADC: GFX_USE_GQUEUE, GQUEUE_NEED_BUFFERS and GQUEUE_NEED_GSYNC are required if GFX_USE_GADC is GFXON. They have been turned on for you." #elif GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_MACRO - COMPILER_WARNING("GADC: GFX_USE_GQUEUE, GQUEUE_NEED_BUFFERS and GQUEUE_NEED_GSYNC are required if GFX_USE_GADC is TRUE. They have been turned on for you.") + COMPILER_WARNING("GADC: GFX_USE_GQUEUE, GQUEUE_NEED_BUFFERS and GQUEUE_NEED_GSYNC are required if GFX_USE_GADC is GFXON. They have been turned on for you.") #endif #endif #undef GFX_USE_GQUEUE - #define GFX_USE_GQUEUE TRUE + #define GFX_USE_GQUEUE GFXON #undef GQUEUE_NEED_BUFFERS - #define GQUEUE_NEED_BUFFERS TRUE + #define GQUEUE_NEED_BUFFERS GFXON #undef GQUEUE_NEED_GSYNC - #define GQUEUE_NEED_GSYNC TRUE + #define GQUEUE_NEED_GSYNC GFXON #endif #endif diff --git a/src/gaudio/gaudio_options.h b/src/gaudio/gaudio_options.h index d6dfb105..41373c8f 100644 --- a/src/gaudio/gaudio_options.h +++ b/src/gaudio/gaudio_options.h @@ -24,13 +24,13 @@ * @brief Audio Play capability is needed */ #ifndef GAUDIO_NEED_PLAY - #define GAUDIO_NEED_PLAY FALSE + #define GAUDIO_NEED_PLAY GFXOFF #endif /** * @brief Audio Recording capability is needed */ #ifndef GAUDIO_NEED_RECORD - #define GAUDIO_NEED_RECORD FALSE + #define GAUDIO_NEED_RECORD GFXOFF #endif /** * @} diff --git a/src/gaudio/gaudio_rules.h b/src/gaudio/gaudio_rules.h index 7ab587da..71b732b3 100644 --- a/src/gaudio/gaudio_rules.h +++ b/src/gaudio/gaudio_rules.h @@ -18,53 +18,53 @@ #if GFX_USE_GAUDIO #if !GAUDIO_NEED_PLAY && !GAUDIO_NEED_RECORD - #error "GAUDIO: GAUDIO_NEED_PLAY and/or GAUDIO_NEED_RECORD is required if GFX_USE_GAUDIO is TRUE" + #error "GAUDIO: GAUDIO_NEED_PLAY and/or GAUDIO_NEED_RECORD is required if GFX_USE_GAUDIO is GFXON" #endif #if !GFX_USE_GQUEUE #if GFX_DISPLAY_RULE_WARNINGS #if GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_DIRECT - #warning "GAUDIO: GFX_USE_GQUEUE is required if GFX_USE_GAUDIO is TRUE. It has been turned on for you." + #warning "GAUDIO: GFX_USE_GQUEUE is required if GFX_USE_GAUDIO is GFXON. It has been turned on for you." #elif GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_MACRO - COMPILER_WARNING("GAUDIO: GFX_USE_GQUEUE is required if GFX_USE_GAUDIO is TRUE. It has been turned on for you.") + COMPILER_WARNING("GAUDIO: GFX_USE_GQUEUE is required if GFX_USE_GAUDIO is GFXON. It has been turned on for you.") #endif #endif #undef GFX_USE_GQUEUE - #define GFX_USE_GQUEUE TRUE + #define GFX_USE_GQUEUE GFXON #endif #if GAUDIO_NEED_PLAY && !GQUEUE_NEED_ASYNC #if GFX_DISPLAY_RULE_WARNINGS #if GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_DIRECT - #warning "GAUDIO: GQUEUE_NEED_ASYNC is required if GAUDIO_NEED_PLAY is TRUE. It has been turned on for you." + #warning "GAUDIO: GQUEUE_NEED_ASYNC is required if GAUDIO_NEED_PLAY is GFXON. It has been turned on for you." #elif GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_MACRO - COMPILER_WARNING("GAUDIO: GQUEUE_NEED_ASYNC is required if GAUDIO_NEED_PLAY is TRUE. It has been turned on for you.") + COMPILER_WARNING("GAUDIO: GQUEUE_NEED_ASYNC is required if GAUDIO_NEED_PLAY is GFXON. It has been turned on for you.") #endif #endif #undef GQUEUE_NEED_ASYNC - #define GQUEUE_NEED_ASYNC TRUE + #define GQUEUE_NEED_ASYNC GFXON #endif #if !GQUEUE_NEED_GSYNC || !GQUEUE_NEED_BUFFERS #if GFX_DISPLAY_RULE_WARNINGS #if GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_DIRECT - #warning "GAUDIO: GQUEUE_NEED_BUFFERS and GQUEUE_NEED_GSYNC are required if GFX_USE_GAUDIO is TRUE. They have been turned on for you." + #warning "GAUDIO: GQUEUE_NEED_BUFFERS and GQUEUE_NEED_GSYNC are required if GFX_USE_GAUDIO is GFXON. They have been turned on for you." #elif GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_MACRO - COMPILER_WARNING("GAUDIO: GQUEUE_NEED_BUFFERS and GQUEUE_NEED_GSYNC are required if GFX_USE_GAUDIO is TRUE. They have been turned on for you.") + COMPILER_WARNING("GAUDIO: GQUEUE_NEED_BUFFERS and GQUEUE_NEED_GSYNC are required if GFX_USE_GAUDIO is GFXON. They have been turned on for you.") #endif #endif #undef GQUEUE_NEED_BUFFERS - #define GQUEUE_NEED_BUFFERS TRUE + #define GQUEUE_NEED_BUFFERS GFXON #undef GQUEUE_NEED_GSYNC - #define GQUEUE_NEED_GSYNC TRUE + #define GQUEUE_NEED_GSYNC GFXON #endif #if GFX_USE_GEVENT && !GFX_USE_GTIMER #if GFX_DISPLAY_RULE_WARNINGS #if GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_DIRECT - #warning "GAUDIO: GFX_USE_GTIMER is required if GFX_USE_GAUDIO and GFX_USE_GEVENT are TRUE. It has been turned on for you." + #warning "GAUDIO: GFX_USE_GTIMER is required if GFX_USE_GAUDIO and GFX_USE_GEVENT are GFXON. It has been turned on for you." #elif GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_MACRO - COMPILER_WARNING("GAUDIO: GFX_USE_GTIMER is required if GFX_USE_GAUDIO and GFX_USE_GEVENT are TRUE. It has been turned on for you.") + COMPILER_WARNING("GAUDIO: GFX_USE_GTIMER is required if GFX_USE_GAUDIO and GFX_USE_GEVENT are GFXON. It has been turned on for you.") #endif #endif #undef GFX_USE_GTIMER - #define GFX_USE_GTIMER TRUE + #define GFX_USE_GTIMER GFXON #endif #endif diff --git a/src/gdisp/gdisp.c b/src/gdisp/gdisp.c index c2439a16..ad5386fc 100644 --- a/src/gdisp/gdisp.c +++ b/src/gdisp/gdisp.c @@ -42,7 +42,7 @@ GDisplay *GDISP; #define MUTEX_DEINIT(g) #endif -#define NEED_CLIPPING (GDISP_HARDWARE_CLIP != TRUE && (GDISP_NEED_VALIDATION || GDISP_NEED_CLIP)) +#define NEED_CLIPPING (GDISP_HARDWARE_CLIP != GFXON && (GDISP_NEED_VALIDATION || GDISP_NEED_CLIP)) #if !NEED_CLIPPING #define TEST_CLIP_AREA(g) @@ -119,7 +119,7 @@ static GFXINLINE void drawpixel(GDisplay *g) { #endif // Next best is cursor based streaming - #if GDISP_HARDWARE_DRAWPIXEL != TRUE && GDISP_HARDWARE_STREAM_POS && GDISP_HARDWARE_STREAM_WRITE + #if GDISP_HARDWARE_DRAWPIXEL != GFXON && GDISP_HARDWARE_STREAM_POS && GDISP_HARDWARE_STREAM_WRITE #if GDISP_HARDWARE_STREAM_POS == HARDWARE_AUTODETECT if (gvmt(g)->writepos) #endif @@ -133,7 +133,7 @@ static GFXINLINE void drawpixel(GDisplay *g) { #endif // Worst is general streaming - #if GDISP_HARDWARE_DRAWPIXEL != TRUE && GDISP_HARDWARE_STREAM_POS != TRUE && GDISP_HARDWARE_STREAM_WRITE + #if GDISP_HARDWARE_DRAWPIXEL != GFXON && GDISP_HARDWARE_STREAM_POS != GFXON && GDISP_HARDWARE_STREAM_WRITE // The following test is unneeded because we are guaranteed to have streaming if we don't have drawpixel //#if GDISP_HARDWARE_STREAM_WRITE == HARDWARE_AUTODETECT // if (gvmt(g)->writestart) @@ -191,7 +191,7 @@ static GFXINLINE void fillarea(GDisplay *g) { #endif // Next best is hardware streaming - #if GDISP_HARDWARE_FILLS != TRUE && GDISP_HARDWARE_STREAM_WRITE + #if GDISP_HARDWARE_FILLS != GFXON && GDISP_HARDWARE_STREAM_WRITE #if GDISP_HARDWARE_STREAM_WRITE == HARDWARE_AUTODETECT if (gvmt(g)->writestart) #endif @@ -221,7 +221,7 @@ static GFXINLINE void fillarea(GDisplay *g) { #endif // Worst is pixel drawing - #if GDISP_HARDWARE_FILLS != TRUE && GDISP_HARDWARE_STREAM_WRITE != TRUE && GDISP_HARDWARE_DRAWPIXEL + #if GDISP_HARDWARE_FILLS != GFXON && GDISP_HARDWARE_STREAM_WRITE != GFXON && GDISP_HARDWARE_DRAWPIXEL // The following test is unneeded because we are guaranteed to have draw pixel if we don't have streaming //#if GDISP_HARDWARE_DRAWPIXEL == HARDWARE_AUTODETECT // if (gvmt(g)->pixel) @@ -289,7 +289,7 @@ static void hline_clip(GDisplay *g) { #endif // Next best is cursor based streaming - #if GDISP_HARDWARE_FILLS != TRUE && GDISP_HARDWARE_STREAM_POS && GDISP_HARDWARE_STREAM_WRITE + #if GDISP_HARDWARE_FILLS != GFXON && GDISP_HARDWARE_STREAM_POS && GDISP_HARDWARE_STREAM_WRITE #if GDISP_HARDWARE_STREAM_POS == HARDWARE_AUTODETECT if (gvmt(g)->writepos) #endif @@ -304,7 +304,7 @@ static void hline_clip(GDisplay *g) { #endif // Next best is streaming - #if GDISP_HARDWARE_FILLS != TRUE && GDISP_HARDWARE_STREAM_POS != TRUE && GDISP_HARDWARE_STREAM_WRITE + #if GDISP_HARDWARE_FILLS != GFXON && GDISP_HARDWARE_STREAM_POS != GFXON && GDISP_HARDWARE_STREAM_WRITE #if GDISP_HARDWARE_STREAM_WRITE == HARDWARE_AUTODETECT if (gvmt(g)->writestart) #endif @@ -319,7 +319,7 @@ static void hline_clip(GDisplay *g) { #endif // Worst is drawing pixels - #if GDISP_HARDWARE_FILLS != TRUE && GDISP_HARDWARE_STREAM_WRITE != TRUE && GDISP_HARDWARE_DRAWPIXEL + #if GDISP_HARDWARE_FILLS != GFXON && GDISP_HARDWARE_STREAM_WRITE != GFXON && GDISP_HARDWARE_DRAWPIXEL // The following test is unneeded because we are guaranteed to have draw pixel if we don't have streaming //#if GDISP_HARDWARE_DRAWPIXEL == HARDWARE_AUTODETECT // if (gvmt(g)->pixel) @@ -383,7 +383,7 @@ static void vline_clip(GDisplay *g) { #endif // Next best is streaming - #if GDISP_HARDWARE_FILLS != TRUE && GDISP_HARDWARE_STREAM_WRITE + #if GDISP_HARDWARE_FILLS != GFXON && GDISP_HARDWARE_STREAM_WRITE #if GDISP_HARDWARE_STREAM_WRITE == HARDWARE_AUTODETECT if (gvmt(g)->writestart) #endif @@ -410,7 +410,7 @@ static void vline_clip(GDisplay *g) { #endif // Worst is drawing pixels - #if GDISP_HARDWARE_FILLS != TRUE && GDISP_HARDWARE_STREAM_WRITE != TRUE && GDISP_HARDWARE_DRAWPIXEL + #if GDISP_HARDWARE_FILLS != GFXON && GDISP_HARDWARE_STREAM_WRITE != GFXON && GDISP_HARDWARE_DRAWPIXEL // The following test is unneeded because we are guaranteed to have draw pixel if we don't have streaming //#if GDISP_HARDWARE_DRAWPIXEL == HARDWARE_AUTODETECT // if (gvmt(g)->pixel) @@ -770,7 +770,7 @@ void gdispGFlush(GDisplay *g) { #endif // Worst - save the parameters and use pixel drawing and/or area fills - #if GDISP_HARDWARE_STREAM_WRITE != TRUE && GDISP_HARDWARE_DRAWPIXEL + #if GDISP_HARDWARE_STREAM_WRITE != GFXON && GDISP_HARDWARE_DRAWPIXEL // The following test is unneeded because we are guaranteed to have draw pixel if we don't have streaming //#if GDISP_HARDWARE_DRAWPIXEL == HARDWARE_AUTODETECT // if (gvmt(g)->pixel) @@ -816,7 +816,7 @@ void gdispGFlush(GDisplay *g) { #endif // Next best is to use bitfills with our line buffer - #if GDISP_HARDWARE_STREAM_WRITE != TRUE && GDISP_LINEBUF_SIZE != 0 && GDISP_HARDWARE_BITFILLS + #if GDISP_HARDWARE_STREAM_WRITE != GFXON && GDISP_LINEBUF_SIZE != 0 && GDISP_HARDWARE_BITFILLS #if GDISP_HARDWARE_BITFILLS == HARDWARE_AUTODETECT if (gvmt(g)->blit) #endif @@ -856,7 +856,7 @@ void gdispGFlush(GDisplay *g) { #endif // Only slightly better than drawing pixels is to look for runs and use fillarea - #if GDISP_HARDWARE_STREAM_WRITE != TRUE && (GDISP_LINEBUF_SIZE == 0 || GDISP_HARDWARE_BITFILLS != TRUE) && GDISP_HARDWARE_FILLS + #if GDISP_HARDWARE_STREAM_WRITE != GFXON && (GDISP_LINEBUF_SIZE == 0 || GDISP_HARDWARE_BITFILLS != GFXON) && GDISP_HARDWARE_FILLS // We don't need to test for auto-detect on drawpixel as we know we have it because we don't have streaming. #if GDISP_HARDWARE_FILLS == HARDWARE_AUTODETECT if (gvmt(g)->fill) @@ -892,7 +892,7 @@ void gdispGFlush(GDisplay *g) { #endif // Worst is using pixel drawing - #if GDISP_HARDWARE_STREAM_WRITE != TRUE && (GDISP_LINEBUF_SIZE == 0 || GDISP_HARDWARE_BITFILLS != TRUE) && GDISP_HARDWARE_FILLS != TRUE && GDISP_HARDWARE_DRAWPIXEL + #if GDISP_HARDWARE_STREAM_WRITE != GFXON && (GDISP_LINEBUF_SIZE == 0 || GDISP_HARDWARE_BITFILLS != GFXON) && GDISP_HARDWARE_FILLS != GFXON && GDISP_HARDWARE_DRAWPIXEL // The following test is unneeded because we are guaranteed to have draw pixel if we don't have streaming //#if GDISP_HARDWARE_DRAWPIXEL == HARDWARE_AUTODETECT // if (gvmt(g)->pixel) @@ -934,7 +934,7 @@ void gdispGFlush(GDisplay *g) { } #endif - #if GDISP_HARDWARE_STREAM_WRITE != TRUE && GDISP_LINEBUF_SIZE != 0 && GDISP_HARDWARE_BITFILLS + #if GDISP_HARDWARE_STREAM_WRITE != GFXON && GDISP_LINEBUF_SIZE != 0 && GDISP_HARDWARE_BITFILLS #if GDISP_HARDWARE_BITFILLS == HARDWARE_AUTODETECT if (gvmt(g)->blit) #endif @@ -951,7 +951,7 @@ void gdispGFlush(GDisplay *g) { } #endif - #if GDISP_HARDWARE_STREAM_WRITE != TRUE && (GDISP_LINEBUF_SIZE == 0 || GDISP_HARDWARE_BITFILLS != TRUE) && GDISP_HARDWARE_FILLS + #if GDISP_HARDWARE_STREAM_WRITE != GFXON && (GDISP_LINEBUF_SIZE == 0 || GDISP_HARDWARE_BITFILLS != GFXON) && GDISP_HARDWARE_FILLS // We don't need to test for auto-detect on drawpixel as we know we have it because we don't have streaming. #if GDISP_HARDWARE_FILLS == HARDWARE_AUTODETECT if (gvmt(g)->fill) @@ -969,7 +969,7 @@ void gdispGFlush(GDisplay *g) { } #endif - #if GDISP_HARDWARE_STREAM_WRITE != TRUE && (GDISP_LINEBUF_SIZE == 0 || GDISP_HARDWARE_BITFILLS != TRUE) && GDISP_HARDWARE_FILLS != TRUE + #if GDISP_HARDWARE_STREAM_WRITE != GFXON && (GDISP_LINEBUF_SIZE == 0 || GDISP_HARDWARE_BITFILLS != GFXON) && GDISP_HARDWARE_FILLS != GFXON { autoflush_stopdone(g); MUTEX_EXIT(g); @@ -1019,7 +1019,7 @@ void gdispGClear(GDisplay *g, color_t color) { #endif // Next best is hardware accelerated area fill - #if GDISP_HARDWARE_CLEARS != TRUE && GDISP_HARDWARE_FILLS + #if GDISP_HARDWARE_CLEARS != GFXON && GDISP_HARDWARE_FILLS #if GDISP_HARDWARE_FILLS == HARDWARE_AUTODETECT if (gvmt(g)->fill) #endif @@ -1036,7 +1036,7 @@ void gdispGClear(GDisplay *g, color_t color) { #endif // Next best is streaming - #if GDISP_HARDWARE_CLEARS != TRUE && GDISP_HARDWARE_FILLS != TRUE && GDISP_HARDWARE_STREAM_WRITE + #if GDISP_HARDWARE_CLEARS != GFXON && GDISP_HARDWARE_FILLS != GFXON && GDISP_HARDWARE_STREAM_WRITE #if GDISP_HARDWARE_STREAM_WRITE == HARDWARE_AUTODETECT if (gvmt(g)->writestart) #endif @@ -1066,7 +1066,7 @@ void gdispGClear(GDisplay *g, color_t color) { #endif // Worst is drawing pixels - #if GDISP_HARDWARE_CLEARS != TRUE && GDISP_HARDWARE_FILLS != TRUE && GDISP_HARDWARE_STREAM_WRITE != TRUE && GDISP_HARDWARE_DRAWPIXEL + #if GDISP_HARDWARE_CLEARS != GFXON && GDISP_HARDWARE_FILLS != GFXON && GDISP_HARDWARE_STREAM_WRITE != GFXON && GDISP_HARDWARE_DRAWPIXEL // The following test is unneeded because we are guaranteed to have draw pixel if we don't have streaming //#if GDISP_HARDWARE_DRAWPIXEL == HARDWARE_AUTODETECT // if (gvmt(g)->pixel) @@ -1137,7 +1137,7 @@ void gdispGBlitArea(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, c #endif // Next best is hardware streaming - #if GDISP_HARDWARE_BITFILLS != TRUE && GDISP_HARDWARE_STREAM_WRITE + #if GDISP_HARDWARE_BITFILLS != GFXON && GDISP_HARDWARE_STREAM_WRITE #if GDISP_HARDWARE_STREAM_WRITE == HARDWARE_AUTODETECT if (gvmt(g)->writestart) #endif @@ -1173,7 +1173,7 @@ void gdispGBlitArea(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, c #endif // Only slightly better than drawing pixels is to look for runs and use fill area - #if GDISP_HARDWARE_BITFILLS != TRUE && GDISP_HARDWARE_STREAM_WRITE != TRUE && GDISP_HARDWARE_FILLS + #if GDISP_HARDWARE_BITFILLS != GFXON && GDISP_HARDWARE_STREAM_WRITE != GFXON && GDISP_HARDWARE_FILLS // We don't need to test for auto-detect on drawpixel as we know we have it because we don't have streaming. #if GDISP_HARDWARE_FILLS == HARDWARE_AUTODETECT if (gvmt(g)->fill) @@ -1208,7 +1208,7 @@ void gdispGBlitArea(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, c #endif // Worst is drawing pixels - #if GDISP_HARDWARE_BITFILLS != TRUE && GDISP_HARDWARE_STREAM_WRITE != TRUE && GDISP_HARDWARE_FILLS != TRUE && GDISP_HARDWARE_DRAWPIXEL + #if GDISP_HARDWARE_BITFILLS != GFXON && GDISP_HARDWARE_STREAM_WRITE != GFXON && GDISP_HARDWARE_FILLS != GFXON && GDISP_HARDWARE_DRAWPIXEL // The following test is unneeded because we are guaranteed to have draw pixel if we don't have streaming //#if GDISP_HARDWARE_DRAWPIXEL == HARDWARE_AUTODETECT // if (gvmt(g)->pixel) @@ -1255,7 +1255,7 @@ void gdispGBlitArea(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, c #endif // Worst is using software clipping - #if GDISP_HARDWARE_CLIP != TRUE + #if GDISP_HARDWARE_CLIP != GFXON { if (x < 0) { cx += x; x = 0; } if (y < 0) { cy += y; y = 0; } @@ -2603,7 +2603,7 @@ void gdispGBlitArea(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, c return c; } #endif - #if GDISP_HARDWARE_PIXELREAD != TRUE && GDISP_HARDWARE_STREAM_READ + #if GDISP_HARDWARE_PIXELREAD != GFXON && GDISP_HARDWARE_STREAM_READ #if GDISP_HARDWARE_STREAM_READ == HARDWARE_AUTODETECT if (gvmt(g)->readcolor) #endif @@ -2620,7 +2620,7 @@ void gdispGBlitArea(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, c return c; } #endif - #if GDISP_HARDWARE_PIXELREAD != TRUE && GDISP_HARDWARE_STREAM_READ != TRUE + #if GDISP_HARDWARE_PIXELREAD != GFXON && GDISP_HARDWARE_STREAM_READ != GFXON #if !GDISP_HARDWARE_PIXELREAD && !GDISP_HARDWARE_STREAM_READ // Worst is "not possible" #error "GDISP: GDISP_NEED_PIXELREAD has been set but there is no hardware support for reading the display" @@ -2634,7 +2634,7 @@ void gdispGBlitArea(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, c #if GDISP_NEED_SCROLL void gdispGVerticalScroll(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, int lines, color_t bgcolor) { coord_t abslines; - #if GDISP_HARDWARE_SCROLL != TRUE + #if GDISP_HARDWARE_SCROLL != GFXON coord_t fy, dy, ix, fx, i, j; #endif @@ -2682,7 +2682,7 @@ void gdispGBlitArea(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, c #endif // Scroll Emulation - #if GDISP_HARDWARE_SCROLL != TRUE + #if GDISP_HARDWARE_SCROLL != GFXON { cy -= abslines; if (lines < 0) { @@ -2726,7 +2726,7 @@ void gdispGBlitArea(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, c #endif // Next best line read is single pixel reads - #if GDISP_HARDWARE_STREAM_READ != TRUE && GDISP_HARDWARE_PIXELREAD + #if GDISP_HARDWARE_STREAM_READ != GFXON && GDISP_HARDWARE_PIXELREAD #if GDISP_HARDWARE_PIXELREAD == HARDWARE_AUTODETECT if (gvmt(g)->get) #endif @@ -2775,7 +2775,7 @@ void gdispGBlitArea(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, c #endif // Next best line write is hardware streaming - #if GDISP_HARDWARE_BITFILLS != TRUE && GDISP_HARDWARE_STREAM_WRITE + #if GDISP_HARDWARE_BITFILLS != GFXON && GDISP_HARDWARE_STREAM_WRITE #if GDISP_HARDWARE_STREAM_WRITE == HARDWARE_AUTODETECT if (gvmt(g)->writestart) #endif @@ -2800,7 +2800,7 @@ void gdispGBlitArea(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, c #endif // Next best line write is drawing pixels in combination with filling - #if GDISP_HARDWARE_BITFILLS != TRUE && GDISP_HARDWARE_STREAM_WRITE != TRUE && GDISP_HARDWARE_FILLS && GDISP_HARDWARE_DRAWPIXEL + #if GDISP_HARDWARE_BITFILLS != GFXON && GDISP_HARDWARE_STREAM_WRITE != GFXON && GDISP_HARDWARE_FILLS && GDISP_HARDWARE_DRAWPIXEL // We don't need to test for auto-detect on drawpixel as we know we have it because we don't have streaming. #if GDISP_HARDWARE_FILLS == HARDWARE_AUTODETECT if (gvmt(g)->fill) @@ -2832,7 +2832,7 @@ void gdispGBlitArea(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, c #endif // Worst line write is drawing pixels - #if GDISP_HARDWARE_BITFILLS != TRUE && GDISP_HARDWARE_STREAM_WRITE != TRUE && GDISP_HARDWARE_FILLS != TRUE && GDISP_HARDWARE_DRAWPIXEL + #if GDISP_HARDWARE_BITFILLS != GFXON && GDISP_HARDWARE_STREAM_WRITE != GFXON && GDISP_HARDWARE_FILLS != GFXON && GDISP_HARDWARE_DRAWPIXEL // The following test is unneeded because we are guaranteed to have draw pixel if we don't have streaming //#if GDISP_HARDWARE_DRAWPIXEL == HARDWARE_AUTODETECT // if (gvmt(g)->pixel) @@ -2906,7 +2906,7 @@ void gdispGBlitArea(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, c #endif // Worst is software clipping - #if GDISP_HARDWARE_CLIP != TRUE + #if GDISP_HARDWARE_CLIP != GFXON { g->clipx0 = 0; g->clipy0 = 0; diff --git a/src/gdisp/gdisp.h b/src/gdisp/gdisp.h index 4a097604..5bf2b284 100644 --- a/src/gdisp/gdisp.h +++ b/src/gdisp/gdisp.h @@ -15,7 +15,7 @@ * * @details The GDISP module provides high level abstraction to interface pixel oriented graphic displays. * - * @pre GFX_USE_GDISP must be set to TRUE in gfxconf.h + * @pre GFX_USE_GDISP must be set to GFXON in gfxconf.h * * @note Each drawing routine supports a gdispXXXX and a gdispGXXXX function. The difference is that the * gdispXXXX function does not require a display to be specified. Note there is a slight anomaly @@ -30,7 +30,7 @@ #include "../../gfx.h" /* This type definition is defined here as it gets used in other gfx sub-systems even - * if GFX_USE_GDISP is FALSE. + * if GFX_USE_GDISP is GFXOFF. */ /** @@ -201,15 +201,15 @@ extern GDisplay *GDISP; * @note Packed pixels are not really supported at this point. */ #ifndef GDISP_PACKED_PIXELS - #define GDISP_PACKED_PIXELS FALSE + #define GDISP_PACKED_PIXELS GFXOFF #endif /** * @brief Do lines of pixels require packing for a blit - * @note Ignored if GDISP_PACKED_PIXELS is FALSE + * @note Ignored if GDISP_PACKED_PIXELS is GFXOFF */ #ifndef GDISP_PACKED_LINES - #define GDISP_PACKED_LINES FALSE + #define GDISP_PACKED_LINES GFXOFF #endif /** @} */ @@ -377,7 +377,7 @@ uint8_t gdispGGetContrast(GDisplay *g); * know your controller does not need to be flushed there is no * need to call it (which is in reality most controllers). * @note Even for displays that require flushing, there is no need to - * call this function if GDISP_NEED_AUTOFLUSH is TRUE. + * call this function if GDISP_NEED_AUTOFLUSH is GFXON. * Calling it again won't hurt though. * * @@ -478,7 +478,7 @@ void gdispGDrawBox(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, co /** * @brief Start a streaming operation. * @details Stream data to a window on the display sequentially and very fast. - * @pre GDISP_NEED_STREAMING must be TRUE in your gfxconf.h + * @pre GDISP_NEED_STREAMING must be GFXON in your gfxconf.h * @note While streaming is in operation - no other calls to GDISP functions * can be made (with the exception of @p gdispBlendColor() and streaming * functions). If a call is made (eg in a multi-threaded application) the other @@ -505,7 +505,7 @@ void gdispGDrawBox(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, co /** * @brief Send pixel data to the stream. * @details Write a pixel to the next position in the streamed area and increment the position - * @pre GDISP_NEED_STREAMING must be TRUE in your gfxconf.h + * @pre GDISP_NEED_STREAMING must be GFXON in your gfxconf.h * @pre @p gdispStreamStart() has been called. * @note If the gdispStreamStart() has not been called (or failed due to clipping), the * data provided here is simply thrown away. @@ -521,7 +521,7 @@ void gdispGDrawBox(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, co /** * @brief Finish the current streaming operation. * @details Completes the current streaming operation and allows other GDISP calls to operate again. - * @pre GDISP_NEED_STREAMING must be TRUE in your gfxconf.h + * @pre GDISP_NEED_STREAMING must be GFXON in your gfxconf.h * @pre @p gdispStreamStart() has been called. * @note If the gdispStreamStart() has not been called (or failed due to clipping), this * call is simply ignored. @@ -539,7 +539,7 @@ void gdispGDrawBox(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, co #if GDISP_NEED_CLIP || defined(__DOXYGEN__) /** * @brief Clip all drawing to the defined area. - * @pre GDISP_NEED_CLIP must be TRUE in your gfxconf.h + * @pre GDISP_NEED_CLIP must be GFXON in your gfxconf.h * * @param[in] g The display to use * @param[in] x,y The start position @@ -556,7 +556,7 @@ void gdispGDrawBox(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, co #if GDISP_NEED_CIRCLE || defined(__DOXYGEN__) /** * @brief Draw a circle. - * @pre GDISP_NEED_CIRCLE must be TRUE in your gfxconf.h + * @pre GDISP_NEED_CIRCLE must be GFXON in your gfxconf.h * * @param[in] g The display to use * @param[in] x,y The center of the circle @@ -570,7 +570,7 @@ void gdispGDrawBox(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, co /** * @brief Draw a filled circle. - * @pre GDISP_NEED_CIRCLE must be TRUE in your gfxconf.h + * @pre GDISP_NEED_CIRCLE must be GFXON in your gfxconf.h * * @param[in] g The display to use * @param[in] x,y The center of the circle @@ -586,7 +586,7 @@ void gdispGDrawBox(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, co #if GDISP_NEED_DUALCIRCLE || defined(__DOXYGEN__) /** * @brief Draw two filled circles with the same centre. - * @pre GDISP_NEED_DUALCIRCLE must be TRUE in your gfxconf.h + * @pre GDISP_NEED_DUALCIRCLE must be GFXON in your gfxconf.h * * @param[in] g The display to use * @param[in] x,y The center of the circle @@ -606,7 +606,7 @@ void gdispGDrawBox(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, co #if GDISP_NEED_ELLIPSE || defined(__DOXYGEN__) /** * @brief Draw an ellipse. - * @pre GDISP_NEED_ELLIPSE must be TRUE in your gfxconf.h + * @pre GDISP_NEED_ELLIPSE must be GFXON in your gfxconf.h * * @param[in] g The display to use * @param[in] x,y The center of the ellipse @@ -620,7 +620,7 @@ void gdispGDrawBox(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, co /** * @brief Draw a filled ellipse. - * @pre GDISP_NEED_ELLIPSE must be TRUE in your gfxconf.h + * @pre GDISP_NEED_ELLIPSE must be GFXON in your gfxconf.h * * @param[in] g The display to use * @param[in] x,y The center of the ellipse @@ -637,7 +637,7 @@ void gdispGDrawBox(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, co #if GDISP_NEED_ARCSECTORS || defined(__DOXYGEN__) /** * @brief Draw a selection of 45 degree arcs of a circle - * @pre GDISP_NEED_ARCSECTORS must be TRUE in your gfxconf.h + * @pre GDISP_NEED_ARCSECTORS must be GFXON in your gfxconf.h * * @param[in] g The display to use * @param[in] x,y The center of the circle @@ -666,7 +666,7 @@ void gdispGDrawBox(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, co /** * @brief Fill a selection of 45 degree arcs of a circle - * @pre GDISP_NEED_ARCSECTORS must be TRUE in your gfxconf.h + * @pre GDISP_NEED_ARCSECTORS must be GFXON in your gfxconf.h * * @param[in] g The display to use * @param[in] x,y The center of the circle @@ -697,7 +697,7 @@ void gdispGDrawBox(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, co #if GDISP_NEED_ARC || defined(__DOXYGEN__) /** * @brief Draw an arc. - * @pre GDISP_NEED_ARC must be TRUE in your gfxconf.h + * @pre GDISP_NEED_ARC must be GFXON in your gfxconf.h * * @param[in] g The display to use * @param[in] x,y The center point @@ -722,7 +722,7 @@ void gdispGDrawBox(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, co /** * @brief Draw a thick arc. - * @pre GDISP_NEED_ARC must be TRUE in your gfxconf.h + * @pre GDISP_NEED_ARC must be GFXON in your gfxconf.h * * @param[in] g The display to use * @param[in] xc,yc The center point @@ -747,7 +747,7 @@ void gdispGDrawBox(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, co /** * @brief Draw a filled arc. - * @pre GDISP_NEED_ARC must be TRUE in your gfxconf.h + * @pre GDISP_NEED_ARC must be GFXON in your gfxconf.h * * @param[in] g The display to use * @param[in] x,y The center point @@ -777,7 +777,7 @@ void gdispGDrawBox(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, co /** * @brief Get the color of a pixel. * @return The color of the pixel. - * @pre GDISP_NEED_PIXELREAD must be TRUE in your gfxconf.h + * @pre GDISP_NEED_PIXELREAD must be GFXON in your gfxconf.h * * @param[in] g The display to use * @param[in] x,y The position of the pixel @@ -793,7 +793,7 @@ void gdispGDrawBox(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, co #if GDISP_NEED_SCROLL || defined(__DOXYGEN__) /** * @brief Scroll vertically a section of the screen. - * @pre GDISP_NEED_SCROLL must be set to TRUE in gfxconf.h + * @pre GDISP_NEED_SCROLL must be set to GFXON in gfxconf.h * @note Optional. * @note If lines is >= cy, it is equivelent to an area fill with bgcolor. * @@ -814,7 +814,7 @@ void gdispGDrawBox(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, co #if GDISP_NEED_CONTROL || defined(__DOXYGEN__) /** * @brief Control hardware specific parts of the display. eg powermodes, backlight etc - * @pre GDISP_NEED_CONTROL must be TRUE in your gfxconf.h + * @pre GDISP_NEED_CONTROL must be GFXON in your gfxconf.h * @note Depending on the hardware implementation this function may not * support some codes. They will be ignored. * @@ -833,7 +833,7 @@ void gdispGDrawBox(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, co #if GDISP_NEED_QUERY || defined(__DOXYGEN__) /** * @brief Query a property of the display. - * @pre GDISP_NEED_QUERY must be TRUE in your gfxconf.h + * @pre GDISP_NEED_QUERY must be GFXON in your gfxconf.h * @note The result must be typecast to the correct type. * @note An unsupported query will return (void *)-1. * @@ -849,7 +849,7 @@ void gdispGDrawBox(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, co #if GDISP_NEED_CONVEX_POLYGON || defined(__DOXYGEN__) /** * @brief Draw an enclosed polygon (convex, non-convex or complex). - * @pre GDISP_NEED_CONVEX_POLYGON must be TRUE in your gfxconf.h + * @pre GDISP_NEED_CONVEX_POLYGON must be GFXON in your gfxconf.h * * @param[in] g The display to use * @param[in] tx, ty Transform all points in pntarray by tx, ty @@ -865,7 +865,7 @@ void gdispGDrawBox(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, co /** * @brief Fill a convex polygon * @details Doesn't handle non-convex or complex polygons. - * @pre GDISP_NEED_CONVEX_POLYGON must be TRUE in your gfxconf.h + * @pre GDISP_NEED_CONVEX_POLYGON must be GFXON in your gfxconf.h * * @param[in] g The display to use * @param[in] tx, ty Transform all points in pntarray by tx, ty @@ -890,7 +890,7 @@ void gdispGDrawBox(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, co * @brief Draw a line with a specified thickness * @details The line thickness is specified in pixels. The line ends can * be selected to be either flat or round. - * @pre GDISP_NEED_CONVEX_POLYGON must be TRUE in your gfxconf.h + * @pre GDISP_NEED_CONVEX_POLYGON must be GFXON in your gfxconf.h * @note Uses gdispGFillConvexPoly() internally to perform the drawing. * * @param[in] g The display to use @@ -911,7 +911,7 @@ void gdispGDrawBox(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, co #if GDISP_NEED_TEXT || defined(__DOXYGEN__) /** * @brief Draw a text character. - * @pre GDISP_NEED_TEXT must be TRUE in your gfxconf.h + * @pre GDISP_NEED_TEXT must be GFXON in your gfxconf.h * * @param[in] g The display to use * @param[in] x,y The position for the text @@ -926,7 +926,7 @@ void gdispGDrawBox(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, co /** * @brief Draw a text character with a filled background. - * @pre GDISP_NEED_TEXT must be TRUE in your gfxconf.h + * @pre GDISP_NEED_TEXT must be GFXON in your gfxconf.h * * @param[in] g The display to use * @param[in] x,y The position for the text @@ -942,7 +942,7 @@ void gdispGDrawBox(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, co /** * @brief Draw a text string. - * @pre GDISP_NEED_TEXT must be TRUE in your gfxconf.h + * @pre GDISP_NEED_TEXT must be GFXON in your gfxconf.h * * @param[in] g The display to use * @param[in] x,y The position for the text @@ -957,7 +957,7 @@ void gdispGDrawBox(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, co /** * @brief Draw a text string. - * @pre GDISP_NEED_TEXT must be TRUE in your gfxconf.h + * @pre GDISP_NEED_TEXT must be GFXON in your gfxconf.h * * @param[in] g The display to use * @param[in] x,y The position for the text @@ -973,7 +973,7 @@ void gdispGDrawBox(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, co /** * @brief Draw a text string vertically centered within the specified box. - * @pre GDISP_NEED_TEXT must be TRUE in your gfxconf.h + * @pre GDISP_NEED_TEXT must be GFXON in your gfxconf.h * * @param[in] g The display to use * @param[in] x,y The position for the text (need to define top-right or base-line - check code) @@ -990,7 +990,7 @@ void gdispGDrawBox(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, co /** * @brief Draw a text string vertically centered within the specified box. The box background is filled with the specified background color. - * @pre GDISP_NEED_TEXT must be TRUE in your gfxconf.h + * @pre GDISP_NEED_TEXT must be GFXON in your gfxconf.h * @note The entire box is filled * * @param[in] g The display to use @@ -1010,7 +1010,7 @@ void gdispGDrawBox(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, co /** * @brief Get a metric of a font. * @return The metric requested in pixels. - * @pre GDISP_NEED_TEXT must be TRUE in your gfxconf.h + * @pre GDISP_NEED_TEXT must be GFXON in your gfxconf.h * * @param[in] font The font to test * @param[in] metric The metric to measure @@ -1022,7 +1022,7 @@ void gdispGDrawBox(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, co /** * @brief Get the pixel width of a character. * @return The width of the character in pixels. Does not include any between character padding. - * @pre GDISP_NEED_TEXT must be TRUE in your gfxconf.h + * @pre GDISP_NEED_TEXT must be GFXON in your gfxconf.h * * @param[in] c The character to draw * @param[in] font The font to use @@ -1034,7 +1034,7 @@ void gdispGDrawBox(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, co /** * @brief Get the pixel width of a string of a given character length. * @return The width of the string in pixels. - * @pre GDISP_NEED_TEXT must be TRUE in your gfxconf.h + * @pre GDISP_NEED_TEXT must be GFXON in your gfxconf.h * * @note Passing 0 to count has the same effect as calling gdispGetStringWidt() * @@ -1049,7 +1049,7 @@ void gdispGDrawBox(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, co /** * @brief Get the pixel width of an entire string. * @return The width of the string in pixels. - * @pre GDISP_NEED_TEXT must be TRUE in your gfxconf.h + * @pre GDISP_NEED_TEXT must be GFXON in your gfxconf.h * * @param[in] str The string to measure * @param[in] font The font to use @@ -1062,7 +1062,7 @@ void gdispGDrawBox(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, co * @brief Find a font and return it. * @details The supplied name is matched against the font name. A '*' will replace 0 or more characters. * @return Returns a font or NULL if no matching font could be found. - * @pre GDISP_NEED_TEXT must be TRUE in your gfxconf.h + * @pre GDISP_NEED_TEXT must be GFXON in your gfxconf.h * * @param[in] name The font name to find. * @@ -1074,7 +1074,7 @@ void gdispGDrawBox(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, co /** * @brief Release a font after use. - * @pre GDISP_NEED_TEXT must be TRUE in your gfxconf.h + * @pre GDISP_NEED_TEXT must be GFXON in your gfxconf.h * * @param[in] font The font to release. * @@ -1086,7 +1086,7 @@ void gdispGDrawBox(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, co * @brief Make a scaled copy of an existing font. * @details Allocates memory for new font metadata using gfxAlloc, remember to close font after use! * @return A new font or NULL if out of memory. - * @pre GDISP_NEED_TEXT must be TRUE in your gfxconf.h + * @pre GDISP_NEED_TEXT must be GFXON in your gfxconf.h * @note A scaled font should probably not be added to the font list as it will prevent the * unscaled font of the same name being found as it will be the scaled version that will be found. * @@ -1099,7 +1099,7 @@ void gdispGDrawBox(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, co /** * @brief Get the name of the specified font. * @returns The name of the font. - * @pre GDISP_NEED_TEXT must be TRUE in your gfxconf.h + * @pre GDISP_NEED_TEXT must be GFXON in your gfxconf.h * * @param[in] font The font to get the name for. * @@ -1110,7 +1110,7 @@ void gdispGDrawBox(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, co /** * @brief Add a font permanently to the font list. * @returns TRUE on success. Reasons it may fail: out of memory, if it is already on the list, it is not a font loaded in RAM. - * @pre GDISP_NEED_TEXT must be TRUE in your gfxconf.h + * @pre GDISP_NEED_TEXT must be GFXON in your gfxconf.h * * @param[in] font The font to add to the font list. * @@ -1124,7 +1124,7 @@ void gdispGDrawBox(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, co #if GDISP_NEED_ARC || GDISP_NEED_ARCSECTORS || defined(__DOXYGEN__) /** * @brief Draw a rectangular box with rounded corners - * @pre GDISP_NEED_ARC or GDISP_NEED_ARCSECTORS must be TRUE in your gfxconf.h + * @pre GDISP_NEED_ARC or GDISP_NEED_ARCSECTORS must be GFXON in your gfxconf.h * * @param[in] g The display to use * @param[in] x,y The start position @@ -1139,7 +1139,7 @@ void gdispGDrawBox(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, co /** * @brief Draw a filled rectangular box with rounded corners - * @pre GDISP_NEED_ARC or GDISP_NEED_ARCSECTORS must be TRUE in your gfxconf.h + * @pre GDISP_NEED_ARC or GDISP_NEED_ARCSECTORS must be GFXON in your gfxconf.h * * @param[in] g The display to use * @param[in] x,y The start position diff --git a/src/gdisp/gdisp_colors.h b/src/gdisp/gdisp_colors.h index 0973e561..bf1a3f3b 100644 --- a/src/gdisp/gdisp_colors.h +++ b/src/gdisp/gdisp_colors.h @@ -80,30 +80,55 @@ typedef uint16_t colorformat; * @name Some basic colors * @{ */ -#define White HTML2COLOR(0xFFFFFF) -#define Black HTML2COLOR(0x000000) -#define Gray HTML2COLOR(0x808080) -#define Grey Gray -#define Blue HTML2COLOR(0x0000FF) -#define Red HTML2COLOR(0xFF0000) -#define Fuchsia HTML2COLOR(0xFF00FF) -#define Magenta Fuchsia -#define Green HTML2COLOR(0x008000) -#define Yellow HTML2COLOR(0xFFFF00) -#define Aqua HTML2COLOR(0x00FFFF) -#define Cyan Aqua -#define Lime HTML2COLOR(0x00FF00) -#define Maroon HTML2COLOR(0x800000) -#define Navy HTML2COLOR(0x000080) -#define Olive HTML2COLOR(0x808000) -#define Purple HTML2COLOR(0x800080) -#define Silver HTML2COLOR(0xC0C0C0) -#define Teal HTML2COLOR(0x008080) -#define Orange HTML2COLOR(0xFFA500) -#define Pink HTML2COLOR(0xFFC0CB) -#define SkyBlue HTML2COLOR(0x87CEEB) +#define GFXWHITE HTML2COLOR(0xFFFFFF) +#define GFXBLACK HTML2COLOR(0x000000) +#define GFXGRAY HTML2COLOR(0x808080) +#define GFXGREY GFXGRAY +#define GFXBLUE HTML2COLOR(0x0000FF) +#define GFXRED HTML2COLOR(0xFF0000) +#define GFXFUCHSIA HTML2COLOR(0xFF00FF) +#define GFXMAGENTA GFXFUCHSIA +#define GFXGREEN HTML2COLOR(0x008000) +#define GFXYELLOW HTML2COLOR(0xFFFF00) +#define GFXAQUA HTML2COLOR(0x00FFFF) +#define GFXCYAN GFXAQUA +#define GFXLIME HTML2COLOR(0x00FF00) +#define GFXMAROON HTML2COLOR(0x800000) +#define GFXNAVY HTML2COLOR(0x000080) +#define GFXOLIVE HTML2COLOR(0x808000) +#define GFXPURPLE HTML2COLOR(0x800080) +#define GFXSILVER HTML2COLOR(0xC0C0C0) +#define GFXTEAL HTML2COLOR(0x008080) +#define GFXORANGE HTML2COLOR(0xFFA500) +#define GFXPINK HTML2COLOR(0xFFC0CB) +#define GFXSKYBLUE HTML2COLOR(0x87CEEB) /** @} */ +#if GFX_COMPAT_V2 && GFX_COMPAT_OLDCOLORS + #define White GFXWHITE + #define Black GFXBLACK + #define Gray GFXGRAY + #define Grey GFXGREY + #define Blue GFXBLUE + #define Red GFXRED + #define Fuchsia GFXFUCHSIA + #define Magenta GFXMAGENTA + #define Green GFXGREEN + #define Yellow GFXYELLOW + #define Aqua GFXAQUA + #define Cyan GFXCYAN + #define Lime GFXLIME + #define Maroon GFXMAROON + #define Navy GFXNAVY + #define Olive GFXOLIVE + #define Purple GFXPURPLE + #define Silver GFXSILVER + #define Teal GFXTEAL + #define Orange GFXORANGE + #define Pink GFXPINK + #define SkyBlue GFXSKYBLUE +#endif + #if defined(__DOXYGEN__) /** * @brief The color system (grayscale, palette or truecolor) @@ -138,7 +163,7 @@ typedef uint16_t colorformat; /** * @brief Does the color need masking to remove invalid bits */ - #define COLOR_NEEDS_MASK FALSE + #define COLOR_NEEDS_MASK GFXOFF /** * @brief If the color needs masking to remove invalid bits, this is the mask @@ -248,9 +273,9 @@ typedef uint16_t colorformat; #error "GDISP: Cannot define color types with more than 32 bits" #endif #if COLOR_TYPE_BITS == COLOR_BITS - #define COLOR_NEEDS_MASK FALSE + #define COLOR_NEEDS_MASK GFXOFF #else - #define COLOR_NEEDS_MASK TRUE + #define COLOR_NEEDS_MASK GFXON #endif #define COLOR_MASK() ((1 << COLOR_BITS)-1) @@ -363,9 +388,9 @@ typedef uint16_t colorformat; #error "GDISP: Cannot define gray-scale color types with more than 8 bits" #endif #if COLOR_TYPE_BITS == COLOR_BITS - #define COLOR_NEEDS_MASK FALSE + #define COLOR_NEEDS_MASK GFXOFF #else - #define COLOR_NEEDS_MASK TRUE + #define COLOR_NEEDS_MASK GFXON #endif #define COLOR_MASK() ((1 << COLOR_BITS)-1) diff --git a/src/gdisp/gdisp_driver.h b/src/gdisp/gdisp_driver.h index 09a12b06..14e019ff 100644 --- a/src/gdisp/gdisp_driver.h +++ b/src/gdisp/gdisp_driver.h @@ -23,28 +23,28 @@ // Are we currently compiling the driver itself? #if defined(GDISP_DRIVER_VMT) - #define IN_DRIVER TRUE + #define IN_DRIVER GFXON #else - #define IN_DRIVER FALSE + #define IN_DRIVER GFXOFF #endif // Is this a multiple driver situation? #if defined(GDISP_DRIVER_LIST) - #define IS_MULTIPLE TRUE + #define IS_MULTIPLE GFXON #else - #define IS_MULTIPLE FALSE + #define IS_MULTIPLE GFXOFF #endif // Do we need to use VMT calling rather than direct calls to the driver? #if IS_MULTIPLE || GDISP_NEED_PIXMAP - #define USE_VMT TRUE + #define USE_VMT GFXON #else - #define USE_VMT FALSE + #define USE_VMT GFXOFF #endif // Are we in the pixmap virtual driver #ifndef IN_PIXMAP_DRIVER - #define IN_PIXMAP_DRIVER FALSE + #define IN_PIXMAP_DRIVER GFXOFF #endif //------------------------------------------------------------------------------------------------------------ @@ -57,7 +57,7 @@ #define HARDWARE_DEFAULT HARDWARE_AUTODETECT #else // The default is not to include code functions that aren't needed - #define HARDWARE_DEFAULT FALSE + #define HARDWARE_DEFAULT GFXOFF #endif //------------------------------------------------------------------------------------------------------------ @@ -68,7 +68,7 @@ */ /** * @brief The display hardware can benefit from being de-initialized when usage is complete. - * @details Can be set to TRUE, FALSE or HARDWARE_AUTODETECT + * @details Can be set to GFXON, GFXOFF or HARDWARE_AUTODETECT * * @note HARDWARE_AUTODETECT is only meaningful when GDISP_DRIVER_LIST is defined * @note This is most useful for displays such as remote network displays. @@ -79,7 +79,7 @@ /** * @brief The display hardware can benefit from being flushed. - * @details Can be set to TRUE, FALSE or HARDWARE_AUTODETECT + * @details Can be set to GFXON, GFXOFF or HARDWARE_AUTODETECT * * @note HARDWARE_AUTODETECT is only meaningful when GDISP_DRIVER_LIST is defined * @note Some controllers ** require ** the application to flush @@ -90,7 +90,7 @@ /** * @brief Hardware streaming writing is supported. - * @details Can be set to TRUE, FALSE or HARDWARE_AUTODETECT + * @details Can be set to GFXON, GFXOFF or HARDWARE_AUTODETECT * * @note HARDWARE_AUTODETECT is only meaningful when GDISP_DRIVER_LIST is defined * @note Either GDISP_HARDWARE_STREAM_WRITE or GDISP_HARDWARE_DRAWPIXEL must be provided by each driver @@ -101,7 +101,7 @@ /** * @brief Hardware streaming reading of the display surface is supported. - * @details Can be set to TRUE, FALSE or HARDWARE_AUTODETECT + * @details Can be set to GFXON, GFXOFF or HARDWARE_AUTODETECT * * @note HARDWARE_AUTODETECT is only meaningful when GDISP_DRIVER_LIST is defined * @@ -112,7 +112,7 @@ /** * @brief Hardware supports setting the cursor position within the stream window. - * @details Can be set to TRUE, FALSE or HARDWARE_AUTODETECT + * @details Can be set to GFXON, GFXOFF or HARDWARE_AUTODETECT * * @note HARDWARE_AUTODETECT is only meaningful when GDISP_DRIVER_LIST is defined * @note This is used to optimise setting of individual pixels within a stream window. @@ -125,7 +125,7 @@ /** * @brief Hardware accelerated draw pixel. - * @details Can be set to TRUE, FALSE or HARDWARE_AUTODETECT + * @details Can be set to GFXON, GFXOFF or HARDWARE_AUTODETECT * * @note HARDWARE_AUTODETECT is only meaningful when GDISP_DRIVER_LIST is defined * @note Either GDISP_HARDWARE_STREAM_WRITE or GDISP_HARDWARE_DRAWPIXEL must be provided by the driver @@ -136,7 +136,7 @@ /** * @brief Hardware accelerated screen clears. - * @details Can be set to TRUE, FALSE or HARDWARE_AUTODETECT + * @details Can be set to GFXON, GFXOFF or HARDWARE_AUTODETECT * * @note HARDWARE_AUTODETECT is only meaningful when GDISP_DRIVER_LIST is defined * @note This clears the entire display surface regardless of the clipping area currently set @@ -147,7 +147,7 @@ /** * @brief Hardware accelerated rectangular fills. - * @details Can be set to TRUE, FALSE or HARDWARE_AUTODETECT + * @details Can be set to GFXON, GFXOFF or HARDWARE_AUTODETECT * * @note HARDWARE_AUTODETECT is only meaningful when GDISP_DRIVER_LIST is defined */ @@ -157,7 +157,7 @@ /** * @brief Hardware accelerated fills from an image. - * @details Can be set to TRUE, FALSE or HARDWARE_AUTODETECT + * @details Can be set to GFXON, GFXOFF or HARDWARE_AUTODETECT * * @note HARDWARE_AUTODETECT is only meaningful when GDISP_DRIVER_LIST is defined */ @@ -167,7 +167,7 @@ /** * @brief Hardware accelerated scrolling. - * @details Can be set to TRUE, FALSE or HARDWARE_AUTODETECT + * @details Can be set to GFXON, GFXOFF or HARDWARE_AUTODETECT * * @note HARDWARE_AUTODETECT is only meaningful when GDISP_DRIVER_LIST is defined */ @@ -177,7 +177,7 @@ /** * @brief Reading back of pixel values. - * @details Can be set to TRUE, FALSE or HARDWARE_AUTODETECT + * @details Can be set to GFXON, GFXOFF or HARDWARE_AUTODETECT * * @note HARDWARE_AUTODETECT is only meaningful when GDISP_DRIVER_LIST is defined */ @@ -187,7 +187,7 @@ /** * @brief The driver supports one or more control commands. - * @details Can be set to TRUE, FALSE or HARDWARE_AUTODETECT + * @details Can be set to GFXON, GFXOFF or HARDWARE_AUTODETECT * * @note HARDWARE_AUTODETECT is only meaningful when GDISP_DRIVER_LIST is defined */ @@ -197,7 +197,7 @@ /** * @brief The driver supports a non-standard query. - * @details Can be set to TRUE, FALSE or HARDWARE_AUTODETECT + * @details Can be set to GFXON, GFXOFF or HARDWARE_AUTODETECT * * @note HARDWARE_AUTODETECT is only meaningful when GDISP_DRIVER_LIST is defined */ @@ -207,7 +207,7 @@ /** * @brief The driver supports a clipping in hardware. - * @details Can be set to TRUE, FALSE or HARDWARE_AUTODETECT + * @details Can be set to GFXON, GFXOFF or HARDWARE_AUTODETECT * * @note HARDWARE_AUTODETECT is only meaningful when GDISP_DRIVER_LIST is defined * @note If this is defined the driver must perform its own clipping on all calls to @@ -223,8 +223,8 @@ //------------------------------------------------------------------------------------------------------------ -// For pixmaps certain routines MUST not be FALSE as they are needed for pixmap drawing -// Similarly some routines MUST not be TRUE as pixmap's don't provide them. +// For pixmaps certain routines MUST not be GFXOFF as they are needed for pixmap drawing +// Similarly some routines MUST not be GFXON as pixmap's don't provide them. #if GDISP_NEED_PIXMAP && !IN_DRIVER #if !GDISP_HARDWARE_DEINIT #undef GDISP_HARDWARE_DEINIT @@ -242,39 +242,39 @@ #undef GDISP_HARDWARE_CONTROL #define GDISP_HARDWARE_CONTROL HARDWARE_AUTODETECT #endif - #if GDISP_HARDWARE_FLUSH == TRUE + #if GDISP_HARDWARE_FLUSH == GFXON #undef GDISP_HARDWARE_FLUSH #define GDISP_HARDWARE_FLUSH HARDWARE_AUTODETECT #endif - #if GDISP_HARDWARE_STREAM_WRITE == TRUE + #if GDISP_HARDWARE_STREAM_WRITE == GFXON #undef GDISP_HARDWARE_STREAM_WRITE #define GDISP_HARDWARE_STREAM_WRITE HARDWARE_AUTODETECT #endif - #if GDISP_HARDWARE_STREAM_READ == TRUE + #if GDISP_HARDWARE_STREAM_READ == GFXON #undef GDISP_HARDWARE_STREAM_READ #define GDISP_HARDWARE_STREAM_READ HARDWARE_AUTODETECT #endif - #if GDISP_HARDWARE_CLEARS == TRUE + #if GDISP_HARDWARE_CLEARS == GFXON #undef GDISP_HARDWARE_CLEARS #define GDISP_HARDWARE_CLEARS HARDWARE_AUTODETECT #endif - #if GDISP_HARDWARE_FILLS == TRUE + #if GDISP_HARDWARE_FILLS == GFXON #undef GDISP_HARDWARE_FILLS #define GDISP_HARDWARE_FILLS HARDWARE_AUTODETECT #endif - #if GDISP_HARDWARE_BITFILLS == TRUE + #if GDISP_HARDWARE_BITFILLS == GFXON #undef GDISP_HARDWARE_BITFILLS #define GDISP_HARDWARE_BITFILLS HARDWARE_AUTODETECT #endif - #if GDISP_HARDWARE_SCROLL == TRUE + #if GDISP_HARDWARE_SCROLL == GFXON #undef GDISP_HARDWARE_SCROLL #define GDISP_HARDWARE_SCROLL HARDWARE_AUTODETECT #endif - #if GDISP_HARDWARE_QUERY == TRUE + #if GDISP_HARDWARE_QUERY == GFXON #undef GDISP_HARDWARE_QUERY #define GDISP_HARDWARE_QUERY HARDWARE_AUTODETECT #endif - #if GDISP_HARDWARE_CLIP == TRUE + #if GDISP_HARDWARE_CLIP == GFXON #undef GDISP_HARDWARE_CLIP #define GDISP_HARDWARE_CLIP HARDWARE_AUTODETECT #endif @@ -342,7 +342,7 @@ struct GDisplay { #endif // Software clipping - #if GDISP_HARDWARE_CLIP != TRUE && (GDISP_NEED_CLIP || GDISP_NEED_VALIDATION) + #if GDISP_HARDWARE_CLIP != GFXON && (GDISP_NEED_CLIP || GDISP_NEED_VALIDATION) coord_t clipx0, clipy0; coord_t clipx1, clipy1; /* not inclusive */ #endif @@ -430,7 +430,7 @@ typedef struct GDISPVMT { #if GDISP_HARDWARE_DEINIT || defined(__DOXYGEN__) /** * @brief The driver is being de-initialized - * @pre GDISP_HARDWARE_FLUSH is TRUE + * @pre GDISP_HARDWARE_FLUSH is GFXON * * @param[in] g The driver structure * @@ -441,7 +441,7 @@ typedef struct GDISPVMT { #if GDISP_HARDWARE_FLUSH || defined(__DOXYGEN__) /** * @brief Flush the current drawing operations to the display - * @pre GDISP_HARDWARE_FLUSH is TRUE + * @pre GDISP_HARDWARE_FLUSH is GFXON * * @param[in] g The driver structure * @@ -453,7 +453,7 @@ typedef struct GDISPVMT { #if GDISP_HARDWARE_STREAM_WRITE || defined(__DOXYGEN__) /** * @brief Start a streamed write operation - * @pre GDISP_HARDWARE_STREAM_WRITE is TRUE + * @pre GDISP_HARDWARE_STREAM_WRITE is GFXON * * @param[in] g The driver structure * @@ -463,13 +463,13 @@ typedef struct GDISPVMT { * @note The parameter variables must not be altered by the driver. * @note Streaming operations that wrap the defined window have * undefined results. - * @note This must be followed by a call to @p gdisp_lld_write_pos() if GDISP_HARDWARE_STREAM_POS is TRUE. + * @note This must be followed by a call to @p gdisp_lld_write_pos() if GDISP_HARDWARE_STREAM_POS is GFXON. */ LLDSPEC void gdisp_lld_write_start(GDisplay *g); /** * @brief Send a pixel to the current streaming position and then increment that position - * @pre GDISP_HARDWARE_STREAM_WRITE is TRUE + * @pre GDISP_HARDWARE_STREAM_WRITE is GFXON * * @param[in] g The driver structure * @@ -480,7 +480,7 @@ typedef struct GDISPVMT { /** * @brief End the current streaming write operation - * @pre GDISP_HARDWARE_STREAM_WRITE is TRUE + * @pre GDISP_HARDWARE_STREAM_WRITE is GFXON * * @param[in] g The driver structure * @@ -491,7 +491,7 @@ typedef struct GDISPVMT { #if GDISP_HARDWARE_STREAM_POS || defined(__DOXYGEN__) /** * @brief Change the current position within the current streaming window - * @pre GDISP_HARDWARE_STREAM_POS is TRUE and GDISP_HARDWARE_STREAM_WRITE is TRUE + * @pre GDISP_HARDWARE_STREAM_POS is GFXON and GDISP_HARDWARE_STREAM_WRITE is GFXON * * @param[in] g The driver structure * @param[in] g->p.x,g->p.y The new position (which will always be within the existing stream window) @@ -505,7 +505,7 @@ typedef struct GDISPVMT { #if GDISP_HARDWARE_STREAM_READ || defined(__DOXYGEN__) /** * @brief Start a streamed read operation - * @pre GDISP_HARDWARE_STREAM_READ is TRUE + * @pre GDISP_HARDWARE_STREAM_READ is GFXON * * @param[in] g The driver structure * @param[in] g->p.x,g->p.y The window position @@ -520,7 +520,7 @@ typedef struct GDISPVMT { /** * @brief Read a pixel from the current streaming position and then increment that position * @return The color at the current position - * @pre GDISP_HARDWARE_STREAM_READ is TRUE + * @pre GDISP_HARDWARE_STREAM_READ is GFXON * * @param[in] g The driver structure * @@ -530,7 +530,7 @@ typedef struct GDISPVMT { /** * @brief End the current streaming operation - * @pre GDISP_HARDWARE_STREAM_READ is TRUE + * @pre GDISP_HARDWARE_STREAM_READ is GFXON * * @param[in] g The driver structure * @@ -542,7 +542,7 @@ typedef struct GDISPVMT { #if GDISP_HARDWARE_DRAWPIXEL || defined(__DOXYGEN__) /** * @brief Draw a pixel - * @pre GDISP_HARDWARE_DRAWPIXEL is TRUE + * @pre GDISP_HARDWARE_DRAWPIXEL is GFXON * * @param[in] g The driver structure * @param[in] g->p.x,g->p.y The pixel position @@ -556,7 +556,7 @@ typedef struct GDISPVMT { #if GDISP_HARDWARE_CLEARS || defined(__DOXYGEN__) /** * @brief Clear the screen using the defined color - * @pre GDISP_HARDWARE_CLEARS is TRUE + * @pre GDISP_HARDWARE_CLEARS is GFXON * * @param[in] g The driver structure * @param[in] g->p.color The color to set @@ -569,7 +569,7 @@ typedef struct GDISPVMT { #if GDISP_HARDWARE_FILLS || defined(__DOXYGEN__) /** * @brief Fill an area with a single color - * @pre GDISP_HARDWARE_FILLS is TRUE + * @pre GDISP_HARDWARE_FILLS is GFXON * * @param[in] g The driver structure * @param[in] g->p.x,g->p.y The area position @@ -584,7 +584,7 @@ typedef struct GDISPVMT { #if GDISP_HARDWARE_BITFILLS || defined(__DOXYGEN__) /** * @brief Fill an area using a bitmap - * @pre GDISP_HARDWARE_BITFILLS is TRUE + * @pre GDISP_HARDWARE_BITFILLS is GFXON * * @param[in] g The driver structure * @param[in] g->p.x,g->p.y The area position @@ -602,7 +602,7 @@ typedef struct GDISPVMT { /** * @brief Read a pixel from the display * @return The color at the defined position - * @pre GDISP_HARDWARE_PIXELREAD is TRUE (and the application needs it) + * @pre GDISP_HARDWARE_PIXELREAD is GFXON (and the application needs it) * * @param[in] g The driver structure * @param[in] g->p.x,g->p.y The pixel position @@ -615,7 +615,7 @@ typedef struct GDISPVMT { #if (GDISP_HARDWARE_SCROLL && GDISP_NEED_SCROLL) || defined(__DOXYGEN__) /** * @brief Scroll an area of the screen - * @pre GDISP_HARDWARE_SCROLL is TRUE (and the application needs it) + * @pre GDISP_HARDWARE_SCROLL is GFXON (and the application needs it) * * @param[in] g The driver structure * @param[in] g->p.x,g->p.y The area position @@ -634,7 +634,7 @@ typedef struct GDISPVMT { #if (GDISP_HARDWARE_CONTROL && GDISP_NEED_CONTROL) || defined(__DOXYGEN__) /** * @brief Control some feature of the hardware - * @pre GDISP_HARDWARE_CONTROL is TRUE (and the application needs it) + * @pre GDISP_HARDWARE_CONTROL is GFXON (and the application needs it) * * @param[in] g The driver structure * @param[in] g->p.x The operation to perform @@ -649,7 +649,7 @@ typedef struct GDISPVMT { /** * @brief Query some feature of the hardware * @return The information requested (typecast as void *) - * @pre GDISP_HARDWARE_QUERY is TRUE (and the application needs it) + * @pre GDISP_HARDWARE_QUERY is GFXON (and the application needs it) * * @param[in] g The driver structure * @param[in] g->p.x What to query @@ -662,7 +662,7 @@ typedef struct GDISPVMT { #if (GDISP_HARDWARE_CLIP && (GDISP_NEED_CLIP || GDISP_NEED_VALIDATION)) || defined(__DOXYGEN__) /** * @brief Set the hardware clipping area - * @pre GDISP_HARDWARE_CLIP is TRUE (and the application needs it) + * @pre GDISP_HARDWARE_CLIP is GFXON (and the application needs it) * * @param[in] g The driver structure * @param[in] g->p.x,g->p.y The area position @@ -706,7 +706,7 @@ typedef struct GDISPVMT { // Make sure the driver has a valid model #if !GDISP_HARDWARE_STREAM_WRITE && !GDISP_HARDWARE_DRAWPIXEL - #error "GDISP Driver: Either GDISP_HARDWARE_STREAM_WRITE or GDISP_HARDWARE_DRAWPIXEL must be TRUE" + #error "GDISP Driver: Either GDISP_HARDWARE_STREAM_WRITE or GDISP_HARDWARE_DRAWPIXEL must be GFXON" #endif // If we are not using multiple displays then hard-code the VMT name (except for the pixmap driver) @@ -840,9 +840,9 @@ typedef struct GDISPVMT { #error "GDISP: Cannot define low level driver color types with more than 32 bits" #endif #if LLDCOLOR_TYPE_BITS == LLDCOLOR_BITS - #define LLDCOLOR_NEEDS_MASK FALSE + #define LLDCOLOR_NEEDS_MASK GFXOFF #else - #define LLDCOLOR_NEEDS_MASK TRUE + #define LLDCOLOR_NEEDS_MASK GFXON #endif #define LLDCOLOR_MASK() ((1 << LLDCOLOR_BITS)-1) @@ -943,9 +943,9 @@ typedef struct GDISPVMT { #error "GDISP: Cannot define gray-scale low level driver color types with more than 8 bits" #endif #if LLDCOLOR_TYPE_BITS == LLDCOLOR_BITS - #define LLDCOLOR_NEEDS_MASK FALSE + #define LLDCOLOR_NEEDS_MASK GFXOFF #else - #define LLDCOLOR_NEEDS_MASK TRUE + #define LLDCOLOR_NEEDS_MASK GFXON #endif #define LLDCOLOR_MASK() ((1 << LLDCOLOR_BITS)-1) @@ -1005,9 +1005,9 @@ typedef struct GDISPVMT { */ #ifndef GDISP_HARDWARE_USE_EXACT_COLOR #if LLDCOLOR_BITS_R - COLOR_BITS_R >= LLDCOLOR_BITS_R/2 || LLDCOLOR_BITS_G - COLOR_BITS_G >= LLDCOLOR_BITS_G/2 || LLDCOLOR_BITS_B - COLOR_BITS_B >= LLDCOLOR_BITS_B/2 - #define GDISP_HARDWARE_USE_EXACT_COLOR TRUE + #define GDISP_HARDWARE_USE_EXACT_COLOR GFXON #else - #define GDISP_HARDWARE_USE_EXACT_COLOR FALSE + #define GDISP_HARDWARE_USE_EXACT_COLOR GFXOFF #endif #endif diff --git a/src/gdisp/gdisp_image.h b/src/gdisp/gdisp_image.h index d921e063..4cd348cf 100644 --- a/src/gdisp/gdisp_image.h +++ b/src/gdisp/gdisp_image.h @@ -127,7 +127,7 @@ extern "C" { * @details Determine the image format and get ready to decode the first image frame * @return GDISP_IMAGE_ERR_OK (0) on success or an error code. * - * @pre GFILE_NEED_CHIBIOSFS and GFX_USE_OS_CHIBIOS must be TRUE. This only makes sense on the ChibiOS + * @pre GFILE_NEED_CHIBIOSFS and GFX_USE_OS_CHIBIOS must be GFXON. This only makes sense on the ChibiOS * operating system. * * @param[in] img The image structure @@ -142,7 +142,7 @@ extern "C" { * @details Determine the image format and get ready to decode the first image frame * @return GDISP_IMAGE_ERR_OK (0) on success or an error code. * - * @pre GFILE_NEED_MEMFS must be TRUE + * @pre GFILE_NEED_MEMFS must be GFXON * * @param[in] img The image structure * @param[in] ptr A pointer to the image bytes in memory diff --git a/src/gdisp/gdisp_options.h b/src/gdisp/gdisp_options.h index f5f2c18b..8fb409a2 100644 --- a/src/gdisp/gdisp_options.h +++ b/src/gdisp/gdisp_options.h @@ -22,175 +22,175 @@ */ /** * @brief Should drawing operations be automatically flushed. - * @details Defaults to FALSE - * @note If set to FALSE and the controller requires flushing + * @details Defaults to GFXOFF + * @note If set to GFXOFF and the controller requires flushing * then the application must manually call @p gdispGFlush(). - * Setting this to TRUE causes GDISP to automatically flush + * Setting this to GFXON causes GDISP to automatically flush * after each drawing operation. Note this may be slow but enables * an application to avoid having to manually call the flush routine. - * @note If TRUE and GDISP_NEED_TIMERFLUSH is also TRUE, this takes precedence. + * @note If GFXON and GDISP_NEED_TIMERFLUSH is also GFXON, this takes precedence. * @note Most controllers don't need flushing which is why this is set to - * FALSE by default. + * GFXOFF by default. */ #ifndef GDISP_NEED_AUTOFLUSH - #define GDISP_NEED_AUTOFLUSH FALSE + #define GDISP_NEED_AUTOFLUSH GFXOFF #endif /** * @brief Should drawing operations be automatically flushed on a timer. - * @details Defaults to FALSE, Can be set to FALSE or a timer period in milliseconds. + * @details Defaults to GFXOFF, Can be set to GFXOFF or a timer period in milliseconds. * @note The period should not be set too short or it will consume all your CPU. A * value between 250 and 500 milliseconds would probably be suitable. - * @note If TRUE and GDISP_NEED_AUTOFLUSH is also TRUE, this is ineffective. + * @note If GFXON and GDISP_NEED_AUTOFLUSH is also GFXON, this is ineffective. * @note Most controllers don't need flushing which is why this is set to - * FALSE by default. + * GFXOFF by default. */ #ifndef GDISP_NEED_TIMERFLUSH - #define GDISP_NEED_TIMERFLUSH FALSE + #define GDISP_NEED_TIMERFLUSH GFXOFF #endif /** * @brief Should all operations be clipped to the screen and colors validated. - * @details Defaults to TRUE. - * @note If this is FALSE, any operations that extend beyond the + * @details Defaults to GFXON. + * @note If this is GFXOFF, any operations that extend beyond the * edge of the screen will have undefined results. Any * out-of-range colors will produce undefined results. - * @note This should always be left as the default (TRUE) unless you + * @note This should always be left as the default (GFXON) unless you * are a maniac for speed and you have thoroughly tested your code * and it never overwrites the edges of the screen. - * @note Setting GDISP_NEED_CLIP to TRUE internally uses the same mechanism - * as this validation. There is no advantage in setting this FALSE if - * GDISP_NEED_CLIP is TRUE. + * @note Setting GDISP_NEED_CLIP to GFXON internally uses the same mechanism + * as this validation. There is no advantage in setting this GFXOFF if + * GDISP_NEED_CLIP is GFXON. */ #ifndef GDISP_NEED_VALIDATION - #define GDISP_NEED_VALIDATION TRUE + #define GDISP_NEED_VALIDATION GFXON #endif /** * @brief Are clipping functions needed. - * @details Defaults to TRUE + * @details Defaults to GFXON */ #ifndef GDISP_NEED_CLIP - #define GDISP_NEED_CLIP TRUE + #define GDISP_NEED_CLIP GFXON #endif /** * @brief Streaming functions are needed - * @details Defaults to FALSE. + * @details Defaults to GFXOFF. */ #ifndef GDISP_NEED_STREAMING - #define GDISP_NEED_STREAMING FALSE + #define GDISP_NEED_STREAMING GFXOFF #endif /** * @brief Are text functions needed. - * @details Defaults to FALSE + * @details Defaults to GFXOFF * @note You must also define at least one font. */ #ifndef GDISP_NEED_TEXT - #define GDISP_NEED_TEXT FALSE + #define GDISP_NEED_TEXT GFXOFF #endif /** * @brief Are circle functions needed. - * @details Defaults to FALSE + * @details Defaults to GFXOFF * @note Uses integer algorithms only. It does not use any trig or floating point. */ #ifndef GDISP_NEED_CIRCLE - #define GDISP_NEED_CIRCLE FALSE + #define GDISP_NEED_CIRCLE GFXOFF #endif /** * @brief Are dual circle functions needed (one circle inside another). - * @details Defaults to FALSE + * @details Defaults to GFXOFF * @note Uses integer algorithms only. It does not use any trig or floating point. */ #ifndef GDISP_NEED_DUALCIRCLE - #define GDISP_NEED_DUALCIRCLE FALSE + #define GDISP_NEED_DUALCIRCLE GFXOFF #endif /** * @brief Are ellipse functions needed. - * @details Defaults to FALSE + * @details Defaults to GFXOFF * @note Uses integer algorithms only. It does not use any trig or floating point. */ #ifndef GDISP_NEED_ELLIPSE - #define GDISP_NEED_ELLIPSE FALSE + #define GDISP_NEED_ELLIPSE GFXOFF #endif /** * @brief Are arc sector functions needed. - * @details Defaults to FALSE + * @details Defaults to GFXOFF * @note Uses integer algorithms only. It does not use any trig or floating point. */ #ifndef GDISP_NEED_ARCSECTORS - #define GDISP_NEED_ARCSECTORS FALSE + #define GDISP_NEED_ARCSECTORS GFXOFF #endif /** * @brief Are arc functions needed. - * @details Defaults to FALSE + * @details Defaults to GFXOFF * @note This can be compiled using fully integer mathematics by - * defining GFX_USE_GMISC and GMISC_NEED_FIXEDTRIG as TRUE. + * defining GFX_USE_GMISC and GMISC_NEED_FIXEDTRIG as GFXON. * @note This can be compiled to use floating point but no trig functions - * by defining GFX_USE_GMISC and GMISC_NEED_FASTTRIG as TRUE. + * by defining GFX_USE_GMISC and GMISC_NEED_FASTTRIG as GFXON. * @note If neither of the above are defined it requires the maths library * to be included in the link to provide floating point and trig support. * ie include -lm in your compiler flags. */ #ifndef GDISP_NEED_ARC - #define GDISP_NEED_ARC FALSE + #define GDISP_NEED_ARC GFXOFF #endif /** * @brief Are convex polygon functions needed. - * @details Defaults to FALSE + * @details Defaults to GFXOFF * @note Convex polygons are those that have no internal angles. That is; * you can draw a line from any point on the polygon to any other point * on the polygon without it going outside the polygon. */ #ifndef GDISP_NEED_CONVEX_POLYGON - #define GDISP_NEED_CONVEX_POLYGON FALSE + #define GDISP_NEED_CONVEX_POLYGON GFXOFF #endif /** * @brief Are scrolling functions needed. - * @details Defaults to FALSE + * @details Defaults to GFXOFF * @note This function must be supported by the low level GDISP driver * you have included in your project. If it isn't, defining this * option will cause a compile error. */ #ifndef GDISP_NEED_SCROLL - #define GDISP_NEED_SCROLL FALSE + #define GDISP_NEED_SCROLL GFXOFF #endif /** * @brief Is the capability to read pixels back needed. - * @details Defaults to FALSE + * @details Defaults to GFXOFF * @note This function must be supported by the low level GDISP driver * you have included in your project. If it isn't, defining this * option will cause a compile error. */ #ifndef GDISP_NEED_PIXELREAD - #define GDISP_NEED_PIXELREAD FALSE + #define GDISP_NEED_PIXELREAD GFXOFF #endif /** * @brief Control some aspect of the hardware operation. - * @details Defaults to FALSE + * @details Defaults to GFXOFF * @note This allows control of hardware specific features such as * screen rotation, backlight levels, contrast etc */ #ifndef GDISP_NEED_CONTROL - #define GDISP_NEED_CONTROL FALSE + #define GDISP_NEED_CONTROL GFXOFF #endif /** * @brief Query some aspect of the hardware operation. - * @details Defaults to FALSE + * @details Defaults to GFXOFF * @note This allows query of hardware specific features */ #ifndef GDISP_NEED_QUERY - #define GDISP_NEED_QUERY FALSE + #define GDISP_NEED_QUERY GFXOFF #endif /** * @brief Is the image interface required. - * @details Defaults to FALSE + * @details Defaults to GFXOFF */ #ifndef GDISP_NEED_IMAGE - #define GDISP_NEED_IMAGE FALSE + #define GDISP_NEED_IMAGE GFXOFF #endif /** * @brief Is the image interface required. - * @details Defaults to FALSE + * @details Defaults to GFXOFF */ #ifndef GDISP_NEED_PIXMAP - #define GDISP_NEED_PIXMAP FALSE + #define GDISP_NEED_PIXMAP GFXOFF #endif /** * @} @@ -200,10 +200,10 @@ */ /** * @brief Do the drawing functions need to be thread-safe. - * @details Defaults to FALSE + * @details Defaults to GFXOFF */ #ifndef GDISP_NEED_MULTITHREAD - #define GDISP_NEED_MULTITHREAD FALSE + #define GDISP_NEED_MULTITHREAD GFXOFF #endif /** * @} @@ -214,10 +214,10 @@ /** * @brief Should the startup logo be displayed * - * @details Defaults to TRUE + * @details Defaults to GFXON */ #ifndef GDISP_NEED_STARTUP_LOGO - #define GDISP_NEED_STARTUP_LOGO TRUE + #define GDISP_NEED_STARTUP_LOGO GFXON #endif /** * @brief Define the initial background color for all displays in the system. @@ -270,8 +270,8 @@ * @note The same driver can occur more than once in the list to create an extra instance of that driver. * @note If defining this you must also define GDISP_PIXELFORMAT for your application to use. * Choose a value that is most common accross all your drivers for efficiency. - * @note If using this you may optionally define the GDISP_HARDWARE_xxx values as either TRUE or FALSE. - * Doing this causes GDISP to assume that all (TRUE) or none (FALSE) of the listed drivers have that + * @note If using this you may optionally define the GDISP_HARDWARE_xxx values as either GFXON or GFXOFF. + * Doing this causes GDISP to assume that all (GFXON) or none (GFXOFF) of the listed drivers have that * capability. This can help improve drawing speed and efficiency. */ #define GDISP_DRIVER_LIST GDISPVMT_Win32, GDISPVMT_SSD1963 @@ -280,113 +280,113 @@ * @} * * @name GDISP Image Options - * @pre GDISP_NEED_IMAGE must be TRUE + * @pre GDISP_NEED_IMAGE must be GFXON * @{ */ /** * @brief Is native image decoding required. - * @details Defaults to FALSE + * @details Defaults to GFXOFF */ #ifndef GDISP_NEED_IMAGE_NATIVE - #define GDISP_NEED_IMAGE_NATIVE FALSE + #define GDISP_NEED_IMAGE_NATIVE GFXOFF #endif /** * @brief Is GIF image decoding required. - * @details Defaults to FALSE + * @details Defaults to GFXOFF */ #ifndef GDISP_NEED_IMAGE_GIF - #define GDISP_NEED_IMAGE_GIF FALSE + #define GDISP_NEED_IMAGE_GIF GFXOFF #endif /** * @brief Is BMP image decoding required. - * @details Defaults to FALSE + * @details Defaults to GFXOFF */ #ifndef GDISP_NEED_IMAGE_BMP - #define GDISP_NEED_IMAGE_BMP FALSE + #define GDISP_NEED_IMAGE_BMP GFXOFF #endif /** * @brief Is JPG image decoding required. - * @details Defaults to FALSE + * @details Defaults to GFXOFF */ #ifndef GDISP_NEED_IMAGE_JPG - #define GDISP_NEED_IMAGE_JPG FALSE + #define GDISP_NEED_IMAGE_JPG GFXOFF #endif /** * @brief Is PNG image decoding required. - * @details Defaults to FALSE + * @details Defaults to GFXOFF */ #ifndef GDISP_NEED_IMAGE_PNG - #define GDISP_NEED_IMAGE_PNG FALSE + #define GDISP_NEED_IMAGE_PNG GFXOFF #endif /** * @brief Is memory accounting required during image decoding. - * @details Defaults to FALSE + * @details Defaults to GFXOFF */ #ifndef GDISP_NEED_IMAGE_ACCOUNTING - #define GDISP_NEED_IMAGE_ACCOUNTING FALSE + #define GDISP_NEED_IMAGE_ACCOUNTING GFXOFF #endif /** * @} * * @name GDISP BMP Image Options - * @pre GDISP_NEED_IMAGE and GDISP_NEED_IMAGE_BMP must be TRUE + * @pre GDISP_NEED_IMAGE and GDISP_NEED_IMAGE_BMP must be GFXON * @{ */ /** * @brief Is BMP 1 bit per pixel (monochrome/2 color) image decoding required. - * @details Defaults to TRUE + * @details Defaults to GFXON */ #ifndef GDISP_NEED_IMAGE_BMP_1 - #define GDISP_NEED_IMAGE_BMP_1 TRUE + #define GDISP_NEED_IMAGE_BMP_1 GFXON #endif /** * @brief Is BMP 4 bits per pixel (16 color) image decoding required. - * @details Defaults to TRUE + * @details Defaults to GFXON */ #ifndef GDISP_NEED_IMAGE_BMP_4 - #define GDISP_NEED_IMAGE_BMP_4 TRUE + #define GDISP_NEED_IMAGE_BMP_4 GFXON #endif /** * @brief Is BMP 4 bits per pixel (16 color) with RLE compression image decoding required. - * @details Defaults to TRUE + * @details Defaults to GFXON */ #ifndef GDISP_NEED_IMAGE_BMP_4_RLE - #define GDISP_NEED_IMAGE_BMP_4_RLE TRUE + #define GDISP_NEED_IMAGE_BMP_4_RLE GFXON #endif /** * @brief Is BMP 8 bits per pixel (256 color) image decoding required. - * @details Defaults to TRUE + * @details Defaults to GFXON */ #ifndef GDISP_NEED_IMAGE_BMP_8 - #define GDISP_NEED_IMAGE_BMP_8 TRUE + #define GDISP_NEED_IMAGE_BMP_8 GFXON #endif /** * @brief Is BMP 8 bits per pixel (256 color) with RLE compression image decoding required. - * @details Defaults to TRUE + * @details Defaults to GFXON */ #ifndef GDISP_NEED_IMAGE_BMP_8_RLE - #define GDISP_NEED_IMAGE_BMP_8_RLE TRUE + #define GDISP_NEED_IMAGE_BMP_8_RLE GFXON #endif /** * @brief Is BMP 16 bits per pixel (65536 color) image decoding required. - * @details Defaults to TRUE + * @details Defaults to GFXON */ #ifndef GDISP_NEED_IMAGE_BMP_16 - #define GDISP_NEED_IMAGE_BMP_16 TRUE + #define GDISP_NEED_IMAGE_BMP_16 GFXON #endif /** * @brief Is BMP 24 bits per pixel (true-color) image decoding required. - * @details Defaults to TRUE + * @details Defaults to GFXON */ #ifndef GDISP_NEED_IMAGE_BMP_24 - #define GDISP_NEED_IMAGE_BMP_24 TRUE + #define GDISP_NEED_IMAGE_BMP_24 GFXON #endif /** * @brief Is BMP 32 bits per pixel (true-color) image decoding required. - * @details Defaults to TRUE + * @details Defaults to GFXON */ #ifndef GDISP_NEED_IMAGE_BMP_32 - #define GDISP_NEED_IMAGE_BMP_32 TRUE + #define GDISP_NEED_IMAGE_BMP_32 GFXON #endif /** * @brief The BMP blit buffer size. @@ -401,7 +401,7 @@ * @} * * @name GDISP GIF Image Options - * @pre GDISP_NEED_IMAGE and GDISP_NEED_IMAGE_GIF must be TRUE + * @pre GDISP_NEED_IMAGE and GDISP_NEED_IMAGE_GIF must be GFXON * @{ */ /** @@ -416,37 +416,37 @@ * @} * * @name GDISP PNG Image Options - * @pre GDISP_NEED_IMAGE and GDISP_NEED_IMAGE_PNG must be TRUE + * @pre GDISP_NEED_IMAGE and GDISP_NEED_IMAGE_PNG must be GFXON * @{ */ /** * @brief Is PNG Interlaced image decoding required. - * @details Defaults to FALSE + * @details Defaults to GFXOFF * @note Currently not supported due to the complex decoding and display requirements */ #ifndef GDISP_NEED_IMAGE_PNG_INTERLACED - #define GDISP_NEED_IMAGE_PNG_INTERLACED FALSE + #define GDISP_NEED_IMAGE_PNG_INTERLACED GFXOFF #endif /** * @brief Is PNG image transparency processed. - * @details Defaults to TRUE + * @details Defaults to GFXON */ #ifndef GDISP_NEED_IMAGE_PNG_TRANSPARENCY - #define GDISP_NEED_IMAGE_PNG_TRANSPARENCY TRUE + #define GDISP_NEED_IMAGE_PNG_TRANSPARENCY GFXON #endif /** * @brief Is PNG background data processed. - * @details Defaults to TRUE - * @note If the background is specified in the image file and this define is TRUE, + * @details Defaults to GFXON + * @note If the background is specified in the image file and this define is GFXON, * that background color is used for transparency and alpha blending. */ #ifndef GDISP_NEED_IMAGE_PNG_BACKGROUND - #define GDISP_NEED_IMAGE_PNG_BACKGROUND TRUE + #define GDISP_NEED_IMAGE_PNG_BACKGROUND GFXON #endif /** * @brief What is the cliff between non-blended alpha pixels being displayed or not. * @details Range of 0 to 255 - * @note If GDISP_NEED_IMAGE_PNG_BACKGROUND is TRUE and the PNG file contains a + * @note If GDISP_NEED_IMAGE_PNG_BACKGROUND is GFXON and the PNG file contains a * background color then the pixel will be blended with the background color * according to the alpha. * If not then no blending occurs. The pixel will either be set or not. @@ -458,80 +458,80 @@ #endif /** * @brief Is 1, 2 and 4 bit PNG palettized image decoding required. - * @details Defaults to TRUE + * @details Defaults to GFXON */ #ifndef GDISP_NEED_IMAGE_PNG_PALETTE_124 - #define GDISP_NEED_IMAGE_PNG_PALETTE_124 TRUE + #define GDISP_NEED_IMAGE_PNG_PALETTE_124 GFXON #endif /** * @brief Is 8 bit PNG palettized image decoding required. - * @details Defaults to TRUE + * @details Defaults to GFXON */ #ifndef GDISP_NEED_IMAGE_PNG_PALETTE_8 - #define GDISP_NEED_IMAGE_PNG_PALETTE_8 TRUE + #define GDISP_NEED_IMAGE_PNG_PALETTE_8 GFXON #endif /** * @brief Is 1,2 and 4 bit PNG grayscale image decoding required. - * @details Defaults to TRUE + * @details Defaults to GFXON */ #ifndef GDISP_NEED_IMAGE_PNG_GRAYSCALE_124 - #define GDISP_NEED_IMAGE_PNG_GRAYSCALE_124 TRUE + #define GDISP_NEED_IMAGE_PNG_GRAYSCALE_124 GFXON #endif /** * @brief Is 8 bit PNG grayscale image decoding required. - * @details Defaults to TRUE + * @details Defaults to GFXON */ #ifndef GDISP_NEED_IMAGE_PNG_GRAYSCALE_8 - #define GDISP_NEED_IMAGE_PNG_GRAYSCALE_8 TRUE + #define GDISP_NEED_IMAGE_PNG_GRAYSCALE_8 GFXON #endif /** * @brief Is 16 bit PNG grayscale image decoding required. - * @details Defaults to TRUE + * @details Defaults to GFXON */ #ifndef GDISP_NEED_IMAGE_PNG_GRAYSCALE_16 - #define GDISP_NEED_IMAGE_PNG_GRAYSCALE_16 TRUE + #define GDISP_NEED_IMAGE_PNG_GRAYSCALE_16 GFXON #endif /** * @brief Is 8 bit PNG grayscale with 8 bit alpha image decoding required. - * @details Defaults to TRUE + * @details Defaults to GFXON */ #ifndef GDISP_NEED_IMAGE_PNG_GRAYALPHA_8 - #define GDISP_NEED_IMAGE_PNG_GRAYALPHA_8 TRUE + #define GDISP_NEED_IMAGE_PNG_GRAYALPHA_8 GFXON #endif /** * @brief Is 16 bit PNG grayscale with 16 bit alpha image decoding required. - * @details Defaults to TRUE + * @details Defaults to GFXON */ #ifndef GDISP_NEED_IMAGE_PNG_GRAYALPHA_16 - #define GDISP_NEED_IMAGE_PNG_GRAYALPHA_16 TRUE + #define GDISP_NEED_IMAGE_PNG_GRAYALPHA_16 GFXON #endif /** * @brief Is 8/8/8 bit PNG RGB image decoding required. - * @details Defaults to TRUE + * @details Defaults to GFXON */ #ifndef GDISP_NEED_IMAGE_PNG_RGB_8 - #define GDISP_NEED_IMAGE_PNG_RGB_8 TRUE + #define GDISP_NEED_IMAGE_PNG_RGB_8 GFXON #endif /** * @brief Is 16/16/16 bit PNG RGB image decoding required. - * @details Defaults to TRUE + * @details Defaults to GFXON */ #ifndef GDISP_NEED_IMAGE_PNG_RGB_16 - #define GDISP_NEED_IMAGE_PNG_RGB_16 TRUE + #define GDISP_NEED_IMAGE_PNG_RGB_16 GFXON #endif /** * @brief Is 8/8/8 bit PNG RGB with 8 bit alpha image decoding required. - * @details Defaults to TRUE + * @details Defaults to GFXON */ #ifndef GDISP_NEED_IMAGE_PNG_RGBALPHA_8 - #define GDISP_NEED_IMAGE_PNG_RGBALPHA_8 TRUE + #define GDISP_NEED_IMAGE_PNG_RGBALPHA_8 GFXON #endif /** * @brief Is 16/16/16 bit PNG RGB with 16 bit alpha image decoding required. - * @details Defaults to TRUE + * @details Defaults to GFXON */ #ifndef GDISP_NEED_IMAGE_PNG_RGBALPHA_16 - #define GDISP_NEED_IMAGE_PNG_RGBALPHA_16 TRUE + #define GDISP_NEED_IMAGE_PNG_RGBALPHA_16 GFXON #endif /** * @brief The PNG blit buffer size in pixels. @@ -569,10 +569,10 @@ /** * @brief Enable advanced word-wrapping. * @details Only has an effect with @p gdispGDrawStringBox() and @p gdispGFillStringBox() - * @details Defaults to FALSE + * @details Defaults to GFXOFF */ #ifndef GDISP_NEED_TEXT_WORDWRAP - #define GDISP_NEED_TEXT_WORDWRAP FALSE + #define GDISP_NEED_TEXT_WORDWRAP GFXOFF #endif /** * @brief Adding pixels to the left and right side of the box to pad text. @@ -594,24 +594,24 @@ #endif /** * @brief Enable UTF-8 support for text rendering. - * @details Defaults to FALSE + * @details Defaults to GFXOFF */ #ifndef GDISP_NEED_UTF8 - #define GDISP_NEED_UTF8 FALSE + #define GDISP_NEED_UTF8 GFXOFF #endif /** * @brief Enable kerning for font rendering (improves character placement). - * @details Defaults to FALSE + * @details Defaults to GFXOFF */ #ifndef GDISP_NEED_TEXT_KERNING - #define GDISP_NEED_TEXT_KERNING FALSE + #define GDISP_NEED_TEXT_KERNING GFXOFF #endif /** * @brief Enable antialiased font support - * @details Defaults to FALSE + * @details Defaults to GFXOFF */ #ifndef GDISP_NEED_ANTIALIAS - #define GDISP_NEED_ANTIALIAS FALSE + #define GDISP_NEED_ANTIALIAS GFXOFF #endif /** * @} @@ -620,7 +620,7 @@ * @{ */ #ifndef GDISP_NEED_PIXMAP_IMAGE - #define GDISP_NEED_PIXMAP_IMAGE FALSE + #define GDISP_NEED_PIXMAP_IMAGE GFXOFF #endif /** * @} diff --git a/src/gdisp/gdisp_pixmap.c b/src/gdisp/gdisp_pixmap.c index c22ffcf0..45dee66b 100644 --- a/src/gdisp/gdisp_pixmap.c +++ b/src/gdisp/gdisp_pixmap.c @@ -25,11 +25,11 @@ #undef GDISP_HARDWARE_CONTROL #undef GDISP_HARDWARE_QUERY #undef GDISP_HARDWARE_CLIP -#define GDISP_HARDWARE_DEINIT TRUE -#define GDISP_HARDWARE_DRAWPIXEL TRUE -#define GDISP_HARDWARE_PIXELREAD TRUE -#define GDISP_HARDWARE_CONTROL TRUE -#define IN_PIXMAP_DRIVER TRUE +#define GDISP_HARDWARE_DEINIT GFXON +#define GDISP_HARDWARE_DRAWPIXEL GFXON +#define GDISP_HARDWARE_PIXELREAD GFXON +#define GDISP_HARDWARE_CONTROL GFXON +#define IN_PIXMAP_DRIVER GFXON #define GDISP_DRIVER_VMT GDISPVMT_pixmap #define GDISP_DRIVER_VMT_FLAGS (GDISP_VFLG_DYNAMICONLY|GDISP_VFLG_PIXMAP) diff --git a/src/gdisp/gdisp_pixmap.h b/src/gdisp/gdisp_pixmap.h index a8024772..ebf7e1db 100644 --- a/src/gdisp/gdisp_pixmap.h +++ b/src/gdisp/gdisp_pixmap.h @@ -15,7 +15,7 @@ * * @note A Pixmap is an off-screen virtual display that can be drawn to just like any other * display. It can then be copied to a real display using the standard gdispGBlitArea() call. - * @pre GDISP_NEED_PIXMAP must be TRUE in your gfxconf.h + * @pre GDISP_NEED_PIXMAP must be GFXON in your gfxconf.h * @{ */ @@ -69,7 +69,7 @@ extern "C" { /** * @brief Get a pointer to a native format gdispImage. * @return A pointer to a NATIVE format gdispImage in memory or NULL if this display is not a pixmap. - * @pre GDISP_NEED_PIXAMP_IMAGE must be TRUE in your gfxconf.h + * @pre GDISP_NEED_PIXAMP_IMAGE must be GFXON in your gfxconf.h * * @param[in] g The pixmap virtual display * diff --git a/src/gdisp/gdisp_rules.h b/src/gdisp/gdisp_rules.h index d9fb86bb..f6557d8f 100644 --- a/src/gdisp/gdisp_rules.h +++ b/src/gdisp/gdisp_rules.h @@ -26,7 +26,7 @@ #endif #endif #undef GFX_USE_GDRIVER - #define GFX_USE_GDRIVER TRUE + #define GFX_USE_GDRIVER GFXON #endif #if defined(GDISP_DRIVER_LIST) #if GDISP_TOTAL_DISPLAYS != 1 @@ -45,11 +45,11 @@ #endif #endif #undef GDISP_NEED_TIMERFLUSH - #define GDISP_NEED_TIMERFLUSH FALSE + #define GDISP_NEED_TIMERFLUSH GFXOFF #endif #if GDISP_NEED_TIMERFLUSH #if GDISP_NEED_TIMERFLUSH < 50 || GDISP_NEED_TIMERFLUSH > 1200 - #error "GDISP: GDISP_NEED_TIMERFLUSH has been set to an invalid value (FALSE, 50-1200)." + #error "GDISP: GDISP_NEED_TIMERFLUSH has been set to an invalid value (GFXOFF, 50-1200)." #endif #if !GFX_USE_GTIMER #if GFX_DISPLAY_RULE_WARNINGS @@ -60,9 +60,9 @@ #endif #endif #undef GFX_USE_GTIMER - #define GFX_USE_GTIMER TRUE + #define GFX_USE_GTIMER GFXON #undef GDISP_NEED_MULTITHREAD - #define GDISP_NEED_MULTITHREAD TRUE + #define GDISP_NEED_MULTITHREAD GFXON #endif #endif #if GDISP_NEED_ANTIALIAS && !GDISP_NEED_PIXELREAD @@ -75,7 +75,7 @@ #endif #endif #undef GDISP_NEED_PIXELREAD - #define GDISP_NEED_PIXELREAD TRUE + #define GDISP_NEED_PIXELREAD GFXON #else #if GFX_DISPLAY_RULE_WARNINGS #if GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_DIRECT @@ -97,19 +97,19 @@ #endif #endif #undef GDISP_INCLUDE_FONT_UI2 - #define GDISP_INCLUDE_FONT_UI2 TRUE + #define GDISP_INCLUDE_FONT_UI2 GFXON #endif #if GDISP_NEED_IMAGE #if !GFX_USE_GFILE #if GFX_DISPLAY_RULE_WARNINGS #if GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_DIRECT - #warning "GDISP: GFX_USE_GFILE is required when GDISP_NEED_IMAGE is TRUE. It has been turned on for you." + #warning "GDISP: GFX_USE_GFILE is required when GDISP_NEED_IMAGE is GFXON. It has been turned on for you." #elif GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_MACRO - COMPILER_WARNING("GDISP: GFX_USE_GFILE is required when GDISP_NEED_IMAGE is TRUE. It has been turned on for you.") + COMPILER_WARNING("GDISP: GFX_USE_GFILE is required when GDISP_NEED_IMAGE is GFXON. It has been turned on for you.") #endif #endif #undef GFX_USE_GFILE - #define GFX_USE_GFILE TRUE + #define GFX_USE_GFILE GFXON #endif #endif #endif diff --git a/src/gdriver/gdriver.h b/src/gdriver/gdriver.h index 6f245ef1..4a1959a6 100644 --- a/src/gdriver/gdriver.h +++ b/src/gdriver/gdriver.h @@ -26,7 +26,7 @@ * @note This module gdriver.h file is NOT included in the general gfx.h file. * Instead it is included in each driver type's driver API. * - * @pre GFX_USE_GDRIVER must be set to TRUE in your gfxconf.h + * @pre GFX_USE_GDRIVER must be set to GFXON in your gfxconf.h * * @{ */ diff --git a/src/gevent/gevent.h b/src/gevent/gevent.h index 3c5a0bd4..8b95235d 100644 --- a/src/gevent/gevent.h +++ b/src/gevent/gevent.h @@ -15,7 +15,7 @@ * @details GEVENT provides a simple to use but yet powerful event * system. * - * @pre GFX_USE_GEVENT must be set to TRUE in your gfxconf.h + * @pre GFX_USE_GEVENT must be set to GFXON in your gfxconf.h * * @{ */ diff --git a/src/gevent/gevent_options.h b/src/gevent/gevent_options.h index 7f68fd32..192cf725 100644 --- a/src/gevent/gevent_options.h +++ b/src/gevent/gevent_options.h @@ -22,12 +22,12 @@ */ /** * @brief Should routines assert() if they run out of resources. - * @details Defaults to FALSE. - * @details If FALSE the application must be prepared to handle these + * @details Defaults to GFXOFF. + * @details If GFXOFF the application must be prepared to handle these * failures. */ #ifndef GEVENT_ASSERT_NO_RESOURCE - #define GEVENT_ASSERT_NO_RESOURCE FALSE + #define GEVENT_ASSERT_NO_RESOURCE GFXOFF #endif /** * @} diff --git a/src/gfile/gfile_options.h b/src/gfile/gfile_options.h index 7b157b9f..b559842d 100644 --- a/src/gfile/gfile_options.h +++ b/src/gfile/gfile_options.h @@ -25,10 +25,10 @@ * @details The filesystem is normally mounted automatically if the * user does not do it manually. This option turns that off * so the user must manually mount the file-system first. - * @details Defaults to FALSE + * @details Defaults to GFXOFF */ #ifndef GFILE_NEED_NOAUTOMOUNT - #define GFILE_NEED_NOAUTOMOUNT FALSE + #define GFILE_NEED_NOAUTOMOUNT GFXOFF #endif /** * @brief Should the filesystem be synced automatically @@ -38,46 +38,46 @@ * himself using @p gfileSync() * @details Not all filesystems implement the syncing feature. This feature will * have no effect in such a case. - * @details Defaults to FALSE + * @details Defaults to GFXOFF */ #ifndef GFILE_NEED_NOAUTOSYNC - #define GFILE_NEED_NOAUTOSYNC FALSE + #define GFILE_NEED_NOAUTOSYNC GFXOFF #endif /** * @brief Include printg, fprintg etc functions - * @details Defaults to FALSE + * @details Defaults to GFXOFF * @pre To get the string sprintg functions you also need to define @p GFILE_NEED_STRINGS */ #ifndef GFILE_NEED_PRINTG - #define GFILE_NEED_PRINTG FALSE + #define GFILE_NEED_PRINTG GFXOFF #endif /** * @brief Include scang, fscang etc functions - * @details Defaults to FALSE + * @details Defaults to GFXOFF * @pre To get the string sscang functions you also need to define @p GFILE_NEED_STRINGS */ #ifndef GFILE_NEED_SCANG - #define GFILE_NEED_SCANG FALSE + #define GFILE_NEED_SCANG GFXOFF #endif /** * @brief Include the string based file functions - * @details Defaults to FALSE + * @details Defaults to GFXOFF */ #ifndef GFILE_NEED_STRINGS - #define GFILE_NEED_STRINGS FALSE + #define GFILE_NEED_STRINGS GFXOFF #endif /** * @brief Map many stdio functions to their GFILE equivalent - * @details Defaults to FALSE + * @details Defaults to GFXOFF * @note This replaces the functions in stdio.h with equivalents * - Do not include stdio.h as it has different conflicting definitions. */ #ifndef GFILE_NEED_STDIO - #define GFILE_NEED_STDIO FALSE + #define GFILE_NEED_STDIO GFXOFF #endif /** * @brief Include the USER file system - * @details Defaults to FALSE + * @details Defaults to GFXOFF * @note The User FS vmt strcture 'FsUSERVMT' must be defined and implemented in the user's project. * @note If GFILE_ALLOW_DEVICESPECIFIC is on then you can ensure that you are * opening a file on the USER file system by prefixing @@ -88,11 +88,11 @@ * used is not one used by the other file systems. */ #ifndef GFILE_NEED_USERFS - #define GFILE_NEED_USERFS FALSE + #define GFILE_NEED_USERFS GFXOFF #endif /** * @brief Include the ROM file system - * @details Defaults to FALSE + * @details Defaults to GFXOFF * @note If GFILE_ALLOW_DEVICESPECIFIC is on then you can ensure that you are * opening a file on the ROM file system by prefixing * its name with "S|" (the letter 'S', followed by a vertical bar). @@ -101,11 +101,11 @@ * converted to .h files using the file2c utility (using flags "-dbcs"). */ #ifndef GFILE_NEED_ROMFS - #define GFILE_NEED_ROMFS FALSE + #define GFILE_NEED_ROMFS GFXOFF #endif /** * @brief Include the RAM file system - * @details Defaults to FALSE + * @details Defaults to GFXOFF * @note If GFILE_ALLOW_DEVICESPECIFIC is on then you can ensure that you are * opening a file on the RAM file system by prefixing * its name with "R|" (the letter 'R', followed by a vertical bar). @@ -113,11 +113,11 @@ * to be allocated in RAM. */ #ifndef GFILE_NEED_RAMFS - #define GFILE_NEED_RAMFS FALSE + #define GFILE_NEED_RAMFS GFXOFF #endif /** * @brief Include the FAT file system driver based on the FATFS library - * @details Defaults to FALSE + * @details Defaults to GFXOFF * @note If GFILE_ALLOW_DEVICESPECIFIC is on then you can ensure that you are * opening a file on the FAT file system by prefixing * its name with "F|" (the letter 'F', followed by a vertical bar). @@ -126,11 +126,11 @@ * one can be used at a time. The block interfaces are also different. */ #ifndef GFILE_NEED_FATFS - #define GFILE_NEED_FATFS FALSE + #define GFILE_NEED_FATFS GFXOFF #endif /** * @brief Include the FAT file system driver based on the PETITFS library - * @details Defaults to FALSE + * @details Defaults to GFXOFF * @note If GFILE_ALLOW_DEVICESPECIFIC is on then you can ensure that you are * opening a file on the FAT file system by prefixing * its name with "F|" (the letter 'F', followed by a vertical bar). @@ -142,11 +142,11 @@ * @note PETITFS can only have one file open at a time. */ #ifndef GFILE_NEED_PETITFS - #define GFILE_NEED_PETITFS FALSE + #define GFILE_NEED_PETITFS GFXOFF #endif /** * @brief Include the operating system's native file system - * @details Defaults to FALSE + * @details Defaults to GFXOFF * @note If GFILE_ALLOW_DEVICESPECIFIC is on then you can ensure that you are * opening a file on the native file system by prefixing * its name with "N|" (the letter 'N', followed by a vertical bar). @@ -155,11 +155,11 @@ * If it is not defined the gfileStdOut and gfileStdErr io is discarded. */ #ifndef GFILE_NEED_NATIVEFS - #define GFILE_NEED_NATIVEFS FALSE + #define GFILE_NEED_NATIVEFS GFXOFF #endif /** * @brief Include ChibiOS BaseFileStream support - * @details Defaults to FALSE + * @details Defaults to GFXOFF * @pre This is only relevant on the ChibiOS operating system. * @note Use the @p gfileOpenBaseFileStream() call to open a GFILE based on a * BaseFileStream. The BaseFileStream must already be open. @@ -167,25 +167,25 @@ * must be pre-opened using the operating system. */ #ifndef GFILE_NEED_CHIBIOSFS - #define GFILE_NEED_CHIBIOSFS FALSE + #define GFILE_NEED_CHIBIOSFS GFXOFF #endif /** * @brief Include raw memory pointer support - * @details Defaults to FALSE + * @details Defaults to GFXOFF * @note Use the @p gfileOpenMemory() call to open a GFILE based on a * memory pointer. The GFILE opened appears to be of unlimited size. * @note A GFile of this type cannot be opened by filename. */ #ifndef GFILE_NEED_MEMFS - #define GFILE_NEED_MEMFS FALSE + #define GFILE_NEED_MEMFS GFXOFF #endif /** * @brief Include support for file list functions - * @details Defaults to FALSE + * @details Defaults to GFXOFF * @note Adds support for @p gfileOpenFileList(), @p gfileReadFileList() and @p gfileCloseFileList(). */ #ifndef GFILE_NEED_FILELISTS - #define GFILE_NEED_FILELISTS FALSE + #define GFILE_NEED_FILELISTS GFXOFF #endif /** * @} @@ -197,7 +197,7 @@ * @brief Add floating point support to printg/scang etc. */ #ifndef GFILE_ALLOW_FLOATS - #define GFILE_ALLOW_FLOATS FALSE + #define GFILE_ALLOW_FLOATS GFXOFF #endif /** * @brief Can the device be specified as part of the file name. @@ -206,7 +206,7 @@ * specific device. */ #ifndef GFILE_ALLOW_DEVICESPECIFIC - #define GFILE_ALLOW_DEVICESPECIFIC FALSE + #define GFILE_ALLOW_DEVICESPECIFIC GFXOFF #endif /** * @brief The maximum number of open files @@ -228,7 +228,7 @@ * be compatible with uGFX memory management. */ #ifndef GFILE_FATFS_EXTERNAL_LIB - #define GFILE_FATFS_EXTERNAL_LIB FALSE + #define GFILE_FATFS_EXTERNAL_LIB GFXOFF #endif /** * @brief TUse an external PETITFS library instead of the uGFX inbuilt one @@ -238,7 +238,7 @@ * @note The users pffconf.h file still needs to be reachable when compiling uGFX. */ #ifndef GFILE_PETITFS_EXTERNAL_LIB - #define GFILE_PETITFS_EXTERNAL_LIB FALSE + #define GFILE_PETITFS_EXTERNAL_LIB GFXOFF #endif /** @} */ @@ -11,7 +11,7 @@ */ /* Display various warnings from gfx_rules.h */ -#define GFX_DISPLAY_RULE_WARNINGS TRUE +#define GFX_DISPLAY_RULE_WARNINGS GFXON #include "../gfx.h" diff --git a/src/gfx_compilers.h b/src/gfx_compilers.h index 6d1dae1e..8ca1f2d4 100644 --- a/src/gfx_compilers.h +++ b/src/gfx_compilers.h @@ -25,12 +25,12 @@ */ /** * @brief Should various inline ugfx functions be non-inline. - * @details Defaults to FALSE - * @note Generally there is no need to set this to TRUE as it will have huge performance impacts + * @details Defaults to GFXOFF + * @note Generally there is no need to set this to GFXON as it will have huge performance impacts * in the driver level. */ #ifndef GFX_NO_INLINE - #define GFX_NO_INLINE FALSE + #define GFX_NO_INLINE GFXOFF #endif // Set the no inline value @@ -42,7 +42,7 @@ * @brief Show which compiler we detected as a compiler warning message */ #ifndef GFX_SHOW_COMPILER - #define GFX_SHOW_COMPILER FALSE + #define GFX_SHOW_COMPILER GFXOFF #endif /** @@ -371,7 +371,7 @@ #define GFX_COMPILER_VERSION_PATCH ((__CC65__)%0x10) #elif GFX_COMPILER == GFX_COMPILER_CLANG #define GFX_COMPILER_NAME "CLang (LLVM)" - #define GFX_COMPILER_TESTED TRUE + #define GFX_COMPILER_TESTED GFXON #define GFX_COMPILER_WARNING_TYPE GFX_COMPILER_WARNING_GCC #define GFX_COMPILER_VERSION_MAJOR (__clang_major__) #define GFX_COMPILER_VERSION_MINOR (__clang_minor__) @@ -411,7 +411,7 @@ #define GFX_COMPILER_VERSION_MINOR (_RELEASE_MINOR) #elif GFX_COMPILER == GFX_COMPILER_CYGWIN #define GFX_COMPILER_NAME "Cygwin" - #define GFX_COMPILER_TESTED TRUE + #define GFX_COMPILER_TESTED GFXON #define GFX_COMPILER_WARNING_TYPE GFX_COMPILER_WARNING_GCC #define GFX_COMPILER_VERSION_MAJOR (__GNUC__) #define GFX_COMPILER_VERSION_MINOR (__GNUC_MINOR__) @@ -469,7 +469,7 @@ #warning "Compiler: EDG" #endif #define GFX_COMPILER_NAME "EDG C++" - #define GFX_COMPILER_TESTED TRUE + #define GFX_COMPILER_TESTED GFXON #define GFX_COMPILER_VERSION_MAJOR ((__EDG_VERSION__)/100) #define GFX_COMPILER_VERSION_MINOR ((__EDG_VERSION__)%100) #pragma diag_remark = Pe301 @@ -494,7 +494,7 @@ #define GFX_COMPILER_NAME "Fujitsu C++" #elif GFX_COMPILER == GFX_COMPILER_GCC #define GFX_COMPILER_NAME "GCC" - #define GFX_COMPILER_TESTED TRUE + #define GFX_COMPILER_TESTED GFXON #define GFX_COMPILER_WARNING_TYPE GFX_COMPILER_WARNING_GCC #define GFX_COMPILER_VERSION_MAJOR (__GNUC__) #define GFX_COMPILER_VERSION_MINOR (__GNUC_MINOR__) @@ -535,7 +535,7 @@ #warning "Compiler: IAR" #endif #define GFX_COMPILER_NAME "IAR C++" - #define GFX_COMPILER_TESTED TRUE + #define GFX_COMPILER_TESTED GFXON #define GFX_COMPILER_VERSION_MAJOR ((__VER__)/100) #define GFX_COMPILER_VERSION_MINOR ((__VER__)%100) #pragma diag_remark = Pe301 @@ -599,7 +599,7 @@ #warning "Compiler: KEIL" #endif #define GFX_COMPILER_NAME "Keil" - #define GFX_COMPILER_TESTED TRUE + #define GFX_COMPILER_TESTED GFXON #if defined(__ARMCC_VERSION) #define GFX_COMPILER_VERSION_MAJOR ((__ARMCC_VERSION)/1000000) #define GFX_COMPILER_VERSION_MINOR (((__ARMCC_VERSION)/10000)%100) @@ -657,7 +657,7 @@ #define GFX_COMPILER_NAME "Microway NDP C" #elif GFX_COMPILER == GFX_COMPILER_MINGW32 #define GFX_COMPILER_NAME "MingW32" - #define GFX_COMPILER_TESTED TRUE + #define GFX_COMPILER_TESTED GFXON #define GFX_COMPILER_WARNING_TYPE GFX_COMPILER_WARNING_GCC #define GFX_COMPILER_VERSION_MAJOR (__GNUC__) #define GFX_COMPILER_VERSION_MINOR (__GNUC_MINOR__) @@ -848,7 +848,7 @@ #warning "Compiler: TINYC" #endif #define GFX_COMPILER_NAME "Tiny C" - #define GFX_COMPILER_TESTED TRUE + #define GFX_COMPILER_TESTED GFXON #elif GFX_COMPILER == GFX_COMPILER_TURBOC #if GFX_SHOW_COMPILER && GFX_DISPLAY_RULE_WARNINGS #warning "Compiler: TURBOC" @@ -928,7 +928,7 @@ #endif #ifndef GFX_COMPILER_TESTED - #define GFX_COMPILER_TESTED FALSE + #define GFX_COMPILER_TESTED GFXOFF #endif #ifndef GFX_COMPILER_WARNING_TYPE #define GFX_COMPILER_WARNING_TYPE GFX_COMPILER_WARNING_DIRECT @@ -1071,7 +1071,7 @@ /************************************ Start CPU Settings *****************************/ #if GFX_CPU == GFX_CPU_X86 #undef GFX_CPU_NO_ALIGNMENT_FAULTS - #define GFX_CPU_NO_ALIGNMENT_FAULTS TRUE + #define GFX_CPU_NO_ALIGNMENT_FAULTS GFXON #undef GFX_CPU_ENDIAN #define GFX_CPU_ENDIAN GFX_CPU_ENDIAN_LITTLE #elif GFX_CPU == GFX_CPU_X64 @@ -1082,16 +1082,16 @@ /** * @brief Does this CPU automatically handle alignment faults - * @details Defaults to FALSE - * @note Setting this to TRUE can decrease code size and increase speed but + * @details Defaults to GFXOFF + * @note Setting this to GFXON can decrease code size and increase speed but * it should not be turned on with a CPU that can generate * alignment segfaults. - * @note If you are unsure leave this as FALSE as that generates + * @note If you are unsure leave this as GFXOFF as that generates * the more conservative code. * @note For some CPU's this can be auto-detected. */ #ifndef GFX_CPU_NO_ALIGNMENT_FAULTS - #define GFX_CPU_NO_ALIGNMENT_FAULTS FALSE + #define GFX_CPU_NO_ALIGNMENT_FAULTS GFXOFF #endif /** diff --git a/src/ginput/ginput.h b/src/ginput/ginput.h index 0aae5391..0a52e543 100644 --- a/src/ginput/ginput.h +++ b/src/ginput/ginput.h @@ -15,7 +15,7 @@ * @details GINPUT provides an easy and common interface to use different input devices * such as touchscreens and mices. * - * @pre GFX_USE_GINPUT must be set to TRUE in your gfxconf.h + * @pre GFX_USE_GINPUT must be set to GFXON in your gfxconf.h * * @{ */ diff --git a/src/ginput/ginput_dial.h b/src/ginput/ginput_dial.h index e0292cb6..77c1b05c 100644 --- a/src/ginput/ginput_dial.h +++ b/src/ginput/ginput_dial.h @@ -16,8 +16,8 @@ * @details A dial provides a powerful way to navigate through menus * on a display. * - * @pre GFX_USE_GINPUT must be set to TRUE in your gfxconf.h - * @pre GINPUT_NEED_DIAL must be set to TRUE in your gfxconf.h + * @pre GFX_USE_GINPUT must be set to GFXON in your gfxconf.h + * @pre GINPUT_NEED_DIAL must be set to GFXON in your gfxconf.h * * @{ */ diff --git a/src/ginput/ginput_keyboard.c b/src/ginput/ginput_keyboard.c index 141bdd2b..68f05cea 100644 --- a/src/ginput/ginput_keyboard.c +++ b/src/ginput/ginput_keyboard.c @@ -17,7 +17,7 @@ #if GFX_USE_GINPUT && GINPUT_NEED_KEYBOARD -#define MICROCODE_DEBUG FALSE +#define MICROCODE_DEBUG GFXOFF #if MICROCODE_DEBUG #include <stdio.h> diff --git a/src/ginput/ginput_mouse.h b/src/ginput/ginput_mouse.h index 24005fe6..8d8b3b9a 100644 --- a/src/ginput/ginput_mouse.h +++ b/src/ginput/ginput_mouse.h @@ -15,8 +15,8 @@ * * @details Both resistive and capacitive touchscreens are supported. * - * @pre GFX_USE_GINPUT must be set to TRUE in your gfxconf.h - * @pre GINPUT_NEED_MOUSE must be set to TRUE in your gfxconf.h + * @pre GFX_USE_GINPUT must be set to GFXON in your gfxconf.h + * @pre GINPUT_NEED_MOUSE must be set to GFXON in your gfxconf.h * * @{ */ @@ -160,7 +160,7 @@ extern "C" { * @param[in] sz The size in bytes of the data to retrieve. * * @note This routine is provided by the user application. It is only - * called if GINPUT_TOUCH_USER_CALIBRATION_LOAD has been set to TRUE in the + * called if GINPUT_TOUCH_USER_CALIBRATION_LOAD has been set to GFXON in the * users gfxconf.h file. */ bool_t LoadMouseCalibration(unsigned instance, void *data, size_t sz); @@ -174,7 +174,7 @@ extern "C" { * @param[in] sz The size in bytes of the data to retrieve. * * @note This routine is provided by the user application. It is only - * called if GINPUT_TOUCH_USER_CALIBRATION_SAVE has been set to TRUE in the + * called if GINPUT_TOUCH_USER_CALIBRATION_SAVE has been set to GFXON in the * users gfxconf.h file. */ bool_t SaveMouseCalibration(unsigned instance, const void *data, size_t sz); diff --git a/src/ginput/ginput_options.h b/src/ginput/ginput_options.h index 9fba51f9..f02a5a09 100644 --- a/src/ginput/ginput_options.h +++ b/src/ginput/ginput_options.h @@ -22,43 +22,43 @@ */ /** * @brief Should mouse/touch functions be included. - * @details Defaults to FALSE + * @details Defaults to GFXOFF * @note Also add a mouse/touch hardware driver to your makefile. * Eg. * include $(GFXLIB)/drivers/ginput/touch/MCU/driver.mk */ #ifndef GINPUT_NEED_MOUSE - #define GINPUT_NEED_MOUSE FALSE + #define GINPUT_NEED_MOUSE GFXOFF #endif /** * @brief Should keyboard functions be included. - * @details Defaults to FALSE + * @details Defaults to GFXOFF * @note Also add a keyboard hardware driver to your makefile. * Eg. * include $(GFXLIB)/drivers/ginput/keyboard/XXXX/driver.mk */ #ifndef GINPUT_NEED_KEYBOARD - #define GINPUT_NEED_KEYBOARD FALSE + #define GINPUT_NEED_KEYBOARD GFXOFF #endif /** * @brief Should hardware toggle/switch/button functions be included. - * @details Defaults to FALSE + * @details Defaults to GFXOFF * @note Also add a toggle hardware driver to your makefile. * Eg. * include $(GFXLIB)/drivers/ginput/toggle/Pal/driver.mk */ #ifndef GINPUT_NEED_TOGGLE - #define GINPUT_NEED_TOGGLE FALSE + #define GINPUT_NEED_TOGGLE GFXOFF #endif /** * @brief Should analog dial functions be included. - * @details Defaults to FALSE + * @details Defaults to GFXOFF * @note Also add a dial hardware driver to your makefile. * Eg. * include $(GFXLIB)/drivers/ginput/dial/analog/driver.mk */ #ifndef GINPUT_NEED_DIAL - #define GINPUT_NEED_DIAL FALSE + #define GINPUT_NEED_DIAL GFXOFF #endif /** * @} @@ -74,16 +74,16 @@ */ /** * @brief Start touch devices without loading or running calibration. - * @details Defaults to FALSE + * @details Defaults to GFXOFF * @note This is used if you want to manually control the initial calibration * process. In practice this is only useful for a touch driver test program. */ #ifndef GINPUT_TOUCH_STARTRAW - #define GINPUT_TOUCH_STARTRAW FALSE + #define GINPUT_TOUCH_STARTRAW GFXOFF #endif /** * @brief Turn off the touch calibration GUI. - * @details Defaults to FALSE + * @details Defaults to GFXOFF * @note Turning off the calibration GUI just turns off the manual calibration * process. Readings may still be calibrated if calibration data * can be loaded. @@ -91,28 +91,28 @@ * using this option can save a lot of space. */ #ifndef GINPUT_TOUCH_NOCALIBRATE_GUI - #define GINPUT_TOUCH_NOCALIBRATE_GUI FALSE + #define GINPUT_TOUCH_NOCALIBRATE_GUI GFXOFF #endif /** * @brief Turn off all touch calibration support. - * @details Defaults to FALSE - * @note With this set to TRUE touch readings will not be calibrated. + * @details Defaults to GFXOFF + * @note With this set to GFXON touch readings will not be calibrated. * @note This automatically turns off the calibration GUI too! * @note Calibration requires a lot of code. If your device doesn't require it * using this option can save a lot of space. */ #ifndef GINPUT_TOUCH_NOCALIBRATE - #define GINPUT_TOUCH_NOCALIBRATE FALSE + #define GINPUT_TOUCH_NOCALIBRATE GFXOFF #endif /** * @brief Turn off all touch support. - * @details Defaults to FALSE + * @details Defaults to GFXOFF * @note This automatically turns off all calibration and the calibration GUI too! * @note Touch device handling requires a lot of code. If your device doesn't require it * using this option can save a lot of space. */ #ifndef GINPUT_TOUCH_NOTOUCH - #define GINPUT_TOUCH_NOTOUCH FALSE + #define GINPUT_TOUCH_NOTOUCH GFXOFF #endif /** * @brief Milliseconds between mouse polls. @@ -143,19 +143,19 @@ #endif /** * @brief There is a user supplied routine to load mouse calibration data - * @details Defaults to FALSE - * @note If TRUE the user must supply the @p LoadMouseCalibration() routine. + * @details Defaults to GFXOFF + * @note If GFXON the user must supply the @p LoadMouseCalibration() routine. */ #ifndef GINPUT_TOUCH_USER_CALIBRATION_LOAD - #define GINPUT_TOUCH_USER_CALIBRATION_LOAD FALSE + #define GINPUT_TOUCH_USER_CALIBRATION_LOAD GFXOFF #endif /** * @brief There is a user supplied routine to save mouse calibration data - * @details Defaults to FALSE - * @note If TRUE the user must supply the @p SaveMouseCalibration() routine. + * @details Defaults to GFXOFF + * @note If GFXON the user must supply the @p SaveMouseCalibration() routine. */ #ifndef GINPUT_TOUCH_USER_CALIBRATION_SAVE - #define GINPUT_TOUCH_USER_CALIBRATION_SAVE FALSE + #define GINPUT_TOUCH_USER_CALIBRATION_SAVE GFXOFF #endif #if defined(__DOXYGEN__) /** @@ -198,7 +198,7 @@ * @note Turning off the layout engine just saves code if it is not needed. */ #ifndef GKEYBOARD_LAYOUT_OFF - #define GKEYBOARD_LAYOUT_OFF FALSE + #define GKEYBOARD_LAYOUT_OFF GFXOFF #endif /** * @brief Various Keyboard Layouts that can be included. @@ -212,7 +212,7 @@ * @{ */ #ifndef GKEYBOARD_LAYOUT_SCANCODE2_US - #define GKEYBOARD_LAYOUT_SCANCODE2_US FALSE // US Keyboard using the ScanCode 2 set. + #define GKEYBOARD_LAYOUT_SCANCODE2_US GFXOFF // US Keyboard using the ScanCode 2 set. #endif /** @} */ /** @} */ diff --git a/src/ginput/ginput_rules.h b/src/ginput/ginput_rules.h index 5825e2f0..d78f0c4c 100644 --- a/src/ginput/ginput_rules.h +++ b/src/ginput/ginput_rules.h @@ -20,35 +20,35 @@ #if !GFX_USE_GEVENT #if GFX_DISPLAY_RULE_WARNINGS #if GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_DIRECT - #warning "GINPUT: GFX_USE_GEVENT is required if GFX_USE_GINPUT is TRUE. It has been turned on for you." + #warning "GINPUT: GFX_USE_GEVENT is required if GFX_USE_GINPUT is GFXON. It has been turned on for you." #elif GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_MACRO - COMPILER_WARNING("GINPUT: GFX_USE_GEVENT is required if GFX_USE_GINPUT is TRUE. It has been turned on for you.") + COMPILER_WARNING("GINPUT: GFX_USE_GEVENT is required if GFX_USE_GINPUT is GFXON. It has been turned on for you.") #endif #endif #undef GFX_USE_GEVENT - #define GFX_USE_GEVENT TRUE + #define GFX_USE_GEVENT GFXON #endif #if !GFX_USE_GTIMER #if GFX_DISPLAY_RULE_WARNINGS #if GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_DIRECT - #warning "GINPUT: GFX_USE_GTIMER is required if GFX_USE_GINPUT is TRUE. It has been turned on for you." + #warning "GINPUT: GFX_USE_GTIMER is required if GFX_USE_GINPUT is GFXON. It has been turned on for you." #elif GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_MACRO - COMPILER_WARNING("GINPUT: GFX_USE_GTIMER is required if GFX_USE_GINPUT is TRUE. It has been turned on for you.") + COMPILER_WARNING("GINPUT: GFX_USE_GTIMER is required if GFX_USE_GINPUT is GFXON. It has been turned on for you.") #endif #endif #undef GFX_USE_GTIMER - #define GFX_USE_GTIMER TRUE + #define GFX_USE_GTIMER GFXON #endif #if GINPUT_NEED_MOUSE #if GINPUT_TOUCH_NOTOUCH // No warning needed for this #undef GINPUT_TOUCH_NOCALIBRATE - #define GINPUT_TOUCH_NOCALIBRATE TRUE + #define GINPUT_TOUCH_NOCALIBRATE GFXON #endif #if GINPUT_TOUCH_NOCALIBRATE // No warning needed for this #undef GINPUT_TOUCH_NOCALIBRATE_GUI - #define GINPUT_TOUCH_NOCALIBRATE_GUI TRUE + #define GINPUT_TOUCH_NOCALIBRATE_GUI GFXON #endif #if !GINPUT_TOUCH_NOTOUCH && GINPUT_MOUSE_CLICK_TIME > GINPUT_TOUCH_CXTCLICK_TIME #error "GINPUT MOUSE: The GINPUT_MOUSE_CLICK_TIME must be <= GINPUT_TOUCH_CXTCLICK_TIME" diff --git a/src/ginput/ginput_toggle.h b/src/ginput/ginput_toggle.h index ad896bf6..7d028301 100644 --- a/src/ginput/ginput_toggle.h +++ b/src/ginput/ginput_toggle.h @@ -16,8 +16,8 @@ * @details GINPUT allows it to interface toggle buttons easily to your * application. * - * @pre GFX_USE_GINPUT must be set to TRUE in your gfxconf.h - * @pre GINPUT_NEED_TOGGLE must be set to TRUE in your gfxconf.h + * @pre GFX_USE_GINPUT must be set to GFXON in your gfxconf.h + * @pre GINPUT_NEED_TOGGLE must be set to GFXON in your gfxconf.h * * @{ */ diff --git a/src/gmisc/gmisc_options.h b/src/gmisc/gmisc_options.h index 5dce4d94..0523c111 100644 --- a/src/gmisc/gmisc_options.h +++ b/src/gmisc/gmisc_options.h @@ -22,38 +22,38 @@ */ /** * @brief Include array operation functions - * @details Defaults to FALSE + * @details Defaults to GFXOFF */ #ifndef GMISC_NEED_ARRAYOPS - #define GMISC_NEED_ARRAYOPS FALSE + #define GMISC_NEED_ARRAYOPS GFXOFF #endif /** * @brief Include fast floating point trig functions (fsin, fcos) - * @details Defaults to FALSE + * @details Defaults to GFXOFF */ #ifndef GMISC_NEED_FASTTRIG - #define GMISC_NEED_FASTTRIG FALSE + #define GMISC_NEED_FASTTRIG GFXOFF #endif /** * @brief Include fast fixed point trig functions (ffsin, ffcos) - * @details Defaults to FALSE + * @details Defaults to GFXOFF */ #ifndef GMISC_NEED_FIXEDTRIG - #define GMISC_NEED_FIXEDTRIG FALSE + #define GMISC_NEED_FIXEDTRIG GFXOFF #endif /** * @brief Include fast inverse square root (x^-1/2) - * @details Defaults to FALSE + * @details Defaults to GFXOFF */ #ifndef GMISC_NEED_INVSQRT - #define GMISC_NEED_INVSQRT FALSE + #define GMISC_NEED_INVSQRT GFXOFF #endif /** * @brief Include polygon hit test functions - * @details Defaults to FALSE + * @details Defaults to GFXOFF */ #ifndef GMISC_NEED_HITTEST_POLY - #define GMISC_NEED_HITTEST_POLY FALSE + #define GMISC_NEED_HITTEST_POLY GFXOFF #endif /** * @} @@ -75,7 +75,7 @@ * GMISC_INVSQRT_REAL_SLOW and it will do it the hard way. */ #ifndef GMISC_INVSQRT_MIXED_ENDIAN - #define GMISC_INVSQRT_MIXED_ENDIAN FALSE + #define GMISC_INVSQRT_MIXED_ENDIAN GFXOFF #endif /** * @brief Modifies the @p invsqrt() function to do things the long slow way. @@ -84,7 +84,7 @@ * @note This makes the @p invsqrt() function very slow. */ #ifndef GMISC_INVSQRT_REAL_SLOW - #define GMISC_INVSQRT_REAL_SLOW FALSE + #define GMISC_INVSQRT_REAL_SLOW GFXOFF #endif /** @} */ diff --git a/src/gos/gos.h b/src/gos/gos.h index da09a38a..9ba12889 100644 --- a/src/gos/gos.h +++ b/src/gos/gos.h @@ -88,8 +88,6 @@ * @note Your platform may use slightly different definitions to these * @{ */ - #define FALSE 0 - #define TRUE 1 #define TIME_IMMEDIATE 0 #define TIME_INFINITE ((delaytime_t)-1) #define MAX_SEMAPHORE_COUNT ((semcount_t)(((unsigned long)((semcount_t)(-1))) >> 1)) @@ -193,7 +191,7 @@ * @api */ #ifndef GFX_EMULATE_MALLOC - #define GFX_EMULATE_MALLOC FALSE + #define GFX_EMULATE_MALLOC GFXOFF #endif /** diff --git a/src/gos/gos_arduino.h b/src/gos/gos_arduino.h index 3019d271..a9b0c140 100644 --- a/src/gos/gos_arduino.h +++ b/src/gos/gos_arduino.h @@ -59,8 +59,8 @@ extern "C" { /* Use the generic thread handling and heap handling */ /*===========================================================================*/ -#define GOS_NEED_X_THREADS TRUE -#define GOS_NEED_X_HEAP TRUE +#define GOS_NEED_X_THREADS GFXON +#define GOS_NEED_X_HEAP GFXON #include "gos_x_threads.h" #include "gos_x_heap.h" diff --git a/src/gos/gos_chibios.h b/src/gos/gos_chibios.h index aedfb492..cb683631 100644 --- a/src/gos/gos_chibios.h +++ b/src/gos/gos_chibios.h @@ -10,10 +10,13 @@ #if GFX_USE_OS_CHIBIOS -// This shouldn't be needed but some people are complaining -// about TRUE/FALSE redefinition so we fix it here. -#undef TRUE -#undef FALSE +#if GFX_COMPAT_V2 + // This shouldn't be needed but some people are complaining + // about TRUE/FALSE redefinition so we fix it here. + // ChibiOS will define them in its own header files. + #undef TRUE + #undef FALSE +#endif #include "ch.h" #include "hal.h" @@ -33,12 +36,6 @@ * are already defined by ChibiOS */ -#if !defined(FALSE) - #define FALSE 0 -#endif -#if !defined(TRUE) - #define TRUE -1 -#endif #if (CH_KERNEL_MAJOR == 3) || (CH_KERNEL_MAJOR == 4) typedef char bool_t; #endif diff --git a/src/gos/gos_cmsis.h b/src/gos/gos_cmsis.h index 85aa1362..aad4cb84 100644 --- a/src/gos/gos_cmsis.h +++ b/src/gos/gos_cmsis.h @@ -99,7 +99,7 @@ gfxThreadHandle gfxThreadCreate(void* stackarea, size_t stacksz, threadpriority_ /* Use the generic heap handling */ /*===========================================================================*/ -#define GOS_NEED_X_HEAP TRUE +#define GOS_NEED_X_HEAP GFXON #include "gos_x_heap.h" #endif /* GFX_USE_OS_CMSIS */ diff --git a/src/gos/gos_cmsis2.h b/src/gos/gos_cmsis2.h index bd8c9042..1f4eab5e 100644 --- a/src/gos/gos_cmsis2.h +++ b/src/gos/gos_cmsis2.h @@ -92,7 +92,7 @@ gfxThreadHandle gfxThreadCreate(void* stackarea, size_t stacksz, threadpriority_ /* Use the generic heap handling */ /*===========================================================================*/ -#define GOS_NEED_X_HEAP TRUE +#define GOS_NEED_X_HEAP GFXON #include "gos_x_heap.h" #endif /* GFX_USE_OS_CMSIS */ diff --git a/src/gos/gos_ecos.c b/src/gos/gos_ecos.c index a55773d9..a2af5dbf 100644 --- a/src/gos/gos_ecos.c +++ b/src/gos/gos_ecos.c @@ -12,7 +12,7 @@ void _gosInit(void) { #if !GFX_OS_NO_INIT - #error "GOS: Operating System initialization for eCos is not yet implemented in uGFX. Please set GFX_OS_NO_INIT to TRUE in your gfxconf.h" + #error "GOS: Operating System initialization for eCos is not yet implemented in uGFX. Please set GFX_OS_NO_INIT to GFXON in your gfxconf.h" #endif #if !GFX_OS_INIT_NO_WARNING #if GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_DIRECT diff --git a/src/gos/gos_ecos.h b/src/gos/gos_ecos.h index 0e438fb0..b03243f3 100644 --- a/src/gos/gos_ecos.h +++ b/src/gos/gos_ecos.h @@ -27,8 +27,6 @@ typedef cyg_int32 int32_t; typedef cyg_uint32 uint32_t; typedef cyg_uint32 size_t; -#define TRUE -1 -#define FALSE 0 #define TIME_IMMEDIATE 0 #define TIME_INFINITE 0xFFFFFFFF diff --git a/src/gos/gos_freertos.h b/src/gos/gos_freertos.h index a0f1ed18..87ef8163 100644 --- a/src/gos/gos_freertos.h +++ b/src/gos/gos_freertos.h @@ -42,7 +42,6 @@ * int16_t, uint16_t, * int32_t, uint32_t, * size_t - * TRUE, FALSE * are already defined by FreeRTOS */ #define TIME_IMMEDIATE 0 diff --git a/src/gos/gos_keil.h b/src/gos/gos_keil.h index 863986d4..35d6e4e1 100644 --- a/src/gos/gos_keil.h +++ b/src/gos/gos_keil.h @@ -19,13 +19,13 @@ * Keil RTX uses the CMSIS RTOS interface. Therefore, just use the CMSIS RTOS port */ -// Disable KEIL to avoid error: "GOS: More than one operation system has been defined as TRUE." +// Disable KEIL to avoid error: "GOS: More than one operation system has been defined as GFXON." #undef GFX_USE_OS_KEIL -#define GFX_USE_OS_KEIL FALSE +#define GFX_USE_OS_KEIL GFXOFF // Enable generic CMSIS RTOS implementation #undef GFX_USE_OS_CMSIS -#define GFX_USE_OS_CMSIS TRUE +#define GFX_USE_OS_CMSIS GFXON #include "gos_cmsis.h" #endif /* GFX_USE_OS_KEIL */ diff --git a/src/gos/gos_linux.c b/src/gos/gos_linux.c index 43371443..bd4e0060 100644 --- a/src/gos/gos_linux.c +++ b/src/gos/gos_linux.c @@ -13,7 +13,7 @@ #if GFX_USE_OS_LINUX // Linux seems to have deprecated pthread_yield() and now says to use sched_yield() -#define USE_SCHED_NOT_PTHREAD_YIELD TRUE +#define USE_SCHED_NOT_PTHREAD_YIELD GFXON #include <stdio.h> #include <unistd.h> diff --git a/src/gos/gos_linux.h b/src/gos/gos_linux.h index b9bfe82e..f1973615 100644 --- a/src/gos/gos_linux.h +++ b/src/gos/gos_linux.h @@ -12,7 +12,7 @@ // We don't put this in the general sys_options.h as it is Linux specific. #ifndef GFX_USE_POSIX_SEMAPHORES - #define GFX_USE_POSIX_SEMAPHORES TRUE + #define GFX_USE_POSIX_SEMAPHORES GFXON #endif #include <sys/types.h> diff --git a/src/gos/gos_nios.h b/src/gos/gos_nios.h index 4aadc45d..75bf5676 100644 --- a/src/gos/gos_nios.h +++ b/src/gos/gos_nios.h @@ -34,8 +34,8 @@ systemticks_t gfxMillisecondsToTicks(delaytime_t ms); // Use the generic thread handling and heap handling -#define GOS_NEED_X_THREADS TRUE -#define GOS_NEED_X_HEAP TRUE +#define GOS_NEED_X_THREADS GFXON +#define GOS_NEED_X_HEAP GFXON #include "gos_x_threads.h" #include "gos_x_heap.h" diff --git a/src/gos/gos_options.h b/src/gos/gos_options.h index 319af5d5..3f04ca4a 100644 --- a/src/gos/gos_options.h +++ b/src/gos/gos_options.h @@ -22,115 +22,115 @@ */ /** * @brief Use ChibiOS - * @details Defaults to FALSE + * @details Defaults to GFXOFF */ #ifndef GFX_USE_OS_CHIBIOS - #define GFX_USE_OS_CHIBIOS FALSE + #define GFX_USE_OS_CHIBIOS GFXOFF #endif /** * @brief Use FreeRTOS - * @details Defaults to FALSE + * @details Defaults to GFXOFF */ #ifndef GFX_USE_OS_FREERTOS - #define GFX_USE_OS_FREERTOS FALSE + #define GFX_USE_OS_FREERTOS GFXOFF #endif /** * @brief Use Win32 - * @details Defaults to FALSE + * @details Defaults to GFXOFF */ #ifndef GFX_USE_OS_WIN32 - #define GFX_USE_OS_WIN32 FALSE + #define GFX_USE_OS_WIN32 GFXOFF #endif /** * @brief Use a linux based system running X11 - * @details Defaults to FALSE + * @details Defaults to GFXOFF */ #ifndef GFX_USE_OS_LINUX - #define GFX_USE_OS_LINUX FALSE + #define GFX_USE_OS_LINUX GFXOFF #endif /** * @brief Use a Mac OS-X based system - * @details Defaults to FALSE + * @details Defaults to GFXOFF */ #ifndef GFX_USE_OS_OSX - #define GFX_USE_OS_OSX FALSE + #define GFX_USE_OS_OSX GFXOFF #endif /** * @brief Use a Raw 32-bit CPU based system (Bare Metal) - * @details Defaults to FALSE + * @details Defaults to GFXOFF */ #ifndef GFX_USE_OS_RAW32 - #define GFX_USE_OS_RAW32 FALSE + #define GFX_USE_OS_RAW32 GFXOFF #endif /** * @brief Use a eCos - * @details Defaults to FALSE + * @details Defaults to GFXOFF */ #ifndef GFX_USE_OS_ECOS - #define GFX_USE_OS_ECOS FALSE + #define GFX_USE_OS_ECOS GFXOFF #endif /** * @brief Use RAWRTOS - * @details Defaults to FALSE + * @details Defaults to GFXOFF */ #ifndef GFX_USE_OS_RAWRTOS - #define GFX_USE_OS_RAWRTOS FALSE + #define GFX_USE_OS_RAWRTOS GFXOFF #endif /** * @brief Use Arduino - * @details Defaults to FALSE + * @details Defaults to GFXOFF */ #ifndef GFX_USE_OS_ARDUINO - #define GFX_USE_OS_ARDUINO FALSE + #define GFX_USE_OS_ARDUINO GFXOFF #endif /** * @brief Use CMSIS RTOS compatible OS - * @details Defaults to FALSE + * @details Defaults to GFXOFF */ #ifndef GFX_USE_OS_CMSIS - #define GFX_USE_OS_CMSIS FALSE + #define GFX_USE_OS_CMSIS GFXOFF #endif /** * @brief Use CMSIS2 RTOS compatible OS - * @details Defaults to FALSE + * @details Defaults to GFXOFF */ #ifndef GFX_USE_OS_CMSIS2 - #define GFX_USE_OS_CMSIS2 FALSE + #define GFX_USE_OS_CMSIS2 GFXOFF #endif /** * @brief Use Keil CMSIS 1.x (RTOS, RTX4) - * @details Defaults to FALSE + * @details Defaults to GFXOFF */ #ifndef GFX_USE_OS_KEIL - #define GFX_USE_OS_KEIL FALSE + #define GFX_USE_OS_KEIL GFXOFF #endif /** * @brief Use Keil RTX5 - * @details Defaults to FALSE + * @details Defaults to GFXOFF */ #ifndef GFX_USE_OS_RTX5 - #define GFX_USE_OS_RTX5 FALSE + #define GFX_USE_OS_RTX5 GFXOFF #endif /** * @brief Use NIOS-II - * @details Defaults to FALSE + * @details Defaults to GFXOFF */ #ifndef GFX_USE_OS_NIOS - #define GFX_USE_OS_NIOS FALSE + #define GFX_USE_OS_NIOS GFXOFF #endif /** * @brief Use Zephyr - * @details Defaults to FALSE + * @details Defaults to GFXOFF */ #ifndef GFX_USE_OS_ZEPHYR - #define GFX_USE_OS_ZEPHYR FALSE + #define GFX_USE_OS_ZEPHYR GFXOFF #endif /** * @brief Use Qt - * @details Defaults to FALSE + * @details Defaults to GFXOFF */ #ifndef GFX_USE_OS_QT - #define GFX_USE_OS_QT FALSE + #define GFX_USE_OS_QT GFXOFF #endif /** * @} @@ -179,7 +179,7 @@ //#define GFX_OS_EXTRA_DEINIT_FUNCTION myOSDeInitRoutine /** * @brief Should uGFX avoid initializing the operating system - * @details Defaults to FALSE + * @details Defaults to GFXOFF * @note This is not relevant to all operating systems eg Win32 never initializes the * operating system as uGFX runs as an application outside the boot process. * @note Operating system initialization is not necessarily implemented for all @@ -189,21 +189,21 @@ * demo applications will not work without modification. */ #ifndef GFX_OS_NO_INIT - #define GFX_OS_NO_INIT FALSE + #define GFX_OS_NO_INIT GFXOFF #endif /** * @brief Turn off warnings about initializing the operating system - * @details Defaults to FALSE + * @details Defaults to GFXOFF * @note This is only relevant where GOS cannot initialize the operating * system automatically or the operating system initialization has been * explicitly turned off. */ #ifndef GFX_OS_INIT_NO_WARNING - #define GFX_OS_INIT_NO_WARNING FALSE + #define GFX_OS_INIT_NO_WARNING GFXOFF #endif /** * @brief Call uGFXMain() after all initialisation - * @details Defaults to FALSE + * @details Defaults to GFXOFF * @note uGFXMain() is a function defined by the user in their project * that contains the application main code. This is not expected to return * and thus gfxInit() will also never return. This is required for some @@ -213,7 +213,7 @@ * void uGFXMain(void);<br> */ #ifndef GFX_OS_CALL_UGFXMAIN - #define GFX_OS_CALL_UGFXMAIN FALSE + #define GFX_OS_CALL_UGFXMAIN GFXOFF #endif /** * @brief When uGFXMain() is started as a thread, what stack size should be used @@ -228,10 +228,10 @@ #endif /** * @brief Should uGFX stuff be added to the FreeRTOS+Tracer - * @details Defaults to FALSE + * @details Defaults to GFXOFF */ #ifndef GFX_FREERTOS_USE_TRACE - #define GFX_FREERTOS_USE_TRACE FALSE + #define GFX_FREERTOS_USE_TRACE GFXOFF #endif /** * @brief How much RAM should uGFX use for the heap when using its own internal heap allocator @@ -250,7 +250,7 @@ #endif /** * @brief Enable wrappers for malloc() and free() - * @details Defaults to FALSE + * @details Defaults to GFXOFF * @note If enabled, malloc() and free() will be implemented as wrappers that call gfxAlloc() and * gfxFree() in order to provide portability to libraries using these function. * @note Enabling this can solve 'unresolved _sbrk' issues @@ -258,7 +258,7 @@ * portability of uGFX applications across all platforms. */ #ifndef GFX_EMULATE_MALLOC - #define GFX_EMULATE_MALLOC FALSE + #define GFX_EMULATE_MALLOC GFXOFF #endif /** @} */ diff --git a/src/gos/gos_raw32.h b/src/gos/gos_raw32.h index 2937e52b..5ff38028 100644 --- a/src/gos/gos_raw32.h +++ b/src/gos/gos_raw32.h @@ -70,8 +70,8 @@ extern "C" { /* Use the generic thread handling and heap handling */ /*===========================================================================*/ -#define GOS_NEED_X_THREADS TRUE -#define GOS_NEED_X_HEAP TRUE +#define GOS_NEED_X_THREADS GFXON +#define GOS_NEED_X_HEAP GFXON #include "gos_x_threads.h" #include "gos_x_heap.h" diff --git a/src/gos/gos_rawrtos.c b/src/gos/gos_rawrtos.c index 23b0c6c1..8ff53883 100644 --- a/src/gos/gos_rawrtos.c +++ b/src/gos/gos_rawrtos.c @@ -25,7 +25,7 @@ void _gosInit(void) { #if !GFX_OS_NO_INIT - #error "GOS: Operating System initialization for RawRTOS is not yet implemented in uGFX. Please set GFX_OS_NO_INIT to TRUE in your gfxconf.h" + #error "GOS: Operating System initialization for RawRTOS is not yet implemented in uGFX. Please set GFX_OS_NO_INIT to GFXON in your gfxconf.h" #endif #if !GFX_OS_INIT_NO_WARNING #if GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_DIRECT diff --git a/src/gos/gos_rtx5.h b/src/gos/gos_rtx5.h index b07a2164..9e70d8bb 100644 --- a/src/gos/gos_rtx5.h +++ b/src/gos/gos_rtx5.h @@ -19,13 +19,13 @@ * Keil RTX uses the CMSIS RTOS interface. Therefore, just use the CMSIS2 RTOS port */ -// Disable KEIL to avoid error: "GOS: More than one operation system has been defined as TRUE." +// Disable KEIL to avoid error: "GOS: More than one operation system has been defined as GFXON." #undef GFX_USE_OS_RTX5 -#define GFX_USE_OS_RTX5 FALSE +#define GFX_USE_OS_RTX5 GFXOFF // Enable generic CMSIS RTOS implementation #undef GFX_USE_OS_CMSIS2 -#define GFX_USE_OS_CMSIS2 TRUE +#define GFX_USE_OS_CMSIS2 GFXON #include "gos_cmsis2.h" #endif /* GFX_USE_OS_RTX5 */ diff --git a/src/gos/gos_rules.h b/src/gos/gos_rules.h index 2ea1b1b2..96b4b795 100644 --- a/src/gos/gos_rules.h +++ b/src/gos/gos_rules.h @@ -20,8 +20,8 @@ #error "GOS: No operating system has been defined." #endif -#if GFX_USE_OS_CHIBIOS + GFX_USE_OS_WIN32 + GFX_USE_OS_LINUX + GFX_USE_OS_OSX + GFX_USE_OS_RAW32 + GFX_USE_OS_FREERTOS + GFX_USE_OS_ECOS + GFX_USE_OS_RAWRTOS + GFX_USE_OS_ARDUINO + GFX_USE_OS_CMSIS + GFX_USE_OS_CMSIS2 + GFX_USE_OS_KEIL + GFX_USE_OS_RTX5 + GFX_USE_OS_NIOS + GFX_USE_OS_ZEPHYR + GFX_USE_OS_QT != 1 * TRUE - #error "GOS: More than one operation system has been defined as TRUE." +#if GFX_USE_OS_CHIBIOS + GFX_USE_OS_WIN32 + GFX_USE_OS_LINUX + GFX_USE_OS_OSX + GFX_USE_OS_RAW32 + GFX_USE_OS_FREERTOS + GFX_USE_OS_ECOS + GFX_USE_OS_RAWRTOS + GFX_USE_OS_ARDUINO + GFX_USE_OS_CMSIS + GFX_USE_OS_CMSIS2 + GFX_USE_OS_KEIL + GFX_USE_OS_RTX5 + GFX_USE_OS_NIOS + GFX_USE_OS_ZEPHYR + GFX_USE_OS_QT != 1 * GFXON + #error "GOS: More than one operation system has been defined as GFXON." #endif #if GFX_FREERTOS_USE_TRACE && !GFX_USE_OS_FREERTOS @@ -43,7 +43,7 @@ #endif #endif #undef GFX_EMULATE_MALLOC - #define GFX_EMULATE_MALLOC FALSE + #define GFX_EMULATE_MALLOC GFXOFF #endif #endif diff --git a/src/gos/gos_x_threads.c b/src/gos/gos_x_threads.c index b696ee77..52afd5c1 100644 --- a/src/gos/gos_x_threads.c +++ b/src/gos/gos_x_threads.c @@ -242,8 +242,8 @@ static thread mainthread; // The main thread context * * MACROS: * - * AUTO_DETECT_STACKFRAME TRUE/FALSE - TRUE to auto-detect stack frame structure - * STACK_DIR_UP Macro/bool_t - TRUE if the stack grows up instead of down + * AUTO_DETECT_STACKFRAME GFXON/GFXOFF - GFXON to auto-detect stack frame structure + * STACK_DIR_UP Macro/bool_t - GFXON if the stack grows up instead of down * MASK1 Macro/uint32_t - The 1st mask of jmp_buf elements that need relocation * MASK2 Macro/uint32_t - The 2nd mask of jmp_buf elements that need relocation * STACK_BASE Macro/size_t - The base of the stack frame relative to the local variables @@ -252,8 +252,8 @@ static thread mainthread; // The main thread context */ #if GFX_COMPILER == GFX_COMPILER_MINGW32 - #define AUTO_DETECT_STACKFRAME FALSE - #define STACK_DIR_UP FALSE + #define AUTO_DETECT_STACKFRAME GFXOFF + #define STACK_DIR_UP GFXOFF #define MASK1 0x00000011 #define MASK2 0x00000000 #define STACK_BASE 12 @@ -263,8 +263,8 @@ static thread mainthread; // The main thread context // Use auto-detection of the stack frame format // Assumes all the relevant stuff to be relocated is in the first 256 bytes of the jmpbuf. - #define AUTO_DETECT_STACKFRAME TRUE - #define STACK_DIR_UP stackdirup // TRUE if the stack grow up instead of down + #define AUTO_DETECT_STACKFRAME GFXON + #define STACK_DIR_UP stackdirup // GFXON if the stack grow up instead of down #define MASK1 jmpmask1 // The 1st mask of jmp_buf elements that need relocation #define MASK2 jmpmask2 // The 2nd mask of jmp_buf elements that need relocation #define STACK_BASE stackbase // The base of the stack frame relative to the local variables diff --git a/src/gos/gos_x_threads_cortexm01.h b/src/gos/gos_x_threads_cortexm01.h index 8afe1864..89a7d383 100644 --- a/src/gos/gos_x_threads_cortexm01.h +++ b/src/gos/gos_x_threads_cortexm01.h @@ -14,9 +14,9 @@ #if CORTEX_USE_FPU #if GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_DIRECT - #warning "GOS Threads: You have specified GFX_CPU=GFX_CPU_CORTX_M? with no hardware floating point support but CORTEX_USE_FPU is TRUE. Try using GFX_CPU_GFX_CPU_CORTEX_M?_FP instead" + #warning "GOS Threads: You have specified GFX_CPU=GFX_CPU_CORTX_M? with no hardware floating point support but CORTEX_USE_FPU is GFXON. Try using GFX_CPU_GFX_CPU_CORTEX_M?_FP instead" #elif GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_MACRO - COMPILER_WARNING("GOS Threads: You have specified GFX_CPU=GFX_CPU_CORTX_M? with no hardware floating point support but CORTEX_USE_FPU is TRUE. Try using GFX_CPU_GFX_CPU_CORTEX_M?_FP instead") + COMPILER_WARNING("GOS Threads: You have specified GFX_CPU=GFX_CPU_CORTX_M? with no hardware floating point support but CORTEX_USE_FPU is GFXON. Try using GFX_CPU_GFX_CPU_CORTEX_M?_FP instead") #endif #endif diff --git a/src/gos/gos_x_threads_cortexm347.h b/src/gos/gos_x_threads_cortexm347.h index 8e9ece61..489c0f14 100644 --- a/src/gos/gos_x_threads_cortexm347.h +++ b/src/gos/gos_x_threads_cortexm347.h @@ -15,9 +15,9 @@ #if CORTEX_USE_FPU #if GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_DIRECT - #warning "GOS Threads: You have specified GFX_CPU=GFX_CPU_CORTX_M? with no hardware floating point support but CORTEX_USE_FPU is TRUE. Try using GFX_CPU_GFX_CPU_CORTEX_M?_FP instead" + #warning "GOS Threads: You have specified GFX_CPU=GFX_CPU_CORTX_M? with no hardware floating point support but CORTEX_USE_FPU is GFXON. Try using GFX_CPU_GFX_CPU_CORTEX_M?_FP instead" #elif GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_MACRO - COMPILER_WARNING("GOS Threads: You have specified GFX_CPU=GFX_CPU_CORTX_M? with no hardware floating point support but CORTEX_USE_FPU is TRUE. Try using GFX_CPU_GFX_CPU_CORTEX_M?_FP instead") + COMPILER_WARNING("GOS Threads: You have specified GFX_CPU=GFX_CPU_CORTX_M? with no hardware floating point support but CORTEX_USE_FPU is GFXON. Try using GFX_CPU_GFX_CPU_CORTEX_M?_FP instead") #endif #endif diff --git a/src/gos/gos_zephyr.h b/src/gos/gos_zephyr.h index 741e7587..0acb2c43 100644 --- a/src/gos/gos_zephyr.h +++ b/src/gos/gos_zephyr.h @@ -42,8 +42,6 @@ #define THREAD_RETURN(retval) return
- // #define FALSE 0
- // #define TRUE 1
#define TIME_IMMEDIATE K_NO_WAIT
#define TIME_INFINITE K_FOREVER
#define MAX_SEMAPHORE_COUNT ((semcount_t)(((unsigned long)((semcount_t)(-1))) >> 1))
diff --git a/src/gqueue/gqueue_options.h b/src/gqueue/gqueue_options.h index a9f7302f..5b8e7bb9 100644 --- a/src/gqueue/gqueue_options.h +++ b/src/gqueue/gqueue_options.h @@ -22,30 +22,30 @@ */ /** * @brief Enable Asynchronous Queues - * @details Defaults to FALSE + * @details Defaults to GFXOFF */ #ifndef GQUEUE_NEED_ASYNC - #define GQUEUE_NEED_ASYNC FALSE + #define GQUEUE_NEED_ASYNC GFXOFF #endif /** * @brief Enable Get-Synchronous Queues - * @details Defaults to FALSE + * @details Defaults to GFXOFF */ #ifndef GQUEUE_NEED_GSYNC - #define GQUEUE_NEED_GSYNC FALSE + #define GQUEUE_NEED_GSYNC GFXOFF #endif /** * @brief Enable Fully Synchronous Queues - * @details Defaults to FALSE + * @details Defaults to GFXOFF */ #ifndef GQUEUE_NEED_FSYNC - #define GQUEUE_NEED_FSYNC FALSE + #define GQUEUE_NEED_FSYNC GFXOFF #endif /** * @brief Enable Queue-able Data Buffers */ #ifndef GQUEUE_NEED_BUFFERS - #define GQUEUE_NEED_BUFFERS FALSE + #define GQUEUE_NEED_BUFFERS GFXOFF #endif /** * @} diff --git a/src/gqueue/gqueue_rules.h b/src/gqueue/gqueue_rules.h index ecdea7a9..0d411bc6 100644 --- a/src/gqueue/gqueue_rules.h +++ b/src/gqueue/gqueue_rules.h @@ -20,13 +20,13 @@ #if GQUEUE_NEED_BUFFERS && !GQUEUE_NEED_GSYNC #if GFX_DISPLAY_RULE_WARNINGS #if GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_DIRECT - #warning "GQUEUE: GQUEUE_NEED_GSYNC is required if GQUEUE_NEED_BUFFERS is TRUE. It has been turned on for you." + #warning "GQUEUE: GQUEUE_NEED_GSYNC is required if GQUEUE_NEED_BUFFERS is GFXON. It has been turned on for you." #elif GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_MACRO - COMPILER_WARNING("GQUEUE: GQUEUE_NEED_GSYNC is required if GQUEUE_NEED_BUFFERS is TRUE. It has been turned on for you.") + COMPILER_WARNING("GQUEUE: GQUEUE_NEED_GSYNC is required if GQUEUE_NEED_BUFFERS is GFXON. It has been turned on for you.") #endif #endif #undef GQUEUE_NEED_GSYNC - #define GQUEUE_NEED_GSYNC TRUE + #define GQUEUE_NEED_GSYNC GFXON #endif #endif diff --git a/src/gtimer/gtimer.h b/src/gtimer/gtimer.h index e818f3e7..cecf8e70 100644 --- a/src/gtimer/gtimer.h +++ b/src/gtimer/gtimer.h @@ -21,7 +21,7 @@ * This contrary to the goals of a real-time operating system. So a user-land * (thread based) timer mechanism is also required. * - * @pre GFX_USE_GTIMER must be set to TRUE in your gfxconf.h + * @pre GFX_USE_GTIMER must be set to GFXON in your gfxconf.h * * @{ */ diff --git a/src/gwin/gwin.h b/src/gwin/gwin.h index c3d18c31..1331a874 100644 --- a/src/gwin/gwin.h +++ b/src/gwin/gwin.h @@ -18,7 +18,7 @@ * will have it's own properties such as colors as well as * it's own drawing origin. * - * @pre GFX_USE_GWIN must be set to TRUE in your gfxconf.h + * @pre GFX_USE_GWIN must be set to GFXON in your gfxconf.h * @{ */ @@ -493,7 +493,7 @@ extern "C" { /** * @brief Minimize, Maximize or Restore a window - * @pre GWIN_NEED_WINDOWMANAGER must be TRUE + * @pre GWIN_NEED_WINDOWMANAGER must be GFXON * * @param[in] gh The window * @param[in] minmax The new minimized/maximized state @@ -514,7 +514,7 @@ extern "C" { /** * @brief Get the Minimized/Maximized state of a window - * @pre GWIN_NEED_WINDOWMANAGER must be TRUE + * @pre GWIN_NEED_WINDOWMANAGER must be GFXON * * @param[in] gh The window * @@ -526,7 +526,7 @@ extern "C" { /** * @brief Raise a window to the top of the z-order - * @pre GWIN_NEED_WINDOWMANAGER must be TRUE + * @pre GWIN_NEED_WINDOWMANAGER must be GFXON * * @param[in] gh The window * @@ -565,7 +565,7 @@ extern "C" { * way every flash period (GWIN_FLASHING_PERIOD). How its appearance * changes depends on the draw for each window/widget. * - * @pre Requires GWIN_NEED_FLASHING to be TRUE + * @pre Requires GWIN_NEED_FLASHING to be GFXON * * @api */ @@ -724,7 +724,7 @@ extern "C" { * @note Uses the current foreground color to draw the inner circle * @note Uses the current background color to draw the outer circle * @note May leave GDISP clipping to this window's dimensions - * @pre GDISP_NEED_DUALCIRCLE must be TRUE in your gfxconf.h + * @pre GDISP_NEED_DUALCIRCLE must be GFXON in your gfxconf.h * * @param[in] gh The window handle * @param[in] x,y The center of the circle diff --git a/src/gwin/gwin_button.h b/src/gwin/gwin_button.h index 11af82e0..77751c04 100644 --- a/src/gwin/gwin_button.h +++ b/src/gwin/gwin_button.h @@ -18,8 +18,8 @@ * and check for different meta states such as: PRESSED, CLICKED, * RELEASED etc. * - * @pre GFX_USE_GWIN must be set to TRUE in your gfxconf.h - * @pre GWIN_NEED_BUTTON must be set to TRUE in your gfxconf.h + * @pre GFX_USE_GWIN must be set to GFXON in your gfxconf.h + * @pre GWIN_NEED_BUTTON must be set to GFXON in your gfxconf.h * @{ */ @@ -129,7 +129,7 @@ void gwinButtonDraw_Normal(GWidgetObject *gw, void *param); * @param[in] gw The widget object (must be a button object) * @param[in] param A parameter passed in from the user. Ignored by this function. * - * @pre GDISP_NEED_ARC must be set to TRUE + * @pre GDISP_NEED_ARC must be set to GFXON * * @api */ @@ -143,7 +143,7 @@ void gwinButtonDraw_Normal(GWidgetObject *gw, void *param); * @param[in] gw The widget object (must be a button object) * @param[in] param A parameter passed in from the user. Ignored by this function. * - * @pre GDISP_NEED_ELLIPSE must be set to TRUE + * @pre GDISP_NEED_ELLIPSE must be set to GFXON * * @api */ @@ -157,7 +157,7 @@ void gwinButtonDraw_Normal(GWidgetObject *gw, void *param); * @param[in] gw The widget object (must be a button object) * @param[in] param A parameter passed in from the user. Ignored by this function. * - * @pre GDISP_NEED_CONVEX_POLYGON must be set to TRUE + * @pre GDISP_NEED_CONVEX_POLYGON must be set to GFXON * * @api */ @@ -169,7 +169,7 @@ void gwinButtonDraw_Normal(GWidgetObject *gw, void *param); * @param[in] gw The widget object (must be a button object) * @param[in] param A parameter passed in from the user. Ignored by this function. * - * @pre GDISP_NEED_CONVEX_POLYGON must be set to TRUE + * @pre GDISP_NEED_CONVEX_POLYGON must be set to GFXON * * @api */ @@ -181,7 +181,7 @@ void gwinButtonDraw_Normal(GWidgetObject *gw, void *param); * @param[in] gw The widget object (must be a button object) * @param[in] param A parameter passed in from the user. Ignored by this function. * - * @pre GDISP_NEED_CONVEX_POLYGON must be set to TRUE + * @pre GDISP_NEED_CONVEX_POLYGON must be set to GFXON * * @api */ @@ -193,7 +193,7 @@ void gwinButtonDraw_Normal(GWidgetObject *gw, void *param); * @param[in] gw The widget object (must be a button object) * @param[in] param A parameter passed in from the user. Ignored by this function. * - * @pre GDISP_NEED_CONVEX_POLYGON must be set to TRUE + * @pre GDISP_NEED_CONVEX_POLYGON must be set to GFXON * * @api */ @@ -214,7 +214,7 @@ void gwinButtonDraw_Normal(GWidgetObject *gw, void *param); * No checking is done to compare the size of the button to the size of the image. * Note text is drawn on top of the image. * - * @pre GDISP_NEED_IMAGE must be set to TRUE + * @pre GDISP_NEED_IMAGE must be set to GFXON * * @api */ diff --git a/src/gwin/gwin_checkbox.h b/src/gwin/gwin_checkbox.h index b704dffe..b4a1c811 100644 --- a/src/gwin/gwin_checkbox.h +++ b/src/gwin/gwin_checkbox.h @@ -16,8 +16,8 @@ * * @details GWIN allows it to easily create a group of checkbox buttons. * - * @pre GFX_USE_GWIN must be set to TRUE in your gfxconf.h - * @pre GWIN_NEED_CHECKBOX must be set to TRUE in your gfxconf.h + * @pre GFX_USE_GWIN must be set to GFXON in your gfxconf.h + * @pre GWIN_NEED_CHECKBOX must be set to GFXON in your gfxconf.h * @{ */ diff --git a/src/gwin/gwin_console.c b/src/gwin/gwin_console.c index ad5152f0..71d0905a 100644 --- a/src/gwin/gwin_console.c +++ b/src/gwin/gwin_console.c @@ -18,9 +18,9 @@ #include "gwin_class.h" -#define GWIN_CONSOLE_USE_CLEAR_LINES TRUE // Clear each line before using it -#define GWIN_CONSOLE_USE_FILLED_CHARS FALSE // Use filled characters instead of drawn characters -#define GWIN_CONSOLE_BUFFER_SCROLLING TRUE // Use the history buffer to scroll when it is available +#define GWIN_CONSOLE_USE_CLEAR_LINES GFXON // Clear each line before using it +#define GWIN_CONSOLE_USE_FILLED_CHARS GFXOFF // Use filled characters instead of drawn characters +#define GWIN_CONSOLE_BUFFER_SCROLLING GFXON // Use the history buffer to scroll when it is available // Our control flags #define GCONSOLE_FLG_NOSTORE (GWIN_FIRST_CONTROL_FLAG<<0) diff --git a/src/gwin/gwin_console.h b/src/gwin/gwin_console.h index 3da9df12..6b0f3fe6 100644 --- a/src/gwin/gwin_console.h +++ b/src/gwin/gwin_console.h @@ -17,8 +17,8 @@ * @details GWIN allows it to create a console/terminal like window. * You can simply use chprintf() to print to the terminal. * - * @pre GFX_USE_GWIN must be set to TRUE in your gfxconf.h - * @pre GWIN_NEED_CONSOLE must be set to TRUE in your gfxconf.h + * @pre GFX_USE_GWIN must be set to GFXON in your gfxconf.h + * @pre GWIN_NEED_CONSOLE must be set to GFXON in your gfxconf.h * * @{ */ @@ -99,7 +99,7 @@ GHandle gwinGConsoleCreate(GDisplay *g, GConsoleObject *gc, const GWindowInit *p #if GWIN_CONSOLE_USE_HISTORY /** * @brief Assign a buffer to keep track of the content while the widget is invisible. - * @pre GWIN_CONSOLE_USE_HISTORY must be set to TRUE in your gfxconf.h + * @pre GWIN_CONSOLE_USE_HISTORY must be set to GFXON in your gfxconf.h * * @param[in] gh The window handle (must be a console window) * @param[in] onoff If TRUE a buffer is allocated to maintain console text diff --git a/src/gwin/gwin_container.h b/src/gwin/gwin_container.h index ce2ab4bd..9020c73e 100644 --- a/src/gwin/gwin_container.h +++ b/src/gwin/gwin_container.h @@ -16,7 +16,7 @@ * @details A Container is a GWindow that supports child windows. It is also * a widget in its own right and therefore can accept user input directly. * - * @pre GFX_USE_GWIN and GWIN_NEED_CONTAINERS must be set to TRUE in your gfxconf.h + * @pre GFX_USE_GWIN and GWIN_NEED_CONTAINERS must be set to GFXON in your gfxconf.h * @{ */ @@ -173,7 +173,7 @@ void gwinContainerDraw_Transparent(GWidgetObject *gw, void *param); * @note The image must be already opened before calling @p gwinSetCustomDraw(). The handle is passed as the parameter * to this function. * - * @pre GDISP_NEED_IMAGE must be set to TRUE + * @pre GDISP_NEED_IMAGE must be set to GFXON * * @api */ diff --git a/src/gwin/gwin_frame.h b/src/gwin/gwin_frame.h index f39d3df6..06488321 100644 --- a/src/gwin/gwin_frame.h +++ b/src/gwin/gwin_frame.h @@ -17,8 +17,8 @@ * @details A frame is a rectangular window that can have optional border as well as buttons to * close, maximize and minimize it. The main purpose of this widget is to contain children. * - * @pre GFX_USE_GWIN must be set to TRUE in your gfxconf.h - * @pre GWIN_NEED_FRAME must be set to TRUE in your gfxconf.h + * @pre GFX_USE_GWIN must be set to GFXON in your gfxconf.h + * @pre GWIN_NEED_FRAME must be set to GFXON in your gfxconf.h * @{ */ @@ -130,7 +130,7 @@ void gwinFrameDraw_Transparent(GWidgetObject *gw, void *param); * @note The image must be already opened before calling @p gwinSetCustomDraw(). The handle is passed as the parameter * to this function. * - * @pre GDISP_NEED_IMAGE must be set to TRUE + * @pre GDISP_NEED_IMAGE must be set to GFXON * * @api */ diff --git a/src/gwin/gwin_gl3d.h b/src/gwin/gwin_gl3d.h index 52330029..fd1220b0 100644 --- a/src/gwin/gwin_gl3d.h +++ b/src/gwin/gwin_gl3d.h @@ -16,8 +16,8 @@ * * @details 3D GWIN window based on OpenGL (or more exactly Tiny GL) * - * @pre GFX_USE_GWIN must be set to TRUE in your gfxconf.h - * @pre GWIN_NEED_GL3D must be set to TRUE in your gfxconf.h + * @pre GFX_USE_GWIN must be set to GFXON in your gfxconf.h + * @pre GWIN_NEED_GL3D must be set to GFXON in your gfxconf.h * * @{ */ diff --git a/src/gwin/gwin_graph.h b/src/gwin/gwin_graph.h index 3f4c3181..61b411a2 100644 --- a/src/gwin/gwin_graph.h +++ b/src/gwin/gwin_graph.h @@ -16,8 +16,8 @@ * * @details GWIN allows it to easily draw graphs. * - * @pre GFX_USE_GWIN must be set to TRUE in your gfxconf.h - * @pre GWIN_NEED_GRAPH must be set to TRUE in your gfxconf.h + * @pre GFX_USE_GWIN must be set to GFXON in your gfxconf.h + * @pre GWIN_NEED_GRAPH must be set to GFXON in your gfxconf.h * * @{ */ diff --git a/src/gwin/gwin_image.h b/src/gwin/gwin_image.h index d3874f65..b45629ee 100644 --- a/src/gwin/gwin_image.h +++ b/src/gwin/gwin_image.h @@ -17,10 +17,10 @@ * @details GWIN allos it to create an image widget. The widget * takes no user input. * - * @pre GFX_USE_GDISP must be set to TRUE in your gfxconf.h - * @pre GFX_USE_GWIN must be set to TRUE in your gfxconf.h - * @pre GDISP_NEED_IMAGE must be set to TRUE in your gfxconf.h - * @pre GWIN_NEED_IMAGE must be set to TRUE in your gfxconf.h + * @pre GFX_USE_GDISP must be set to GFXON in your gfxconf.h + * @pre GFX_USE_GWIN must be set to GFXON in your gfxconf.h + * @pre GDISP_NEED_IMAGE must be set to GFXON in your gfxconf.h + * @pre GWIN_NEED_IMAGE must be set to GFXON in your gfxconf.h * @pre At least one image type must be enabled in your gfxconf.h * * @{ @@ -86,7 +86,7 @@ bool_t gwinImageOpenGFile(GHandle gh, GFILE *f); /** * @brief Sets the input routines that support reading the image from memory * in RAM or flash. - * @pre GFILE_NEED_MEMFS must be TRUE + * @pre GFILE_NEED_MEMFS must be GFXON * @return TRUE if the IO open function succeeds * * @param[in] gh The widget (must be an image widget) @@ -99,7 +99,7 @@ bool_t gwinImageOpenGFile(GHandle gh, GFILE *f); /** * @brief Sets the input routines that support reading the image from a BaseFileStream (eg. an SD-Card). * @return TRUE if the IO open function succeeds - * @pre GFILE_NEED_CHIBIOSFS and GFX_USE_OS_CHIBIOS must be TRUE + * @pre GFILE_NEED_CHIBIOSFS and GFX_USE_OS_CHIBIOS must be GFXON * * @param[in] gh The widget (must be an image widget) * @param[in] streamPtr A pointer to the (open) BaseFileStream object. diff --git a/src/gwin/gwin_keyboard.h b/src/gwin/gwin_keyboard.h index 98780485..68bf215f 100644 --- a/src/gwin/gwin_keyboard.h +++ b/src/gwin/gwin_keyboard.h @@ -18,8 +18,8 @@ * and check for different meta states such as: PRESSED, CLICKED, * RELEASED etc. * - * @pre GFX_USE_GWIN must be set to TRUE in your gfxconf.h - * @pre GWIN_NEED_BUTTON must be set to TRUE in your gfxconf.h + * @pre GFX_USE_GWIN must be set to GFXON in your gfxconf.h + * @pre GWIN_NEED_BUTTON must be set to GFXON in your gfxconf.h * @{ */ diff --git a/src/gwin/gwin_label.h b/src/gwin/gwin_label.h index 1e8ba53e..66c4d97d 100644 --- a/src/gwin/gwin_label.h +++ b/src/gwin/gwin_label.h @@ -19,10 +19,10 @@ * dimensions of the label will change every time the text is changed * through gwinSetText(). * - * @pre GFX_USE_GDISP must be set to TRUE in your gfxconf.h - * @pre GFX_USE_GWIN must be set to TRUE in your gfxconf.h - * @pre GDISP_NEED_TEXT must be set to TRUE in your gfxconf.h - * @pre GWIN_NEED_LABEL must be set to TRUE in your gfxconf.h + * @pre GFX_USE_GDISP must be set to GFXON in your gfxconf.h + * @pre GFX_USE_GWIN must be set to GFXON in your gfxconf.h + * @pre GDISP_NEED_TEXT must be set to GFXON in your gfxconf.h + * @pre GWIN_NEED_LABEL must be set to GFXON in your gfxconf.h * @pre The fonts you want to use must be enabled in your gfxconf.h * * @{ diff --git a/src/gwin/gwin_list.h b/src/gwin/gwin_list.h index 81db7c34..ad64be75 100644 --- a/src/gwin/gwin_list.h +++ b/src/gwin/gwin_list.h @@ -16,10 +16,10 @@ * * @details Provides advanced features such as multi-selection, smooth scrolling and item icons. * - * @pre GFX_USE_GDISP must be set to TRUE in your gfxconf.h - * @pre GFX_USE_GWIN must be set to TRUE in your gfxconf.h - * @pre GDISP_NEED_TEXT must be set to TRUE in your gfxconf.h - * @pre GWIN_NEED_LIST must be set to TRUE in your gfxconf.h + * @pre GFX_USE_GDISP must be set to GFXON in your gfxconf.h + * @pre GFX_USE_GWIN must be set to GFXON in your gfxconf.h + * @pre GDISP_NEED_TEXT must be set to GFXON in your gfxconf.h + * @pre GWIN_NEED_LIST must be set to GFXON in your gfxconf.h * @pre The font you want to use must be enabled in your gfxconf.h * * @{ diff --git a/src/gwin/gwin_options.h b/src/gwin/gwin_options.h index 6bf59d2a..06b7da5c 100644 --- a/src/gwin/gwin_options.h +++ b/src/gwin/gwin_options.h @@ -25,24 +25,24 @@ */ /** * @brief Should window manager support be included - * @details Defaults to FALSE + * @details Defaults to GFXOFF */ #ifndef GWIN_NEED_WINDOWMANAGER - #define GWIN_NEED_WINDOWMANAGER FALSE + #define GWIN_NEED_WINDOWMANAGER GFXOFF #endif /** * @brief Should the widget hierarchy be included. This provides parent-child features. - * @details Defaults to FALSE + * @details Defaults to GFXOFF */ #ifndef GWIN_NEED_CONTAINERS - #define GWIN_NEED_CONTAINERS FALSE + #define GWIN_NEED_CONTAINERS GFXOFF #endif /** * @brief Should widget functions be included. Needed for any widget (eg Buttons, Sliders etc) - * @details Defaults to FALSE + * @details Defaults to GFXOFF */ #ifndef GWIN_NEED_WIDGET - #define GWIN_NEED_WIDGET FALSE + #define GWIN_NEED_WIDGET GFXOFF #endif /** * @brief The width of the rectangle that highlights a widget that is focused @@ -53,115 +53,115 @@ #endif /** * @brief Should the simple container be included. - * @details Defaults to FALSE + * @details Defaults to GFXOFF */ #ifndef GWIN_NEED_CONTAINER - #define GWIN_NEED_CONTAINER FALSE + #define GWIN_NEED_CONTAINER GFXOFF #endif /** * @brief Should the frame widget be included. - * @details Defaults to FALSE + * @details Defaults to GFXOFF */ #ifndef GWIN_NEED_FRAME - #define GWIN_NEED_FRAME FALSE + #define GWIN_NEED_FRAME GFXOFF #endif /** * @brief Should console functions be included. - * @details Defaults to FALSE + * @details Defaults to GFXOFF */ #ifndef GWIN_NEED_CONSOLE - #define GWIN_NEED_CONSOLE FALSE + #define GWIN_NEED_CONSOLE GFXOFF #endif /** * @brief Should graph functions be included. - * @details Defaults to FALSE + * @details Defaults to GFXOFF */ #ifndef GWIN_NEED_GRAPH - #define GWIN_NEED_GRAPH FALSE + #define GWIN_NEED_GRAPH GFXOFF #endif /** * @brief Should gl3d functions be included. - * @details Defaults to FALSE + * @details Defaults to GFXOFF */ #ifndef GWIN_NEED_GL3D - #define GWIN_NEED_GL3D FALSE + #define GWIN_NEED_GL3D GFXOFF #endif /** * @brief Should button functions be included. - * @details Defaults to FALSE + * @details Defaults to GFXOFF */ #ifndef GWIN_NEED_BUTTON - #define GWIN_NEED_BUTTON FALSE + #define GWIN_NEED_BUTTON GFXOFF #endif /** * @brief Should progressbar functions be included. - * @details Defaults to FALSE + * @details Defaults to GFXOFF */ #ifndef GWIN_NEED_PROGRESSBAR - #define GWIN_NEED_PROGRESSBAR FALSE + #define GWIN_NEED_PROGRESSBAR GFXOFF #endif /** * @brief Should slider functions be included. - * @details Defaults to FALSE + * @details Defaults to GFXOFF */ #ifndef GWIN_NEED_SLIDER - #define GWIN_NEED_SLIDER FALSE + #define GWIN_NEED_SLIDER GFXOFF #endif /** * @brief Should checkbox functions be included. - * @details Defaults to FALSE + * @details Defaults to GFXOFF */ #ifndef GWIN_NEED_CHECKBOX - #define GWIN_NEED_CHECKBOX FALSE + #define GWIN_NEED_CHECKBOX GFXOFF #endif /** * @brief Should image functions be included. - * @details Defaults to FALSE + * @details Defaults to GFXOFF */ #ifndef GWIN_NEED_IMAGE - #define GWIN_NEED_IMAGE FALSE + #define GWIN_NEED_IMAGE GFXOFF #endif /** * @brief Should label functions be included. - * @details Defaults to FALSE + * @details Defaults to GFXOFF */ #ifndef GWIN_NEED_LABEL - #define GWIN_NEED_LABEL FALSE + #define GWIN_NEED_LABEL GFXOFF #endif /** * @brief Should radio button functions be included. - * @details Defaults to FALSE + * @details Defaults to GFXOFF */ #ifndef GWIN_NEED_RADIO - #define GWIN_NEED_RADIO FALSE + #define GWIN_NEED_RADIO GFXOFF #endif /** * @brief Should list widget functions be included. - * @details Defaults to FALSE + * @details Defaults to GFXOFF */ #ifndef GWIN_NEED_LIST - #define GWIN_NEED_LIST FALSE + #define GWIN_NEED_LIST GFXOFF #endif /** * @brief Should tabset functions be included. - * @details Defaults to FALSE + * @details Defaults to GFXOFF */ #ifndef GWIN_NEED_TABSET - #define GWIN_NEED_TABSET FALSE + #define GWIN_NEED_TABSET GFXOFF #endif /** * @brief Should the virtual keyboard be included. - * @details Defaults to FALSE + * @details Defaults to GFXOFF */ #ifndef GWIN_NEED_KEYBOARD - #define GWIN_NEED_KEYBOARD FALSE + #define GWIN_NEED_KEYBOARD GFXOFF #endif /** * @brief Should the textedit widget be included. - * @details Defaults to FALSE + * @details Defaults to GFXOFF */ #ifndef GWIN_NEED_TEXTEDIT - #define GWIN_NEED_TEXTEDIT FALSE + #define GWIN_NEED_TEXTEDIT GFXOFF #endif /** * @} @@ -171,59 +171,59 @@ */ /** * @brief Add a tag to each widget - * @details Defaults to FALSE + * @details Defaults to GFXOFF * @note Adds a tag member to each widget. Any events created include this tag. * The enables switch based application logic to detect the event source. */ #ifndef GWIN_WIDGET_TAGS - #define GWIN_WIDGET_TAGS FALSE + #define GWIN_WIDGET_TAGS GFXOFF #endif /** * @brief Use flat styling for controls rather than a 3D look - * @details Defaults to FALSE + * @details Defaults to GFXOFF * @note This may appear better on color-restricted displays * @note Flat styling is less graphics and cpu intensive (marginally) than the default 3D look. */ #ifndef GWIN_FLAT_STYLING - #define GWIN_FLAT_STYLING FALSE + #define GWIN_FLAT_STYLING GFXOFF #endif /** * @brief Don't use a timer for redrawing windows - * @details Defaults to FALSE + * @details Defaults to GFXOFF * @note Normally windows and widgets are redrawn on a timer. Setting this * option causes them to be redrawn immediately. Note that this can * cause extended blocking times on events and saves little code. - * @note If GWIN_NEED_WINDOWMANAGER is FALSE then this setting is ignored + * @note If GWIN_NEED_WINDOWMANAGER is GFXOFF then this setting is ignored * as redrawing always occurs immediately. */ #ifndef GWIN_REDRAW_IMMEDIATE - #define GWIN_REDRAW_IMMEDIATE FALSE + #define GWIN_REDRAW_IMMEDIATE GFXOFF #endif /** * @brief Redraw all windows in a single operation - * @details Defaults to FALSE + * @details Defaults to GFXOFF * @note Windows are normally redraw one per gtimer cycle. * Setting this option causes all windows to be redrawn in * a single gtimer cycle. Note that this can * cause extended blocking times on the timer thread but may * speed up redraw slightly. - * @note This is only relevant if GWIN_REDRAW_IMMEDIATE is FALSE. + * @note This is only relevant if GWIN_REDRAW_IMMEDIATE is GFXOFF. * Everything always gets redrawn in a single operation if - * GWIN_REDRAW_IMMEDIATE is TRUE. + * GWIN_REDRAW_IMMEDIATE is GFXON. */ #ifndef GWIN_REDRAW_SINGLEOP - #define GWIN_REDRAW_SINGLEOP FALSE + #define GWIN_REDRAW_SINGLEOP GFXOFF #endif /** * @brief Buttons should not insist the mouse is over the button on mouse release - * @details Defaults to FALSE + * @details Defaults to GFXOFF */ #ifndef GWIN_BUTTON_LAZY_RELEASE - #define GWIN_BUTTON_LAZY_RELEASE FALSE + #define GWIN_BUTTON_LAZY_RELEASE GFXOFF #endif /** * @brief Should the content of the console be saved for redrawing. - * @details Defaults to FALSE + * @details Defaults to GFXOFF * @details If this feature is enabled, the contents of the console will be saved * as it is written. If a redraw is required it will be redrawn from the * history. Scrolling will also use the history buffer if it is turned on. @@ -241,11 +241,11 @@ * @note @p gwinConsoleSetBuffer() can be used to turn the history buffer off and on. */ #ifndef GWIN_CONSOLE_USE_HISTORY - #define GWIN_CONSOLE_USE_HISTORY FALSE + #define GWIN_CONSOLE_USE_HISTORY GFXOFF #endif /** * @brief Use font width averaging for the history buffer allocation. - * @details Defaults to FALSE + * @details Defaults to GFXOFF * @details If this feature is enabled, the width one third of the way between * the font's character width minimum and maximum will be used instead * of the font's minimum width. @@ -257,27 +257,27 @@ * with many characters in it. */ #ifndef GWIN_CONSOLE_HISTORY_AVERAGING - #define GWIN_CONSOLE_HISTORY_AVERAGING FALSE + #define GWIN_CONSOLE_HISTORY_AVERAGING GFXOFF #endif /** * @brief Should the history be turned on for all console windows when they are first created. - * @details Defaults to FALSE + * @details Defaults to GFXOFF * @note @p gwinConsoleSetBuffer() can be used to turn the history buffer off and on at * any time. */ #ifndef GWIN_CONSOLE_HISTORY_ATCREATE - #define GWIN_CONSOLE_HISTORY_ATCREATE FALSE + #define GWIN_CONSOLE_HISTORY_ATCREATE GFXOFF #endif /** * @brief Console Windows need floating point support in @p gwinPrintf - * @details Defaults to FALSE + * @details Defaults to GFXOFF */ #ifndef GWIN_CONSOLE_USE_FLOAT - #define GWIN_CONSOLE_USE_FLOAT FALSE + #define GWIN_CONSOLE_USE_FLOAT GFXOFF #endif /** * @brief Console windows support escape sequences to control display - * @details Defaults to FALSE + * @details Defaults to GFXOFF * * @note * Currently supported: @@ -292,60 +292,60 @@ * ESC J Clear the window */ #ifndef GWIN_CONSOLE_ESCSEQ - #define GWIN_CONSOLE_ESCSEQ FALSE + #define GWIN_CONSOLE_ESCSEQ GFXOFF #endif /** * @brief Console Windows need BaseStreamSequential support (ChibiOS only) - * @details Defaults to FALSE + * @details Defaults to GFXOFF * @note To use the ChibiOS basestream functions such as chprintf() * for printing in a console window you need to set this option to - * TRUE in your gfxconf.h and include in your application source file... + * GFXON in your gfxconf.h and include in your application source file... * \#include "chprintf.h" * In your makefile, as part of your list of C source files, include * ${CHIBIOS}/os/various/chprintf.c */ #ifndef GWIN_CONSOLE_USE_BASESTREAM - #define GWIN_CONSOLE_USE_BASESTREAM FALSE + #define GWIN_CONSOLE_USE_BASESTREAM GFXOFF #endif /** * @brief Image windows can optionally support animated images - * @details Defaults to FALSE + * @details Defaults to GFXOFF */ #ifndef GWIN_NEED_IMAGE_ANIMATION - #define GWIN_NEED_IMAGE_ANIMATION FALSE + #define GWIN_NEED_IMAGE_ANIMATION GFXOFF #endif /** * @brief Enable the API to use attributes in the label widget - * @details Defaults to FALSE + * @details Defaults to GFXOFF * @note Using this feature is discouraged. The proper (and faster as well * as more efficient) way is to use two separate labels. */ #ifndef GWIN_LABEL_ATTRIBUTE - #define GWIN_LABEL_ATTRIBUTE FALSE + #define GWIN_LABEL_ATTRIBUTE GFXOFF #endif /** * @brief Enable the API to use images in items in the list widget - * @details Defaults to FALSE + * @details Defaults to GFXOFF */ #ifndef GWIN_NEED_LIST_IMAGES - #define GWIN_NEED_LIST_IMAGES FALSE + #define GWIN_NEED_LIST_IMAGES GFXOFF #endif /** * @brief Enable the API to automatically increment the progressbar over time - * @details Defaults to FALSE + * @details Defaults to GFXOFF */ #ifndef GWIN_PROGRESSBAR_AUTO - #define GWIN_PROGRESSBAR_AUTO FALSE + #define GWIN_PROGRESSBAR_AUTO GFXOFF #endif /** * @brief Should the slider avoid snapping to a fixed position when the mouse is released - * @details Defaults to FALSE - * @note If FALSE the slider will snap to the closest set-able position when the - * mouse is released. If TRUE it will maintain the position the + * @details Defaults to GFXOFF + * @note If GFXOFF the slider will snap to the closest set-able position when the + * mouse is released. If GFXON it will maintain the position the * mouse was released at, except when at the minimum and maximum slider values. */ #ifndef GWIN_SLIDER_NOSNAP - #define GWIN_SLIDER_NOSNAP FALSE + #define GWIN_SLIDER_NOSNAP GFXOFF #endif /** * @brief The number of pixels of dead-band at each end of the slider @@ -374,11 +374,11 @@ #endif /** * @brief Should flashing of widgets be supported - * @details Defaults to FALSE - * @pre Requires GWIN_NEED_WINDOWMANAGER to be TRUE + * @details Defaults to GFXOFF + * @pre Requires GWIN_NEED_WINDOWMANAGER to be GFXON */ #ifndef GWIN_NEED_FLASHING - #define GWIN_NEED_FLASHING FALSE + #define GWIN_NEED_FLASHING GFXOFF #endif /** * @brief What is the period for the flashing timer @@ -398,7 +398,7 @@ * @} * * @name GWIN Virtual Keyboard Layouts - * @brief One or more of these may be defined. They will only be created if GWIN_NEED_KEYBOARD is TRUE. + * @brief One or more of these may be defined. They will only be created if GWIN_NEED_KEYBOARD is GFXON. * @{ */ /** @@ -406,7 +406,7 @@ * @details Defaults to VirtualKeyboardLayout_English1 */ #ifndef GWIN_NEED_KEYBOARD_ENGLISH1 - #define GWIN_NEED_KEYBOARD_ENGLISH1 TRUE + #define GWIN_NEED_KEYBOARD_ENGLISH1 GFXON #endif /** @} */ diff --git a/src/gwin/gwin_progressbar.h b/src/gwin/gwin_progressbar.h index 1824a4e9..646f6954 100644 --- a/src/gwin/gwin_progressbar.h +++ b/src/gwin/gwin_progressbar.h @@ -14,8 +14,8 @@ * * @brief ProgressBar widget. * - * @pre GFX_USE_GWIN must be set to TRUE in your gfxconf.h - * @pre GWIN_NEED_PROGRESSBAR must be set to TRUE in your gfxconf.h + * @pre GFX_USE_GWIN must be set to GFXON in your gfxconf.h + * @pre GWIN_NEED_PROGRESSBAR must be set to GFXON in your gfxconf.h * @{ */ @@ -213,7 +213,7 @@ void gwinProgressbarDraw_Std(GWidgetObject *gw, void *param); * and inactive areas. No checking is done to compare the dimensions of the progressbar * to the size of the image. Note text is drawn on top of the image. * - * @pre GDISP_NEED_IMAGE must be set to TRUE + * @pre GDISP_NEED_IMAGE must be set to GFXON * * @api */ diff --git a/src/gwin/gwin_radio.h b/src/gwin/gwin_radio.h index 3371a9ef..161cbb19 100644 --- a/src/gwin/gwin_radio.h +++ b/src/gwin/gwin_radio.h @@ -17,8 +17,8 @@ * @details RadioButtons need to be grouped together. This is archived by passing a group parameter through * @p gwinRadioCreate(). * - * @pre GFX_USE_GWIN must be set to TRUE in your gfxconf.h - * @pre GWIN_NEED_RADIO must be set to TRUE in your gfxconf.h + * @pre GFX_USE_GWIN must be set to GFXON in your gfxconf.h + * @pre GWIN_NEED_RADIO must be set to GFXON in your gfxconf.h * @{ */ diff --git a/src/gwin/gwin_rules.h b/src/gwin/gwin_rules.h index c044be66..08e2e8f0 100644 --- a/src/gwin/gwin_rules.h +++ b/src/gwin/gwin_rules.h @@ -19,14 +19,14 @@ #if GFX_USE_GWIN // Sub-system rules #if !GFX_USE_GDISP - #error "GWIN: GFX_USE_GDISP must be TRUE when using GWIN" + #error "GWIN: GFX_USE_GDISP must be GFXON when using GWIN" #endif #if !GDISP_NEED_CLIP #if GFX_DISPLAY_RULE_WARNINGS #if GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_DIRECT - #warning "GWIN: Drawing can occur outside the defined windows as GDISP_NEED_CLIP is FALSE" + #warning "GWIN: Drawing can occur outside the defined windows as GDISP_NEED_CLIP is GFXOFF" #elif GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_MACRO - COMPILER_WARNING("GWIN: Drawing can occur outside the defined windows as GDISP_NEED_CLIP is FALSE") + COMPILER_WARNING("GWIN: Drawing can occur outside the defined windows as GDISP_NEED_CLIP is GFXOFF") #endif #endif #endif @@ -42,7 +42,7 @@ #endif #endif #undef GWIN_NEED_CONTAINERS - #define GWIN_NEED_CONTAINERS TRUE + #define GWIN_NEED_CONTAINERS GFXON #endif #endif #if GWIN_NEED_BUTTON || GWIN_NEED_SLIDER || GWIN_NEED_CHECKBOX || GWIN_NEED_LABEL || GWIN_NEED_RADIO || GWIN_NEED_LIST || \ @@ -56,7 +56,7 @@ #endif #endif #undef GWIN_NEED_WIDGET - #define GWIN_NEED_WIDGET TRUE + #define GWIN_NEED_WIDGET GFXON #endif #endif @@ -71,100 +71,100 @@ #endif #endif #undef GWIN_NEED_WIDGET - #define GWIN_NEED_WIDGET TRUE + #define GWIN_NEED_WIDGET GFXON #endif #endif #if GWIN_NEED_WIDGET #if !GDISP_NEED_TEXT - #error "GWIN: GDISP_NEED_TEXT is required if GWIN_NEED_WIDGET is TRUE." + #error "GWIN: GDISP_NEED_TEXT is required if GWIN_NEED_WIDGET is GFXON." #endif #if !GFX_USE_GINPUT // This test also ensures that GFX_USE_GEVENT is set - #error "GWIN: GFX_USE_GINPUT is required if GWIN_NEED_WIDGET is TRUE" + #error "GWIN: GFX_USE_GINPUT is required if GWIN_NEED_WIDGET is GFXON" #endif #if !GWIN_NEED_WINDOWMANAGER #if GFX_DISPLAY_RULE_WARNINGS #if GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_DIRECT - #warning "GWIN: GWIN_NEED_WINDOWMANAGER is required if GWIN_NEED_WIDGET is TRUE. It has been turned on for you." + #warning "GWIN: GWIN_NEED_WINDOWMANAGER is required if GWIN_NEED_WIDGET is GFXON. It has been turned on for you." #elif GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_MACRO - COMPILER_WARNING("GWIN: GWIN_NEED_WINDOWMANAGER is required if GWIN_NEED_WIDGET is TRUE. It has been turned on for you.") + COMPILER_WARNING("GWIN: GWIN_NEED_WINDOWMANAGER is required if GWIN_NEED_WIDGET is GFXON. It has been turned on for you.") #endif #endif #undef GWIN_NEED_WINDOWMANAGER - #define GWIN_NEED_WINDOWMANAGER TRUE + #define GWIN_NEED_WINDOWMANAGER GFXON #endif #if !GDISP_NEED_MULTITHREAD #if GFX_DISPLAY_RULE_WARNINGS #if GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_DIRECT - #warning "GWIN: GDISP_NEED_MULTITHREAD is required if GWIN_NEED_WIDGET is TRUE. It has been turned on for you" + #warning "GWIN: GDISP_NEED_MULTITHREAD is required if GWIN_NEED_WIDGET is GFXON. It has been turned on for you" #elif GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_MACRO - COMPILER_WARNING("GWIN: GDISP_NEED_MULTITHREAD is required if GWIN_NEED_WIDGET is TRUE. It has been turned on for you") + COMPILER_WARNING("GWIN: GDISP_NEED_MULTITHREAD is required if GWIN_NEED_WIDGET is GFXON. It has been turned on for you") #endif #endif #undef GDISP_NEED_MULTITHREAD - #define GDISP_NEED_MULTITHREAD TRUE + #define GDISP_NEED_MULTITHREAD GFXON #endif #endif #if GWIN_NEED_WINDOWMANAGER #if !GFX_USE_GQUEUE || !GQUEUE_NEED_ASYNC #if GFX_DISPLAY_RULE_WARNINGS #if GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_DIRECT - #warning "GWIN: GFX_USE_GQUEUE and GQUEUE_NEED_ASYNC is required if GWIN_NEED_WINDOWMANAGER is TRUE. It has been turned on for you." + #warning "GWIN: GFX_USE_GQUEUE and GQUEUE_NEED_ASYNC is required if GWIN_NEED_WINDOWMANAGER is GFXON. It has been turned on for you." #elif GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_MACRO - COMPILER_WARNING("GWIN: GFX_USE_GQUEUE and GQUEUE_NEED_ASYNC is required if GWIN_NEED_WINDOWMANAGER is TRUE. It has been turned on for you.") + COMPILER_WARNING("GWIN: GFX_USE_GQUEUE and GQUEUE_NEED_ASYNC is required if GWIN_NEED_WINDOWMANAGER is GFXON. It has been turned on for you.") #endif #endif #undef GFX_USE_GQUEUE #undef GQUEUE_NEED_ASYNC - #define GFX_USE_GQUEUE TRUE - #define GQUEUE_NEED_ASYNC TRUE + #define GFX_USE_GQUEUE GFXON + #define GQUEUE_NEED_ASYNC GFXON #endif #if !GFX_USE_GTIMER #if GFX_DISPLAY_RULE_WARNINGS #if GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_DIRECT - #warning "GWIN: GFX_USE_GTIMER is required if GWIN_NEED_WINDOWMANAGER is TRUE. It has been turned on for you." + #warning "GWIN: GFX_USE_GTIMER is required if GWIN_NEED_WINDOWMANAGER is GFXON. It has been turned on for you." #elif GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_MACRO - COMPILER_WARNING("GWIN: GFX_USE_GTIMER is required if GWIN_NEED_WINDOWMANAGER is TRUE. It has been turned on for you.") + COMPILER_WARNING("GWIN: GFX_USE_GTIMER is required if GWIN_NEED_WINDOWMANAGER is GFXON. It has been turned on for you.") #endif #endif #undef GFX_USE_GTIMER - #define GFX_USE_GTIMER TRUE + #define GFX_USE_GTIMER GFXON #endif #endif // Rules for individual objects #if GWIN_NEED_LIST #if !GDISP_NEED_TEXT - #error "GWIN: GDISP_NEED_TEXT is required when GWIN_NEED_LIST is TRUE." + #error "GWIN: GDISP_NEED_TEXT is required when GWIN_NEED_LIST is GFXON." #endif #endif #if GWIN_NEED_RADIO #if !GDISP_NEED_CIRCLE #if GFX_DISPLAY_RULE_WARNINGS #if GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_DIRECT - #warning "GWIN: GDISP_NEED_CIRCLE should be set to TRUE for much nicer radio button widgets." + #warning "GWIN: GDISP_NEED_CIRCLE should be set to GFXON for much nicer radio button widgets." #elif GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_MACRO - COMPILER_WARNING("GWIN: GDISP_NEED_CIRCLE should be set to TRUE for much nicer radio button widgets.") + COMPILER_WARNING("GWIN: GDISP_NEED_CIRCLE should be set to GFXON for much nicer radio button widgets.") #endif #endif #endif #endif #if GWIN_NEED_IMAGE #if !GDISP_NEED_IMAGE - #error "GWIN: GDISP_NEED_IMAGE is required when GWIN_NEED_IMAGE is TRUE." + #error "GWIN: GDISP_NEED_IMAGE is required when GWIN_NEED_IMAGE is GFXON." #endif #endif #if GWIN_NEED_CONSOLE #if !GDISP_NEED_TEXT - #error "GWIN: GDISP_NEED_TEXT is required if GWIN_NEED_CONSOLE is TRUE." + #error "GWIN: GDISP_NEED_TEXT is required if GWIN_NEED_CONSOLE is GFXON." #endif #endif #if GWIN_NEED_TEXTEDIT #if !GDISP_NEED_TEXT - #error "GWIN: GDISP_NEED_TEXT is required if GWIN_NEED_TEXTEDIT is TRUE." + #error "GWIN: GDISP_NEED_TEXT is required if GWIN_NEED_TEXTEDIT is GFXON." #endif #if !(GINPUT_NEED_KEYBOARD || GWIN_NEED_KEYBOARD) - #error "GWIN: GINPUT_NEED_KEYBOARD or GWIN_NEED_KEYBOARD is required if GWIN_NEED_TEXTEDIT is TRUE." + #error "GWIN: GINPUT_NEED_KEYBOARD or GWIN_NEED_KEYBOARD is required if GWIN_NEED_TEXTEDIT is GFXON." #endif #endif #endif diff --git a/src/gwin/gwin_slider.h b/src/gwin/gwin_slider.h index 29cbeea0..616663be 100644 --- a/src/gwin/gwin_slider.h +++ b/src/gwin/gwin_slider.h @@ -16,8 +16,8 @@ * * @details Extended events can be enabled using @p gwinSliderSendExtendedEvents(). * - * @pre GFX_USE_GWIN must be set to TRUE in your gfxconf.h - * @pre GWIN_NEED_SLIDER must be set to TRUE in your gfxconf.h + * @pre GFX_USE_GWIN must be set to GFXON in your gfxconf.h + * @pre GWIN_NEED_SLIDER must be set to GFXON in your gfxconf.h * @{ */ @@ -191,7 +191,7 @@ void gwinSliderDraw_Std(GWidgetObject *gw, void *param); * No checking is done to compare the size of the button to the size of the image. * No text is drawn on top of the image. * - * @pre GDISP_NEED_IMAGE must be set to TRUE + * @pre GDISP_NEED_IMAGE must be set to GFXON * * @api */ diff --git a/src/gwin/gwin_tabset.h b/src/gwin/gwin_tabset.h index 6eaeb014..90d9eb3b 100644 --- a/src/gwin/gwin_tabset.h +++ b/src/gwin/gwin_tabset.h @@ -18,8 +18,8 @@ * Note: Although the tabset is implemented as a container - you don't put your controls * directly on the tabset. Instead you create a page and put your widgets on the page. * - * @pre GFX_USE_GWIN must be set to TRUE in your gfxconf.h - * @pre GWIN_NEED_TABSET must be set to TRUE in your gfxconf.h + * @pre GFX_USE_GWIN must be set to GFXON in your gfxconf.h + * @pre GWIN_NEED_TABSET must be set to GFXON in your gfxconf.h * @{ */ @@ -224,7 +224,7 @@ void gwinTabsetDraw_Transparent(GWidgetObject *gw, void *param); * @note The image must be already opened before calling @p gwinSetCustomDraw(). The handle is passed as the parameter * to this function. * - * @pre GDISP_NEED_IMAGE must be set to TRUE + * @pre GDISP_NEED_IMAGE must be set to GFXON * * @api */ diff --git a/src/gwin/gwin_textedit.h b/src/gwin/gwin_textedit.h index 8cf6c03e..0fdcc843 100644 --- a/src/gwin/gwin_textedit.h +++ b/src/gwin/gwin_textedit.h @@ -17,10 +17,10 @@ * @note Due to the modularity of the @p GINPUT module, the text input can either come from a real physical * keyboard or from a vritual on-screen keyboard such as the @p KeyboardWidget. * - * @pre GFX_USE_GDISP must be set to TRUE in your gfxconf.h - * @pre GFX_USE_GWIN must be set to TRUE in your gfxconf.h - * @pre GDISP_NEED_TEXT must be set to TRUE in your gfxconf.h - * @pre GWIN_NEED_TEXTEDIT must be set to TRUE in your gfxconf.h + * @pre GFX_USE_GDISP must be set to GFXON in your gfxconf.h + * @pre GFX_USE_GWIN must be set to GFXON in your gfxconf.h + * @pre GDISP_NEED_TEXT must be set to GFXON in your gfxconf.h + * @pre GWIN_NEED_TEXTEDIT must be set to GFXON in your gfxconf.h * @pre The fonts you want to use must be enabled in your gfxconf.h * * @{ diff --git a/src/gwin/gwin_widget.h b/src/gwin/gwin_widget.h index ce7490cd..58c71b16 100644 --- a/src/gwin/gwin_widget.h +++ b/src/gwin/gwin_widget.h @@ -18,7 +18,7 @@ * via an input device such as a mouse or toggle buttons. It is the * base class for widgets such as buttons and sliders. * - * @pre GFX_USE_GWIN and GWIN_NEED_WIDGET must be set to TRUE in your gfxconf.h + * @pre GFX_USE_GWIN and GWIN_NEED_WIDGET must be set to GFXON in your gfxconf.h * @{ */ @@ -234,7 +234,7 @@ const char *gwinGetText(GHandle gh); #if (GFX_USE_GFILE && GFILE_NEED_PRINTG && GFILE_NEED_STRINGS) || defined(__DOXYGEN__) /** * @brief Set the text of a widget using a printf style format. - * @pre GFX_USE_GFILE, GFILE_NEED_PRINTG and GFILE_NEED_STRINGS must all be TRUE + * @pre GFX_USE_GFILE, GFILE_NEED_PRINTG and GFILE_NEED_STRINGS must all be GFXON * * @param[in] gh The widget handle * @param[in] fmt The format string using a printf/g syntax. See @p vsnprintg() @@ -269,7 +269,7 @@ bool_t gwinIsWidget(GHandle gh); * * @note Non-widgets will ignore this call. * - * @pre Requires GWIN_WIDGET_TAGS to be TRUE + * @pre Requires GWIN_WIDGET_TAGS to be GFXON * * @api */ @@ -281,7 +281,7 @@ bool_t gwinIsWidget(GHandle gh); * * @param[in] gh The widget handle * - * @pre Requires GWIN_WIDGET_TAGS to be TRUE + * @pre Requires GWIN_WIDGET_TAGS to be GFXON * * @api */ |