From 7fbfde42aabbcd30cffba2fba35158236c0a6c6c Mon Sep 17 00:00:00 2001 From: inmarket Date: Sat, 25 May 2013 01:26:52 +1000 Subject: GOS module, for operating system independance GMISC fast floating point trig GMISC fast fixed point trig --- demos/modules/gwin/console/gfxconf.h | 8 +++++--- demos/modules/gwin/console/main.c | 12 +++--------- 2 files changed, 8 insertions(+), 12 deletions(-) (limited to 'demos/modules/gwin/console') diff --git a/demos/modules/gwin/console/gfxconf.h b/demos/modules/gwin/console/gfxconf.h index 178beb86..46361c9b 100644 --- a/demos/modules/gwin/console/gfxconf.h +++ b/demos/modules/gwin/console/gfxconf.h @@ -9,12 +9,14 @@ #ifndef _GFXCONF_H #define _GFXCONF_H +/* The operating system to use - one of these must be defined */ +#define GFX_USE_OS_CHIBIOS TRUE +#define GFX_USE_OS_WIN32 FALSE +#define GFX_USE_OS_POSIX FALSE + /* GFX sub-systems to turn on */ #define GFX_USE_GDISP TRUE #define GFX_USE_GWIN TRUE -#define GFX_USE_GEVENT FALSE -#define GFX_USE_GTIMER FALSE -#define GFX_USE_GINPUT FALSE /* Features for the GDISP sub-system. */ #define GDISP_NEED_VALIDATION TRUE diff --git a/demos/modules/gwin/console/main.c b/demos/modules/gwin/console/main.c index 90ebf86f..d968b920 100644 --- a/demos/modules/gwin/console/main.c +++ b/demos/modules/gwin/console/main.c @@ -18,10 +18,8 @@ along with this program. If not, see . */ -#include "ch.h" -#include "hal.h" -#include "chprintf.h" #include "gfx.h" +#include "chprintf.h" /* The handles for our three consoles */ GHandle GW1, GW2, GW3; @@ -33,12 +31,8 @@ int main(void) { uint8_t i; font_t font1, font2; - halInit(); - chSysInit(); - /* initialize and clear the display */ - gdispInit(); - gdispClear(Black); + gfxInit(); font1 = gdispOpenFont("UI2 Double"); font2 = gdispOpenFont("Small"); @@ -81,7 +75,7 @@ int main(void) { } while(TRUE) { - chThdSleepMilliseconds(500); + gfxSleepMilliseconds(500); } } -- cgit v1.2.3