diff options
| author | inmarket <andrewh@inmarket.com.au> | 2013-05-25 01:26:52 +1000 |
|---|---|---|
| committer | inmarket <andrewh@inmarket.com.au> | 2013-05-25 01:26:52 +1000 |
| commit | 7fbfde42aabbcd30cffba2fba35158236c0a6c6c (patch) | |
| tree | e85c90a4f21974b706315d64209021e0b2bde764 /demos/3rdparty | |
| parent | 42006a67b5ccfd86f30d8a91cc474681c437eaf6 (diff) | |
| download | uGFX-7fbfde42aabbcd30cffba2fba35158236c0a6c6c.tar.gz uGFX-7fbfde42aabbcd30cffba2fba35158236c0a6c6c.tar.bz2 uGFX-7fbfde42aabbcd30cffba2fba35158236c0a6c6c.zip | |
GOS module, for operating system independance
GMISC fast floating point trig
GMISC fast fixed point trig
Diffstat (limited to 'demos/3rdparty')
| -rw-r--r-- | demos/3rdparty/boing/gfxconf.h | 9 | ||||
| -rw-r--r-- | demos/3rdparty/boing/main.c | 8 | ||||
| -rw-r--r-- | demos/3rdparty/bubbles/gfxconf.h | 9 | ||||
| -rw-r--r-- | demos/3rdparty/bubbles/main.c | 8 |
4 files changed, 16 insertions, 18 deletions
diff --git a/demos/3rdparty/boing/gfxconf.h b/demos/3rdparty/boing/gfxconf.h index 45b6d7ab..0afcd45b 100644 --- a/demos/3rdparty/boing/gfxconf.h +++ b/demos/3rdparty/boing/gfxconf.h @@ -9,12 +9,13 @@ #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 FALSE -#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 FALSE diff --git a/demos/3rdparty/boing/main.c b/demos/3rdparty/boing/main.c index a34cd2a9..96ba5c9d 100644 --- a/demos/3rdparty/boing/main.c +++ b/demos/3rdparty/boing/main.c @@ -11,11 +11,11 @@ * width*height pixels out. * -- * Chris Baird,, <cjb@brushtail.apana.org.au> April 2013 + * + * Modified Andrew Hannam (inmarket) 2013-04-29 New GFX support */ #include <math.h> -#include "ch.h" -#include "hal.h" #include "gfx.h" #include "ssd2119.h" @@ -56,9 +56,7 @@ void main (void) { uint16_t xx, yy, colour; - halInit(); - chSysInit(); - gdispInit(); + gfxInit(); uint16_t width = (uint16_t)gdispGetWidth(); uint16_t height = (uint16_t)gdispGetHeight(); diff --git a/demos/3rdparty/bubbles/gfxconf.h b/demos/3rdparty/bubbles/gfxconf.h index 9b1f76a6..344a986e 100644 --- a/demos/3rdparty/bubbles/gfxconf.h +++ b/demos/3rdparty/bubbles/gfxconf.h @@ -9,12 +9,13 @@ #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 FALSE -#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 FALSE diff --git a/demos/3rdparty/bubbles/main.c b/demos/3rdparty/bubbles/main.c index 81c5dbe3..62ef2830 100644 --- a/demos/3rdparty/bubbles/main.c +++ b/demos/3rdparty/bubbles/main.c @@ -8,11 +8,11 @@ * modifiable, provided his name is kept in the source. * -- * Chris Baird,, <cjb@brushtail.apana.org.au> April 2013 + * + * Modified Andrew Hannam (inmarket) 2013-04-29 New GFX calls */ #include <math.h> -#include "ch.h" -#include "hal.h" #include "gfx.h" @@ -149,9 +149,7 @@ int main (void) { int pass = 0; - halInit(); - chSysInit(); - gdispInit(); + gfxInit(); chThdSleepMilliseconds (10); gdispClear (background); /* glitches.. */ |