aboutsummaryrefslogtreecommitdiffstats
path: root/demos/modules/gdisp/streaming
diff options
context:
space:
mode:
Diffstat (limited to 'demos/modules/gdisp/streaming')
-rw-r--r--demos/modules/gdisp/streaming/gfxconf.h24
-rw-r--r--demos/modules/gdisp/streaming/main.c10
2 files changed, 17 insertions, 17 deletions
diff --git a/demos/modules/gdisp/streaming/gfxconf.h b/demos/modules/gdisp/streaming/gfxconf.h
index 82843184..6d83defe 100644
--- a/demos/modules/gdisp/streaming/gfxconf.h
+++ b/demos/modules/gdisp/streaming/gfxconf.h
@@ -10,22 +10,22 @@
#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 sub-system. */
-#define GDISP_NEED_VALIDATION TRUE
-#define GDISP_NEED_STREAMING TRUE
+#define GDISP_NEED_VALIDATION GFXON
+#define GDISP_NEED_STREAMING GFXON
-#define GFX_USE_GMISC TRUE
-#define GMISC_NEED_INVSQRT TRUE
-//#define GMISC_INVSQRT_MIXED_ENDIAN TRUE
-//#define GMISC_INVSQRT_REAL_SLOW TRUE
+#define GFX_USE_GMISC GFXON
+#define GMISC_NEED_INVSQRT GFXON
+//#define GMISC_INVSQRT_MIXED_ENDIAN GFXON
+//#define GMISC_INVSQRT_REAL_SLOW GFXON
#endif /* _GFXCONF_H */
diff --git a/demos/modules/gdisp/streaming/main.c b/demos/modules/gdisp/streaming/main.c
index 33b69c91..a360ecc2 100644
--- a/demos/modules/gdisp/streaming/main.c
+++ b/demos/modules/gdisp/streaming/main.c
@@ -42,15 +42,15 @@
* your processor.
*
* You can modify the implementation of invsqrt() by firstly defining
- * #define GMISC_INVSQRT_MIXED_ENDIAN TRUE
+ * #define GMISC_INVSQRT_MIXED_ENDIAN GFXON
* in your gfxconf.h file.
*
* If it still doesn't work then instead define
- * #define GMISC_INVSQRT_REAL_SLOW TRUE
+ * #define GMISC_INVSQRT_REAL_SLOW GFXON
* in your gfxconf.h file. This should always work although it will probably be slow.
*/
-#define BALLCOLOR1 Red
-#define BALLCOLOR2 Yellow
+#define BALLCOLOR1 GFX_RED
+#define BALLCOLOR2 GFX_YELLOW
#define WALLCOLOR HTML2COLOR(0x303030)
#define BACKCOLOR HTML2COLOR(0xC0C0C0)
#define FLOORCOLOR HTML2COLOR(0x606060)
@@ -110,7 +110,7 @@ int main(void) {
// The ball shadow is darker
if (g*(g+.4)+h*(h+.1) < 1)
- colour = gdispBlendColor(colour, Black, SHADOWALPHA);
+ colour = gdispBlendColor(colour, GFX_BLACK, SHADOWALPHA);
}
gdispStreamColor(colour); /* pixel to the LCD */
}