aboutsummaryrefslogtreecommitdiffstats
path: root/demos/applications/combo
diff options
context:
space:
mode:
Diffstat (limited to 'demos/applications/combo')
-rw-r--r--demos/applications/combo/bounce.c10
-rw-r--r--demos/applications/combo/gfxconf.h114
-rw-r--r--demos/applications/combo/main.c6
3 files changed, 65 insertions, 65 deletions
diff --git a/demos/applications/combo/bounce.c b/demos/applications/combo/bounce.c
index f0b78266..c669eff2 100644
--- a/demos/applications/combo/bounce.c
+++ b/demos/applications/combo/bounce.c
@@ -48,15 +48,15 @@ static gfxThreadHandle thread;
* 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)
@@ -117,7 +117,7 @@ static DECLARE_THREAD_FUNCTION(task, param) {
// 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 */
}
diff --git a/demos/applications/combo/gfxconf.h b/demos/applications/combo/gfxconf.h
index aec48783..cf218206 100644
--- a/demos/applications/combo/gfxconf.h
+++ b/demos/applications/combo/gfxconf.h
@@ -19,109 +19,109 @@
#define _GFXCONF_H
/* The operating system to use. One of these must be defined - preferably in your Makefile */
-//#define GFX_USE_OS_CHIBIOS TRUE
-//#define GFX_USE_OS_WIN32 TRUE
-//#define GFX_USE_OS_LINUX TRUE
-//#define GFX_USE_OS_OSX TRUE
+//#define GFX_USE_OS_CHIBIOS GFXON
+//#define GFX_USE_OS_WIN32 GFXON
+//#define GFX_USE_OS_LINUX GFXON
+//#define GFX_USE_OS_OSX GFXON
///////////////////////////////////////////////////////////////////////////
// GDISP //
///////////////////////////////////////////////////////////////////////////
-#define GFX_USE_GDISP TRUE
+#define GFX_USE_GDISP GFXON
-#define GDISP_NEED_VALIDATION TRUE
-#define GDISP_NEED_CLIP TRUE
-#define GDISP_NEED_CIRCLE TRUE
-#define GDISP_NEED_CONVEX_POLYGON TRUE
-//#define GDISP_NEED_SCROLL TRUE
-#define GDISP_NEED_CONTROL TRUE
-#define GDISP_NEED_TEXT TRUE
- #define GDISP_INCLUDE_FONT_UI2 TRUE
-#define GDISP_NEED_STREAMING TRUE
+#define GDISP_NEED_VALIDATION GFXON
+#define GDISP_NEED_CLIP GFXON
+#define GDISP_NEED_CIRCLE GFXON
+#define GDISP_NEED_CONVEX_POLYGON GFXON
+//#define GDISP_NEED_SCROLL GFXON
+#define GDISP_NEED_CONTROL GFXON
+#define GDISP_NEED_TEXT GFXON
+ #define GDISP_INCLUDE_FONT_UI2 GFXON
+#define GDISP_NEED_STREAMING GFXON
-#define GDISP_NEED_IMAGE TRUE
- #define GDISP_NEED_IMAGE_BMP TRUE
- #define GDISP_NEED_IMAGE_GIF TRUE
+#define GDISP_NEED_IMAGE GFXON
+ #define GDISP_NEED_IMAGE_BMP GFXON
+ #define GDISP_NEED_IMAGE_GIF GFXON
#define GDISP_DEFAULT_ORIENTATION GDISP_ROTATE_LANDSCAPE
-#define GDISP_NEED_MULTITHREAD TRUE
+#define GDISP_NEED_MULTITHREAD GFXON
///////////////////////////////////////////////////////////////////////////
// GWIN //
///////////////////////////////////////////////////////////////////////////
-#define GFX_USE_GWIN TRUE
+#define GFX_USE_GWIN GFXON
-#define GWIN_NEED_WINDOWMANAGER TRUE
- #define GWIN_NEED_FLASHING TRUE
+#define GWIN_NEED_WINDOWMANAGER GFXON
+ #define GWIN_NEED_FLASHING GFXON
-#define GWIN_NEED_CONSOLE TRUE
- #define GWIN_CONSOLE_USE_HISTORY TRUE
- #define GWIN_CONSOLE_HISTORY_AVERAGING TRUE
- #define GWIN_CONSOLE_HISTORY_ATCREATE TRUE
-#define GWIN_NEED_GRAPH TRUE
+#define GWIN_NEED_CONSOLE GFXON
+ #define GWIN_CONSOLE_USE_HISTORY GFXON
+ #define GWIN_CONSOLE_HISTORY_AVERAGING GFXON
+ #define GWIN_CONSOLE_HISTORY_ATCREATE GFXON
+#define GWIN_NEED_GRAPH GFXON
-#define GWIN_NEED_WIDGET TRUE
- #define GWIN_NEED_LABEL TRUE
- #define GWIN_LABEL_ATTRIBUTE TRUE
- #define GWIN_NEED_BUTTON TRUE
-// #define GWIN_BUTTON_LAZY_RELEASE TRUE
- #define GWIN_NEED_SLIDER TRUE
- #define GWIN_NEED_CHECKBOX TRUE
- #define GWIN_NEED_IMAGE TRUE
- #define GWIN_NEED_RADIO TRUE
- #define GWIN_NEED_LIST TRUE
- #define GWIN_NEED_LIST_IMAGES TRUE
- #define GWIN_NEED_PROGRESSBAR TRUE
- #define GWIN_PROGRESSBAR_AUTO TRUE
+#define GWIN_NEED_WIDGET GFXON
+ #define GWIN_NEED_LABEL GFXON
+ #define GWIN_LABEL_ATTRIBUTE GFXON
+ #define GWIN_NEED_BUTTON GFXON
+// #define GWIN_BUTTON_LAZY_RELEASE GFXON
+ #define GWIN_NEED_SLIDER GFXON
+ #define GWIN_NEED_CHECKBOX GFXON
+ #define GWIN_NEED_IMAGE GFXON
+ #define GWIN_NEED_RADIO GFXON
+ #define GWIN_NEED_LIST GFXON
+ #define GWIN_NEED_LIST_IMAGES GFXON
+ #define GWIN_NEED_PROGRESSBAR GFXON
+ #define GWIN_PROGRESSBAR_AUTO GFXON
-#define GWIN_NEED_CONTAINERS TRUE
- #define GWIN_NEED_CONTAINER TRUE
+#define GWIN_NEED_CONTAINERS GFXON
+ #define GWIN_NEED_CONTAINER GFXON
-#define GWIN_NEED_TABSET TRUE
+#define GWIN_NEED_TABSET GFXON
///////////////////////////////////////////////////////////////////////////
// GEVENT //
///////////////////////////////////////////////////////////////////////////
-#define GFX_USE_GEVENT TRUE
+#define GFX_USE_GEVENT GFXON
///////////////////////////////////////////////////////////////////////////
// GTIMER //
///////////////////////////////////////////////////////////////////////////
-#define GFX_USE_GTIMER TRUE
+#define GFX_USE_GTIMER GFXON
///////////////////////////////////////////////////////////////////////////
// GQUEUE //
///////////////////////////////////////////////////////////////////////////
-#define GFX_USE_GQUEUE TRUE
+#define GFX_USE_GQUEUE GFXON
-#define GQUEUE_NEED_ASYNC TRUE
+#define GQUEUE_NEED_ASYNC GFXON
///////////////////////////////////////////////////////////////////////////
// GINPUT //
///////////////////////////////////////////////////////////////////////////
-#define GFX_USE_GINPUT TRUE
+#define GFX_USE_GINPUT GFXON
-#define GINPUT_NEED_MOUSE TRUE
-//#define GINPUT_NEED_TOGGLE TRUE
-//#define GINPUT_NEED_DIAL TRUE
+#define GINPUT_NEED_MOUSE GFXON
+//#define GINPUT_NEED_TOGGLE GFXON
+//#define GINPUT_NEED_DIAL GFXON
///////////////////////////////////////////////////////////////////////////
// GFILE //
///////////////////////////////////////////////////////////////////////////
-#define GFX_USE_GFILE TRUE
+#define GFX_USE_GFILE GFXON
-#define GFILE_NEED_PRINTG TRUE
-#define GFILE_NEED_STRINGS TRUE
+#define GFILE_NEED_PRINTG GFXON
+#define GFILE_NEED_STRINGS GFXON
-#define GFILE_NEED_ROMFS TRUE
-//#define GFILE_NEED_NATIVEFS TRUE
+#define GFILE_NEED_ROMFS GFXON
+//#define GFILE_NEED_NATIVEFS GFXON
///////////////////////////////////////////////////////////////////////////
// GMISC //
///////////////////////////////////////////////////////////////////////////
-#define GFX_USE_GMISC TRUE
-#define GMISC_NEED_INVSQRT TRUE
+#define GFX_USE_GMISC GFXON
+#define GMISC_NEED_INVSQRT GFXON
#endif /* _GFXCONF_H */
diff --git a/demos/applications/combo/main.c b/demos/applications/combo/main.c
index 449572d9..4585a74e 100644
--- a/demos/applications/combo/main.c
+++ b/demos/applications/combo/main.c
@@ -41,7 +41,7 @@
/* Our custom yellow style */
static const GWidgetStyle YellowWidgetStyle = {
- Yellow, // window background
+ GFX_YELLOW, // window background
HTML2COLOR(0x800000), // focus - for text edit.
// enabled color set
@@ -168,7 +168,7 @@ static void createWidgets(void) {
wi.g.x = pagewidth;
wi.g.width = pagewidth;
ghConsole = gwinConsoleCreate(0, &wi.g);
- gwinSetColor(ghConsole, Black);
+ gwinSetColor(ghConsole, GFX_BLACK);
gwinSetBgColor(ghConsole, HTML2COLOR(0xF0F0F0));
// Buttons
@@ -405,7 +405,7 @@ int main(void) {
font = gdispOpenFont("*"); // Get the first defined font.
gwinSetDefaultFont(font);
gwinSetDefaultStyle(&WhiteWidgetStyle, FALSE);
- gdispClear(White);
+ gdispClear(GFX_WHITE);
// Create the gwin windows/widgets
createWidgets();
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-05 05:54:55 +0000