diff options
Diffstat (limited to 'demos')
| -rw-r--r-- | demos/modules/gdisp/gdisp_basics/gfxconf.h | 6 | ||||
| -rw-r--r-- | demos/modules/gdisp/gdisp_circles/gfxconf.h | 10 | ||||
| -rw-r--r-- | demos/modules/gdisp/gdisp_circles/main.c | 12 | 
3 files changed, 16 insertions, 12 deletions
diff --git a/demos/modules/gdisp/gdisp_basics/gfxconf.h b/demos/modules/gdisp/gdisp_basics/gfxconf.h index c2098c85..8adc7c8d 100644 --- a/demos/modules/gdisp/gdisp_basics/gfxconf.h +++ b/demos/modules/gdisp/gdisp_basics/gfxconf.h @@ -31,9 +31,9 @@  #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
 +//#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
 diff --git a/demos/modules/gdisp/gdisp_circles/gfxconf.h b/demos/modules/gdisp/gdisp_circles/gfxconf.h index c5faba5d..8858cf02 100644 --- a/demos/modules/gdisp/gdisp_circles/gfxconf.h +++ b/demos/modules/gdisp/gdisp_circles/gfxconf.h @@ -31,9 +31,9 @@  #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
 +//#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
 @@ -52,4 +52,8 @@  #define GDISP_NEED_ASYNC		FALSE
  #define GDISP_NEED_MSGAPI		FALSE
 +#define GFX_USE_GMISC			TRUE
 +#define GMISC_NEED_FIXEDTRIG	TRUE
 +#define GMISC_NEED_FASTTRIG		TRUE
 +
  #endif /* _GFXCONF_H */
 diff --git a/demos/modules/gdisp/gdisp_circles/main.c b/demos/modules/gdisp/gdisp_circles/main.c index 8feaa2e3..b8b90478 100644 --- a/demos/modules/gdisp/gdisp_circles/main.c +++ b/demos/modules/gdisp/gdisp_circles/main.c @@ -40,12 +40,12 @@ int main(void) {      height = gdispGetHeight();
      // Code Here
 -	gdispDrawCircle(width/2, height/2, 20, Yellow);
 -    gdispFillCircle (width/4, height/4, 50, Blue);
 -    gdispFillEllipse (width-100, height-100, 30, 60, Red);
 -    gdispDrawEllipse (width-100, height-100, 50, 20, Yellow);
 -    gdispDrawArc(width-width/8, height/8, 30, 10, 70, Gray);
 -    gdispFillArc(width/8, height/8, 30, 10, 70, Gray);
 +	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);
      while(TRUE) {
      	gfxSleepMilliseconds(500);
  | 
