diff options
Diffstat (limited to 'demos/modules/gdisp/circles')
| -rw-r--r-- | demos/modules/gdisp/circles/gfxconf.h | 26 | ||||
| -rw-r--r-- | demos/modules/gdisp/circles/main.c | 12 |
2 files changed, 19 insertions, 19 deletions
diff --git a/demos/modules/gdisp/circles/gfxconf.h b/demos/modules/gdisp/circles/gfxconf.h index 4bb605ac..a0534700 100644 --- a/demos/modules/gdisp/circles/gfxconf.h +++ b/demos/modules/gdisp/circles/gfxconf.h @@ -31,25 +31,25 @@ #define _GFXCONF_H
/* 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_CHIBIOS GFXOFF
+//#define GFX_USE_OS_WIN32 GFXOFF
+//#define GFX_USE_OS_LINUX GFXOFF
+//#define GFX_USE_OS_OSX GFXOFF
/* GFX sub-systems to turn on */
-#define GFX_USE_GDISP TRUE
-#define GFX_USE_GMISC TRUE
+#define GFX_USE_GDISP GFXON
+#define GFX_USE_GMISC GFXON
/* Features for the GDISP subsystem. */
-#define GDISP_NEED_VALIDATION TRUE
-#define GDISP_NEED_CLIP TRUE
-#define GDISP_NEED_CIRCLE TRUE
-#define GDISP_NEED_ELLIPSE TRUE
-#define GDISP_NEED_ARC TRUE
+#define GDISP_NEED_VALIDATION GFXON
+#define GDISP_NEED_CLIP GFXON
+#define GDISP_NEED_CIRCLE GFXON
+#define GDISP_NEED_ELLIPSE GFXON
+#define GDISP_NEED_ARC GFXON
/* Features for the GMISC subsystem */
-#define GMISC_NEED_FIXEDTRIG TRUE
-#define GMISC_NEED_FASTTRIG TRUE
+#define GMISC_NEED_FIXEDTRIG GFXON
+#define GMISC_NEED_FASTTRIG GFXON
#endif /* _GFXCONF_H */
diff --git a/demos/modules/gdisp/circles/main.c b/demos/modules/gdisp/circles/main.c index 9253439d..4efb896a 100644 --- a/demos/modules/gdisp/circles/main.c +++ b/demos/modules/gdisp/circles/main.c @@ -40,12 +40,12 @@ int main(void) { height = gdispGetHeight();
// Code Here
- gdispFillArc(width/2, height/2, width/4, -10, -45, White);
- gdispDrawCircle(width/2+width/8, height/2-height/8, 13, Green);
- gdispFillCircle (width/2+width/8, height/2-height/8, 10, Red);
- gdispDrawArc(width/2+width/8, height/2-height/8, 20, 25, 115, Gray);
- gdispFillEllipse (width-width/6, height-height/6, width/8, height/16, Blue);
- gdispDrawEllipse (width-width/6, height-height/6, width/16, height/8, Yellow);
+ gdispFillArc(width/2, height/2, width/4, -10, -45, GFX_WHITE);
+ gdispDrawCircle(width/2+width/8, height/2-height/8, 13, GFX_GREEN);
+ gdispFillCircle (width/2+width/8, height/2-height/8, 10, GFX_RED);
+ gdispDrawArc(width/2+width/8, height/2-height/8, 20, 25, 115, GFX_GRAY);
+ gdispFillEllipse (width-width/6, height-height/6, width/8, height/16, GFX_BLUE);
+ gdispDrawEllipse (width-width/6, height-height/6, width/16, height/8, GFX_YELLOW);
while(TRUE) {
gfxSleepMilliseconds(500);
|