aboutsummaryrefslogtreecommitdiffstats
path: root/demos/tools
diff options
context:
space:
mode:
Diffstat (limited to 'demos/tools')
-rw-r--r--demos/tools/touch_calibration_grabber/gfxconf.h34
-rw-r--r--demos/tools/touch_calibration_grabber/main.c2
-rw-r--r--demos/tools/touch_driver_test/gfxconf.h34
-rw-r--r--demos/tools/touch_driver_test/main.c28
-rw-r--r--demos/tools/touch_raw_readings/gfxconf.h34
-rw-r--r--demos/tools/touch_raw_readings/main.c2
-rw-r--r--demos/tools/uGFXnetDisplay/gfxconf.h32
-rw-r--r--demos/tools/uGFXnetDisplay/main.c14
8 files changed, 90 insertions, 90 deletions
diff --git a/demos/tools/touch_calibration_grabber/gfxconf.h b/demos/tools/touch_calibration_grabber/gfxconf.h
index c073a5d3..b21ffad4 100644
--- a/demos/tools/touch_calibration_grabber/gfxconf.h
+++ b/demos/tools/touch_calibration_grabber/gfxconf.h
@@ -31,32 +31,32 @@
#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_GWIN TRUE
-#define GFX_USE_GEVENT TRUE
-#define GFX_USE_GTIMER TRUE
-#define GFX_USE_GINPUT TRUE
+#define GFX_USE_GDISP GFXON
+#define GFX_USE_GWIN GFXON
+#define GFX_USE_GEVENT GFXON
+#define GFX_USE_GTIMER GFXON
+#define GFX_USE_GINPUT GFXON
/* Features for the GDISP sub-system. */
-#define GDISP_NEED_VALIDATION TRUE
-#define GDISP_NEED_CLIP TRUE
-#define GDISP_NEED_TEXT TRUE
-#define GDISP_NEED_MULTITHREAD TRUE
+#define GDISP_NEED_VALIDATION GFXON
+#define GDISP_NEED_CLIP GFXON
+#define GDISP_NEED_TEXT GFXON
+#define GDISP_NEED_MULTITHREAD GFXON
/* Builtin Fonts */
-#define GDISP_INCLUDE_FONT_UI2 TRUE
+#define GDISP_INCLUDE_FONT_UI2 GFXON
/* Features for the GWIN sub-system. */
-#define GWIN_NEED_CONSOLE TRUE
-#define GWIN_CONSOLE_USE_FLOAT TRUE
+#define GWIN_NEED_CONSOLE GFXON
+#define GWIN_CONSOLE_USE_FLOAT GFXON
/* Features for the GINPUT sub-system. */
-#define GINPUT_NEED_MOUSE TRUE
+#define GINPUT_NEED_MOUSE GFXON
#endif /* _GFXCONF_H */
diff --git a/demos/tools/touch_calibration_grabber/main.c b/demos/tools/touch_calibration_grabber/main.c
index 3ce791ee..9f16bb90 100644
--- a/demos/tools/touch_calibration_grabber/main.c
+++ b/demos/tools/touch_calibration_grabber/main.c
@@ -56,7 +56,7 @@ int main(void) {
font = gdispOpenFont("UI2");
gwinSetDefaultFont(font);
bHeight = gdispGetFontMetric(font, fontHeight)+4;
- gdispFillStringBox(0, 0, swidth, bHeight, "Touchscreen Calibration Grabber", font, Red, White, justifyCenter);
+ gdispFillStringBox(0, 0, swidth, bHeight, "Touchscreen Calibration Grabber", font, GFX_RED, GFX_WHITE, justifyCenter);
// Create our main display writing window
{
diff --git a/demos/tools/touch_driver_test/gfxconf.h b/demos/tools/touch_driver_test/gfxconf.h
index 3d93a138..dd278222 100644
--- a/demos/tools/touch_driver_test/gfxconf.h
+++ b/demos/tools/touch_driver_test/gfxconf.h
@@ -31,32 +31,32 @@
#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_GWIN TRUE
-#define GFX_USE_GEVENT TRUE
-#define GFX_USE_GTIMER TRUE
-#define GFX_USE_GINPUT TRUE
+#define GFX_USE_GDISP GFXON
+#define GFX_USE_GWIN GFXON
+#define GFX_USE_GEVENT GFXON
+#define GFX_USE_GTIMER GFXON
+#define GFX_USE_GINPUT GFXON
/* Features for the GDISP sub-system. */
-#define GDISP_NEED_VALIDATION TRUE
-#define GDISP_NEED_CLIP TRUE
-#define GDISP_NEED_TEXT TRUE
-#define GDISP_NEED_MULTITHREAD TRUE
+#define GDISP_NEED_VALIDATION GFXON
+#define GDISP_NEED_CLIP GFXON
+#define GDISP_NEED_TEXT GFXON
+#define GDISP_NEED_MULTITHREAD GFXON
/* Builtin Fonts */
-#define GDISP_INCLUDE_FONT_UI2 TRUE
+#define GDISP_INCLUDE_FONT_UI2 GFXON
/* Features for the GWIN sub-system. */
-#define GWIN_NEED_CONSOLE TRUE
+#define GWIN_NEED_CONSOLE GFXON
/* Features for the GINPUT sub-system. */
-#define GINPUT_NEED_MOUSE TRUE
-#define GINPUT_TOUCH_STARTRAW TRUE
+#define GINPUT_NEED_MOUSE GFXON
+#define GINPUT_TOUCH_STARTRAW GFXON
#endif /* _GFXCONF_H */
diff --git a/demos/tools/touch_driver_test/main.c b/demos/tools/touch_driver_test/main.c
index 39924032..5182056a 100644
--- a/demos/tools/touch_driver_test/main.c
+++ b/demos/tools/touch_driver_test/main.c
@@ -46,19 +46,19 @@ static void DrawHeader(const char *title, bool_t btnNext, bool_t btnPrev, bool_t
#if GDISP_NEED_CLIP
gdispSetClip(0, 0, swidth, sheight);
#endif
- gdispFillStringBox(0, 0, swidth, bHeight, "Touch Calibration", font, Red, White, justifyLeft);
+ gdispFillStringBox(0, 0, swidth, bHeight, "Touch Calibration", font, GFX_RED, GFX_WHITE, justifyLeft);
if (btnNext)
- gdispFillStringBox(swidth-1*bWidth, 0, bWidth , bHeight, "Next", font, Black, Gray, justifyCenter);
+ gdispFillStringBox(swidth-1*bWidth, 0, bWidth , bHeight, "Next", font, GFX_BLACK, GFX_GRAY, justifyCenter);
if (btnPrev)
- gdispFillStringBox(swidth-2*bWidth, 0, bWidth-1, bHeight, "Prev", font, Black, Gray, justifyCenter);
+ gdispFillStringBox(swidth-2*bWidth, 0, bWidth-1, bHeight, "Prev", font, GFX_BLACK, GFX_GRAY, justifyCenter);
if (btnPlusMinus) {
- gdispFillStringBox(swidth-2*bWidth-1*bWidth2, 0, bWidth2-1, bHeight, "+", font, Black, Gray, justifyCenter);
- gdispFillStringBox(swidth-2*bWidth-2*bWidth2, 0, bWidth2-1, bHeight, "-", font, Black, Gray, justifyCenter);
+ gdispFillStringBox(swidth-2*bWidth-1*bWidth2, 0, bWidth2-1, bHeight, "+", font, GFX_BLACK, GFX_GRAY, justifyCenter);
+ gdispFillStringBox(swidth-2*bWidth-2*bWidth2, 0, bWidth2-1, bHeight, "-", font, GFX_BLACK, GFX_GRAY, justifyCenter);
}
gwinClear(ghc);
- gwinSetColor(ghc, Yellow);
+ gwinSetColor(ghc, GFX_YELLOW);
gwinPrintf(ghc, "\n%s\n\n", title);
- gwinSetColor(ghc, White);
+ gwinSetColor(ghc, GFX_WHITE);
}
#define BTN_NONE 0
@@ -385,10 +385,10 @@ StepMovementJitter:
StepClickJitter:
gwinClear(ghc);
- gwinSetColor(ghc, Yellow);
+ gwinSetColor(ghc, GFX_YELLOW);
gwinPrintf(ghc, "\n6. Click Jitter\n\n");
- gwinSetColor(ghc, White);
+ gwinSetColor(ghc, GFX_WHITE);
if (isTouch)
gwinPrintf(ghc, "Press and release the touch surface to \"click\".\nTry both short and long presses.\n");
else
@@ -416,11 +416,11 @@ StepClickJitter:
continue;
default:
if ((pem->buttons & GMETA_MOUSE_CLICK)) {
- gwinSetColor(ghc, Yellow);
+ gwinSetColor(ghc, GFX_YELLOW);
gwinPrintf(ghc, "-");
}
if ((pem->buttons & GMETA_MOUSE_CXTCLICK)) {
- gwinSetColor(ghc, Red);
+ gwinSetColor(ghc, GFX_RED);
gwinPrintf(ghc, "x");
}
continue;
@@ -434,10 +434,10 @@ StepClickJitter:
StepDrawing:
gwinClear(ghc);
- gwinSetColor(ghc, Yellow);
+ gwinSetColor(ghc, GFX_YELLOW);
gwinPrintf(ghc, "\n7. Drawing\n\n");
- gwinSetColor(ghc, White);
+ gwinSetColor(ghc, GFX_WHITE);
gwinPrintf(ghc, "Press firmly on the surface (or press and hold the mouse button) and move around as if to draw.\n\n");
gwinPrintf(ghc, "A green line will follow your %s.\n\n", deviceText);
gwinPrintf(ghc, "Pressing Next will start the tests again but with the option of changing pen/finger mode.\n\n");
@@ -452,7 +452,7 @@ StepDrawing:
goto StepClickJitter;
}
}
- gdispDrawPixel(pem->x, pem->y, Green);
+ gdispDrawPixel(pem->x, pem->y, GFX_GREEN);
}
// Can't let this really exit
diff --git a/demos/tools/touch_raw_readings/gfxconf.h b/demos/tools/touch_raw_readings/gfxconf.h
index 3d93a138..dd278222 100644
--- a/demos/tools/touch_raw_readings/gfxconf.h
+++ b/demos/tools/touch_raw_readings/gfxconf.h
@@ -31,32 +31,32 @@
#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_GWIN TRUE
-#define GFX_USE_GEVENT TRUE
-#define GFX_USE_GTIMER TRUE
-#define GFX_USE_GINPUT TRUE
+#define GFX_USE_GDISP GFXON
+#define GFX_USE_GWIN GFXON
+#define GFX_USE_GEVENT GFXON
+#define GFX_USE_GTIMER GFXON
+#define GFX_USE_GINPUT GFXON
/* Features for the GDISP sub-system. */
-#define GDISP_NEED_VALIDATION TRUE
-#define GDISP_NEED_CLIP TRUE
-#define GDISP_NEED_TEXT TRUE
-#define GDISP_NEED_MULTITHREAD TRUE
+#define GDISP_NEED_VALIDATION GFXON
+#define GDISP_NEED_CLIP GFXON
+#define GDISP_NEED_TEXT GFXON
+#define GDISP_NEED_MULTITHREAD GFXON
/* Builtin Fonts */
-#define GDISP_INCLUDE_FONT_UI2 TRUE
+#define GDISP_INCLUDE_FONT_UI2 GFXON
/* Features for the GWIN sub-system. */
-#define GWIN_NEED_CONSOLE TRUE
+#define GWIN_NEED_CONSOLE GFXON
/* Features for the GINPUT sub-system. */
-#define GINPUT_NEED_MOUSE TRUE
-#define GINPUT_TOUCH_STARTRAW TRUE
+#define GINPUT_NEED_MOUSE GFXON
+#define GINPUT_TOUCH_STARTRAW GFXON
#endif /* _GFXCONF_H */
diff --git a/demos/tools/touch_raw_readings/main.c b/demos/tools/touch_raw_readings/main.c
index fb1b0772..27c799f7 100644
--- a/demos/tools/touch_raw_readings/main.c
+++ b/demos/tools/touch_raw_readings/main.c
@@ -61,7 +61,7 @@ int main(void) {
font = gdispOpenFont("UI2");
gwinSetDefaultFont(font);
bHeight = gdispGetFontMetric(font, fontHeight)+4;
- gdispFillStringBox(0, 0, swidth, bHeight, "Raw Touch Readings", font, Red, White, justifyCenter);
+ gdispFillStringBox(0, 0, swidth, bHeight, "Raw Touch Readings", font, GFX_RED, GFX_WHITE, justifyCenter);
// Create our main display writing window
{
diff --git a/demos/tools/uGFXnetDisplay/gfxconf.h b/demos/tools/uGFXnetDisplay/gfxconf.h
index 4df44bc4..4cbe4981 100644
--- a/demos/tools/uGFXnetDisplay/gfxconf.h
+++ b/demos/tools/uGFXnetDisplay/gfxconf.h
@@ -9,30 +9,30 @@
#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_GEVENT TRUE
-#define GFX_USE_GTIMER TRUE
-#define GFX_USE_GINPUT TRUE
+#define GFX_USE_GDISP GFXON
+#define GFX_USE_GEVENT GFXON
+#define GFX_USE_GTIMER GFXON
+#define GFX_USE_GINPUT GFXON
/* Features for the GDISP sub-system. */
-#define GDISP_NEED_VALIDATION TRUE
-#define GDISP_NEED_TEXT TRUE
-#define GDISP_NEED_CONTROL TRUE
-#define GDISP_NEED_SCROLL TRUE
-#define GDISP_NEED_PIXELREAD TRUE
-#define GDISP_NEED_STREAMING TRUE
+#define GDISP_NEED_VALIDATION GFXON
+#define GDISP_NEED_TEXT GFXON
+#define GDISP_NEED_CONTROL GFXON
+#define GDISP_NEED_SCROLL GFXON
+#define GDISP_NEED_PIXELREAD GFXON
+#define GDISP_NEED_STREAMING GFXON
/* Builtin Fonts */
-#define GDISP_INCLUDE_FONT_UI2 TRUE
+#define GDISP_INCLUDE_FONT_UI2 GFXON
/* Features for the GINPUT sub-system. */
-#define GINPUT_NEED_MOUSE TRUE
+#define GINPUT_NEED_MOUSE GFXON
/* We need to use this specific pixel format to match the network protocol */
#define GDISP_PIXELFORMAT GDISP_PIXELFORMAT_RGB565
diff --git a/demos/tools/uGFXnetDisplay/main.c b/demos/tools/uGFXnetDisplay/main.c
index 26ae4b89..6f4ad4b6 100644
--- a/demos/tools/uGFXnetDisplay/main.c
+++ b/demos/tools/uGFXnetDisplay/main.c
@@ -20,14 +20,14 @@
// Do we wish to use old style socket calls. Some socket libraries only support the old version.
// It is better to use the new version where possible however as it also supports IPv6.
#ifndef OLD_STYLE_SOCKETS
- #define OLD_STYLE_SOCKETS FALSE
+ #define OLD_STYLE_SOCKETS GFXOFF
#endif
// Which operating systems support a command line
#if defined(WIN32) || GFX_USE_OS_WIN32 || GFX_USE_OS_OSX || GFX_USE_OS_LINUX
- #define EMBEDED_OS FALSE
+ #define EMBEDED_OS GFXOFF
#else
- #define EMBEDED_OS TRUE
+ #define EMBEDED_OS GFXON
#endif
#if GNETCODE_VERSION != GNETCODE_VERSION_1_0
@@ -103,7 +103,7 @@
COMPILER_WARNING("GDISP: uGFXnet - LWIP sockets are not thread-safe. GDISP_GFXNET_UNSAFE_SOCKETS has been turned on for you.")
#endif
#undef GDISP_GFXNET_UNSAFE_SOCKETS
- #define GDISP_GFXNET_UNSAFE_SOCKETS TRUE
+ #define GDISP_GFXNET_UNSAFE_SOCKETS GFXON
#endif
#endif
@@ -336,12 +336,12 @@ int main(proto_args) {
font = gdispOpenFont("UI2");
// Open the connection
- gdispDrawStringBox(0, 0, gdispGetWidth(), gdispGetHeight(), "Connecting to host...", font, White, justifyCenter);
+ gdispDrawStringBox(0, 0, gdispGetWidth(), gdispGetHeight(), "Connecting to host...", font, GFX_WHITE, justifyCenter);
StartSockets();
netfd = doConnect(cmd_args);
if (netfd == (SOCKET_TYPE)-1)
gfxHalt("Could not connect to the specified server");
- gdispClear(Black);
+ gdispClear(GFX_BLACK);
// Get the initial packet from the host
if (!getpkt(cmd, 2)) goto alldone;
@@ -395,7 +395,7 @@ int main(proto_args) {
#if GDISP_NEED_SCROLL
case GNETCODE_SCROLL:
if (!getpkt(cmd, 5)) goto alldone; // cmd[] = x, y, cx, cy, lines
- gdispVerticalScroll(cmd[0], cmd[1], cmd[2], cmd[3], cmd[4], Black);
+ gdispVerticalScroll(cmd[0], cmd[1], cmd[2], cmd[3], cmd[4], GFX_BLACK);
break;
#endif
case GNETCODE_CONTROL:
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-18 13:26:10 +0000