From 36c55722ddc06af682d7c7bdeb71ba75a3b0fb83 Mon Sep 17 00:00:00 2001 From: Joel Bodenmann Date: Mon, 28 Oct 2013 00:42:38 +0100 Subject: updated GDISP and GWIN demos --- demos/modules/gwin/basic/gfxconf.h | 18 +++++++----------- demos/modules/gwin/basic/main.c | 4 ++-- 2 files changed, 9 insertions(+), 13 deletions(-) (limited to 'demos/modules/gwin/basic') diff --git a/demos/modules/gwin/basic/gfxconf.h b/demos/modules/gwin/basic/gfxconf.h index 3ef9c784..1e6784fd 100644 --- a/demos/modules/gwin/basic/gfxconf.h +++ b/demos/modules/gwin/basic/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 TRUE +#define GFX_USE_OS_CHIBIOS FALSE #define GFX_USE_OS_WIN32 FALSE -#define GFX_USE_OS_POSIX FALSE +#define GFX_USE_OS_LINUX FALSE +#define GFX_USE_OS_OSX FALSE /* GFX sub-systems to turn on */ #define GFX_USE_GDISP TRUE @@ -42,15 +43,10 @@ /* Features for the GDISP sub-system. */ #define GDISP_NEED_VALIDATION TRUE #define GDISP_NEED_CLIP TRUE -#define GDISP_NEED_TEXT FALSE #define GDISP_NEED_CIRCLE TRUE -#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 + +/* Features for the GWIN subsystem. */ +#define GWIN_NEED_WINDOWMANAGER TRUE #endif /* _GFXCONF_H */ + diff --git a/demos/modules/gwin/basic/main.c b/demos/modules/gwin/basic/main.c index c46e6969..eee22f29 100644 --- a/demos/modules/gwin/basic/main.c +++ b/demos/modules/gwin/basic/main.c @@ -37,7 +37,7 @@ int main(void) { /* Initialize and clear the display */ gfxInit(); - gdispClear(Lime); + gdispClear(White); /* Create two windows */ { @@ -60,7 +60,7 @@ int main(void) { gwinClear(GW2); gwinDrawLine(GW1, 5, 30, 150, 110); - for(i=5, j=0; i < 200 && j < 150; i+=3, j+=i/20) + for(i = 5, j = 0; i < 200 && j < 150; i += 3, j += i/20) gwinDrawPixel(GW1, i, j); /* -- cgit v1.2.3 From 2cb8e08c525e140a20982cb14e59ebd7782f2792 Mon Sep 17 00:00:00 2001 From: Joel Bodenmann Date: Mon, 28 Oct 2013 01:00:02 +0100 Subject: uncommented GOS selection in GDISP and GWIN demos --- demos/modules/gwin/basic/gfxconf.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'demos/modules/gwin/basic') diff --git a/demos/modules/gwin/basic/gfxconf.h b/demos/modules/gwin/basic/gfxconf.h index 1e6784fd..411ad9cf 100644 --- a/demos/modules/gwin/basic/gfxconf.h +++ b/demos/modules/gwin/basic/gfxconf.h @@ -30,11 +30,11 @@ #ifndef _GFXCONF_H #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_LINUX FALSE -#define GFX_USE_OS_OSX FALSE +/* The operating system to use. One of these must be defined - perferably in your Makefile */ +//#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 -- cgit v1.2.3 From db09e33dff7110861ce2fa586b04c05626e3f7e8 Mon Sep 17 00:00:00 2001 From: inmarket Date: Mon, 28 Oct 2013 10:46:25 +1000 Subject: Fix spelling error and migrate demo gfxconf.h changes to all demos including the new streaming and multiple display demos --- demos/modules/gwin/basic/gfxconf.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'demos/modules/gwin/basic') diff --git a/demos/modules/gwin/basic/gfxconf.h b/demos/modules/gwin/basic/gfxconf.h index 411ad9cf..70149055 100644 --- a/demos/modules/gwin/basic/gfxconf.h +++ b/demos/modules/gwin/basic/gfxconf.h @@ -30,11 +30,11 @@ #ifndef _GFXCONF_H #define _GFXCONF_H -/* The operating system to use. One of these must be defined - perferably in your Makefile */ -//#define GFX_USE_OS_CHIBIOS FALSE +/* The operating system to use. One of these must be defined - preferably in your Makefile */ +//#define GFX_USE_OS_CHIBIOS FALSE //#define GFX_USE_OS_WIN32 FALSE //#define GFX_USE_OS_LINUX FALSE -//#define GFX_USE_OS_OSX FALSE +//#define GFX_USE_OS_OSX FALSE /* GFX sub-systems to turn on */ #define GFX_USE_GDISP TRUE -- cgit v1.2.3