diff options
| author | Andrew Hannam <andrewh@inmarket.com.au> | 2013-05-24 08:41:48 -0700 |
|---|---|---|
| committer | Andrew Hannam <andrewh@inmarket.com.au> | 2013-05-24 08:41:48 -0700 |
| commit | f0569e2555b3a7f2afe05cc42e4dd0982b179167 (patch) | |
| tree | e85c90a4f21974b706315d64209021e0b2bde764 /demos/modules/ginput/touch_driver_test | |
| parent | 5f2a32714cda6bcfc8829e61895def2f627e1b8f (diff) | |
| parent | 7fbfde42aabbcd30cffba2fba35158236c0a6c6c (diff) | |
| download | uGFX-f0569e2555b3a7f2afe05cc42e4dd0982b179167.tar.gz uGFX-f0569e2555b3a7f2afe05cc42e4dd0982b179167.tar.bz2 uGFX-f0569e2555b3a7f2afe05cc42e4dd0982b179167.zip | |
Merge pull request #73 from inmarket/master
GOS module for OS independance, GMISC additions
Diffstat (limited to 'demos/modules/ginput/touch_driver_test')
| -rw-r--r-- | demos/modules/ginput/touch_driver_test/gfxconf.h | 5 | ||||
| -rw-r--r-- | demos/modules/ginput/touch_driver_test/main.c | 8 |
2 files changed, 7 insertions, 6 deletions
diff --git a/demos/modules/ginput/touch_driver_test/gfxconf.h b/demos/modules/ginput/touch_driver_test/gfxconf.h index 87787527..ee96f23c 100644 --- a/demos/modules/ginput/touch_driver_test/gfxconf.h +++ b/demos/modules/ginput/touch_driver_test/gfxconf.h @@ -28,6 +28,11 @@ #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 diff --git a/demos/modules/ginput/touch_driver_test/main.c b/demos/modules/ginput/touch_driver_test/main.c index 80c85273..424b2587 100644 --- a/demos/modules/ginput/touch_driver_test/main.c +++ b/demos/modules/ginput/touch_driver_test/main.c @@ -25,10 +25,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "ch.h" -#include "hal.h" -#include "chprintf.h" #include "gfx.h" +#include "chprintf.h" static GConsoleObject gc; static GButtonObject gNext; @@ -49,9 +47,7 @@ int main(void) { GEventType deviceType; font_t font; - halInit(); // Initialise the Hardware - chSysInit(); // Initialize the OS - gdispInit(); // Initialize the display + gfxInit(); // Initialize the display // Get the display dimensions swidth = gdispGetWidth(); |