diff options
| author | Joel Bodenmann <joel@unormal.org> | 2013-12-16 20:11:51 +0100 |
|---|---|---|
| committer | Joel Bodenmann <joel@unormal.org> | 2013-12-16 20:11:51 +0100 |
| commit | d16dda2180b070833ec4707429510403b1c502a8 (patch) | |
| tree | 510bbb218bda83bb45ef5f0cbc8e0fa14ebcce05 | |
| parent | 0bccf2fa15d64ca3e408e74a6b5aaecb6f100364 (diff) | |
| download | uGFX-d16dda2180b070833ec4707429510403b1c502a8.tar.gz uGFX-d16dda2180b070833ec4707429510403b1c502a8.tar.bz2 uGFX-d16dda2180b070833ec4707429510403b1c502a8.zip | |
GDISP startup logo now optional
| -rw-r--r-- | gfxconf.example.h | 1 | ||||
| -rw-r--r-- | include/gdisp/options.h | 8 | ||||
| -rw-r--r-- | src/gdisp/gdisp.c | 6 |
3 files changed, 14 insertions, 1 deletions
diff --git a/gfxconf.example.h b/gfxconf.example.h index 9963188e..f35adda1 100644 --- a/gfxconf.example.h +++ b/gfxconf.example.h @@ -49,6 +49,7 @@ #define GDISP_NEED_IMAGE FALSE #define GDISP_NEED_MULTITHREAD FALSE #define GDISP_NEED_STREAMING FALSE +#define GDISP_NEED_STARTUP_LOGO TRUE /* GDISP - text features */ #define GDISP_NEED_ANTIALIAS FALSE diff --git a/include/gdisp/options.h b/include/gdisp/options.h index 650e81c5..35cccea3 100644 --- a/include/gdisp/options.h +++ b/include/gdisp/options.h @@ -21,6 +21,14 @@ * @{ */ /** + * @brief Should the startup logo be displayed + * + * @details Defaults to TRUE + */ + #ifndef GDISP_NEED_STARTUP_LOGO + #define GDISP_NEED_STARTUP_LOGO TRUE + #endif + /** * @brief Should drawing operations be automatically flushed. * @details Defaults to FALSE * @note If set to FALSE and the controller requires flushing diff --git a/src/gdisp/gdisp.c b/src/gdisp/gdisp.c index 8af496b3..c2819e38 100644 --- a/src/gdisp/gdisp.c +++ b/src/gdisp/gdisp.c @@ -28,7 +28,11 @@ #endif // Number of milliseconds for the startup logo - 0 means disabled. -#define GDISP_STARTUP_LOGO_TIMEOUT 1000 +#if GDISP_NEED_STARTUP_LOGO + #define GDISP_STARTUP_LOGO_TIMEOUT 1000 +#else + #define GDISP_STARTUP_LOGO_TIMEOUT 0 +#endif // The color to clear the display on startup #define GDISP_STARTUP_COLOR Black |