diff options
| author | Joel Bodenmann <joel@unormal.org> | 2013-10-28 00:42:38 +0100 |
|---|---|---|
| committer | inmarket <andrewh@inmarket.com.au> | 2013-10-28 09:52:09 +1000 |
| commit | 36c55722ddc06af682d7c7bdeb71ba75a3b0fb83 (patch) | |
| tree | 2a68e9b62467b121d049d08ff2cd325de0361466 /demos/modules/gwin/console | |
| parent | 4b76efce1d2676333606d4fd08f34ace33824312 (diff) | |
| download | uGFX-36c55722ddc06af682d7c7bdeb71ba75a3b0fb83.tar.gz uGFX-36c55722ddc06af682d7c7bdeb71ba75a3b0fb83.tar.bz2 uGFX-36c55722ddc06af682d7c7bdeb71ba75a3b0fb83.zip | |
updated GDISP and GWIN demos
Diffstat (limited to 'demos/modules/gwin/console')
| -rw-r--r-- | demos/modules/gwin/console/gfxconf.h | 29 | ||||
| -rw-r--r-- | demos/modules/gwin/console/main.c | 4 |
2 files changed, 12 insertions, 21 deletions
diff --git a/demos/modules/gwin/console/gfxconf.h b/demos/modules/gwin/console/gfxconf.h index 90dbc7cb..c1307302 100644 --- a/demos/modules/gwin/console/gfxconf.h +++ b/demos/modules/gwin/console/gfxconf.h @@ -31,9 +31,10 @@ #define _GFXCONF_H /* The operating system to use - one of these must be defined */ -//#define GFX_USE_OS_CHIBIOS FALSE -//#define GFX_USE_OS_WIN32 FALSE -//#define GFX_USE_OS_POSIX FALSE +#define GFX_USE_OS_CHIBIOS FALSE +#define GFX_USE_OS_WIN32 FALSE +#define GFX_USE_OS_LINUX FALSE +#define GFX_USE_OS_OSX FALSE /* GFX sub-systems to turn on */ #define GFX_USE_GDISP TRUE @@ -43,24 +44,14 @@ #define GDISP_NEED_VALIDATION TRUE #define GDISP_NEED_CLIP TRUE #define GDISP_NEED_TEXT TRUE -#define GDISP_NEED_CIRCLE FALSE -#define GDISP_NEED_ELLIPSE FALSE -#define GDISP_NEED_ARC FALSE -#define GDISP_NEED_SCROLL FALSE -#define GDISP_NEED_PIXELREAD FALSE -#define GDISP_NEED_CONTROL FALSE -#define GDISP_NEED_MULTITHREAD FALSE -#define GDISP_NEED_ASYNC FALSE -#define GDISP_NEED_MSGAPI FALSE -/* Builtin Fonts */ -#define GDISP_INCLUDE_FONT_SMALL FALSE -#define GDISP_INCLUDE_FONT_LARGER FALSE -#define GDISP_INCLUDE_FONT_UI1 FALSE -#define GDISP_INCLUDE_FONT_UI2 TRUE -#define GDISP_INCLUDE_FONT_LARGENUMBERS FALSE +/* GDISP fonts to include */ +#define GDISP_INCLUDE_FONT_UI2 TRUE +#define GDISP_INCLUDE_FONT_DEJAVUSANS12 TRUE -/* Features for the GWIN sub-system. */ +/* Features for the GWIN subsystem. */ +#define GWIN_NEED_WINDOWMANAGER TRUE #define GWIN_NEED_CONSOLE TRUE #endif /* _GFXCONF_H */ + diff --git a/demos/modules/gwin/console/main.c b/demos/modules/gwin/console/main.c index 2175ce04..0efd1c99 100644 --- a/demos/modules/gwin/console/main.c +++ b/demos/modules/gwin/console/main.c @@ -41,7 +41,7 @@ int main(void) { /* Set some fonts */ font1 = gdispOpenFont("UI2"); - font2 = gdispOpenFont("UI2 Double"); + font2 = gdispOpenFont("DejaVu Sans 12"); gwinSetDefaultFont(font1); /* create the three console windows */ @@ -75,7 +75,7 @@ int main(void) { /* Output some data on the first console */ for(i = 0; i < 10; i++) { - gwinPrintf(GW1, "Hello ChibiOS/GFX!\r\n"); + gwinPrintf(GW1, "Hello uGFX!\r\n"); } /* Output some data on the second console */ |