diff options
Diffstat (limited to 'drivers/multiple/X')
| -rw-r--r-- | drivers/multiple/X/gdisp_lld_X.c | 16 | ||||
| -rw-r--r-- | drivers/multiple/X/gdisp_lld_config.h | 12 | ||||
| -rw-r--r-- | drivers/multiple/X/readme.txt | 6 |
3 files changed, 17 insertions, 17 deletions
diff --git a/drivers/multiple/X/gdisp_lld_X.c b/drivers/multiple/X/gdisp_lld_X.c index 0d471d09..f27795a8 100644 --- a/drivers/multiple/X/gdisp_lld_X.c +++ b/drivers/multiple/X/gdisp_lld_X.c @@ -24,7 +24,7 @@ // Configuration parameters for this driver #ifndef GDISP_FORCE_24BIT - #define GDISP_FORCE_24BIT FALSE + #define GDISP_FORCE_24BIT GFXOFF #endif #ifndef GDISP_SCREEN_WIDTH #define GDISP_SCREEN_WIDTH 640 @@ -34,17 +34,17 @@ #endif #ifndef GKEYBOARD_X_NO_LAYOUT /** - * Setting this to TRUE turns off the layout engine. + * Setting this to GFXON turns off the layout engine. * In this situation "cooked" characters are returned but * shift states etc are lost. * As only a limited number of keyboard layouts are currently * defined for X in uGFX (currently none), setting this - * to TRUE enables the X keyboard mapping to be pass non-English + * to GFXON enables the X keyboard mapping to be pass non-English * characters to uGFX or to handle non-standard keyboard layouts at * the expense of losing special function keys etc. */ - // We set this to TRUE by default as currently the X layout code is not complete! - #define GKEYBOARD_X_NO_LAYOUT TRUE + // We set this to GFXON by default as currently the X layout code is not complete! + #define GKEYBOARD_X_NO_LAYOUT GFXON #endif #ifndef GKEYBOARD_X_DEFAULT_LAYOUT #define GKEYBOARD_X_DEFAULT_LAYOUT KeyboardLayout_X_US @@ -102,7 +102,7 @@ #if !GKEYBOARD_X_NO_LAYOUT #if GKEYBOARD_LAYOUT_OFF - #error "The X keyboard driver is using the layout engine. Please set GKEYBOARD_LAYOUT_OFF=FALSE or GKEYBOARD_X_NO_LAYOUT=TRUE." + #error "The X keyboard driver is using the layout engine. Please set GKEYBOARD_LAYOUT_OFF=GFXOFF or GKEYBOARD_X_NO_LAYOUT=GFXON." #endif // Forward definitions @@ -133,9 +133,9 @@ }; #elif !GKEYBOARD_LAYOUT_OFF #if GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_DIRECT - #warning "The X keyboard driver is not using the layout engine. If no other keyboard is using it consider defining GKEYBOARD_LAYOUT_OFF=TRUE to save code size." + #warning "The X keyboard driver is not using the layout engine. If no other keyboard is using it consider defining GKEYBOARD_LAYOUT_OFF=GFXON to save code size." #elif GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_MACRO - COMPILER_WARNING("The X keyboard driver is not using the layout engine. If no other keyboard is using it consider defining GKEYBOARD_LAYOUT_OFF=TRUE to save code size.") + COMPILER_WARNING("The X keyboard driver is not using the layout engine. If no other keyboard is using it consider defining GKEYBOARD_LAYOUT_OFF=GFXON to save code size.") #endif #endif diff --git a/drivers/multiple/X/gdisp_lld_config.h b/drivers/multiple/X/gdisp_lld_config.h index 55d61d74..87aca5cf 100644 --- a/drivers/multiple/X/gdisp_lld_config.h +++ b/drivers/multiple/X/gdisp_lld_config.h @@ -14,12 +14,12 @@ /* Driver hardware support. */ /*===========================================================================*/ -#define GDISP_HARDWARE_DRAWPIXEL TRUE -#define GDISP_HARDWARE_FILLS TRUE -#define GDISP_HARDWARE_BITFILLS FALSE -#define GDISP_HARDWARE_SCROLL TRUE -#define GDISP_HARDWARE_PIXELREAD TRUE -#define GDISP_HARDWARE_CONTROL FALSE +#define GDISP_HARDWARE_DRAWPIXEL GFXON +#define GDISP_HARDWARE_FILLS GFXON +#define GDISP_HARDWARE_BITFILLS GFXOFF +#define GDISP_HARDWARE_SCROLL GFXON +#define GDISP_HARDWARE_PIXELREAD GFXON +#define GDISP_HARDWARE_CONTROL GFXOFF #define GDISP_LLD_PIXELFORMAT GDISP_PIXELFORMAT_RGB888 diff --git a/drivers/multiple/X/readme.txt b/drivers/multiple/X/readme.txt index b26dce5d..622b7334 100644 --- a/drivers/multiple/X/readme.txt +++ b/drivers/multiple/X/readme.txt @@ -4,9 +4,9 @@ This driver is special in that it implements both the gdisp low level driver and a touchscreen driver. 1. Add in your gfxconf.h: - a) #define GFX_USE_GDISP TRUE - b) #define GFX_USE_GINPUT TRUE - #define GINPUT_USE_MOUSE TRUE + a) #define GFX_USE_GDISP GFXON + b) #define GFX_USE_GINPUT GFXON + #define GINPUT_USE_MOUSE GFXON c) Any optional high level driver defines (see gdisp.h) eg: GDISP_NEED_MULTITHREAD d) Optionally the following (with appropriate values): #define GDISP_SCREEN_WIDTH 640 |