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/applications/notepad | |
| 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/applications/notepad')
| -rw-r--r-- | demos/applications/notepad/gfxconf.h | 5 | ||||
| -rw-r--r-- | demos/applications/notepad/main.c | 7 |
2 files changed, 6 insertions, 6 deletions
diff --git a/demos/applications/notepad/gfxconf.h b/demos/applications/notepad/gfxconf.h index 7ba6483b..b9aa53f9 100644 --- a/demos/applications/notepad/gfxconf.h +++ b/demos/applications/notepad/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 FALSE
diff --git a/demos/applications/notepad/main.c b/demos/applications/notepad/main.c index 1dcfd154..d9a6d954 100644 --- a/demos/applications/notepad/main.c +++ b/demos/applications/notepad/main.c @@ -25,8 +25,6 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "ch.h"
-#include "hal.h"
#include "gfx.h"
#define COLOR_SIZE 20
@@ -77,10 +75,7 @@ int main(void) { color_t color = Black;
uint16_t pen = 0;
- halInit();
- chSysInit();
-
- gdispInit();
+ gfxInit();
ginputGetMouse(0);
gdispSetOrientation(GDISP_ROTATE_90);
|