aboutsummaryrefslogtreecommitdiffstats
path: root/demos/modules/gdisp
diff options
context:
space:
mode:
Diffstat (limited to 'demos/modules/gdisp')
-rw-r--r--demos/modules/gdisp/arcsectors/main.c6
-rw-r--r--demos/modules/gdisp/basics/main.c8
-rw-r--r--demos/modules/gdisp/circles/main.c12
-rw-r--r--demos/modules/gdisp/fonts/main.c14
-rw-r--r--demos/modules/gdisp/fonts_cyrillic/main.c2
-rw-r--r--demos/modules/gdisp/images_animated/main.c8
-rw-r--r--demos/modules/gdisp/images_palettes/main.c28
-rw-r--r--demos/modules/gdisp/multiple_displays/main.c24
-rw-r--r--demos/modules/gdisp/pixmap/main.c4
-rw-r--r--demos/modules/gdisp/polygons/main.c10
-rw-r--r--demos/modules/gdisp/streaming/main.c6
-rw-r--r--demos/modules/gdisp/thickarcs/main.c6
12 files changed, 64 insertions, 64 deletions
diff --git a/demos/modules/gdisp/arcsectors/main.c b/demos/modules/gdisp/arcsectors/main.c
index 9908523f..7c73201c 100644
--- a/demos/modules/gdisp/arcsectors/main.c
+++ b/demos/modules/gdisp/arcsectors/main.c
@@ -49,9 +49,9 @@ int main(void) {
while(1) {
// Draw the arc sectors
- gdispClear(White);
- gdispDrawArcSectors(cx, cy, r1, sectors, Blue);
- gdispFillArcSectors(cx, cy, r2, sectors, Red);
+ gdispClear(GFX_WHITE);
+ gdispDrawArcSectors(cx, cy, r1, sectors, GFX_BLUE);
+ gdispFillArcSectors(cx, cy, r2, sectors, GFX_RED);
// Increase the sectors counter
sectors++;
diff --git a/demos/modules/gdisp/basics/main.c b/demos/modules/gdisp/basics/main.c
index 48d4a652..ccf98d22 100644
--- a/demos/modules/gdisp/basics/main.c
+++ b/demos/modules/gdisp/basics/main.c
@@ -41,12 +41,12 @@ int main(void) {
height = gdispGetHeight();
// Code Here
- gdispDrawBox(10, 10, width/2, height/2, Yellow);
- gdispFillArea(width/2, height/2, width/2-10, height/2-10, Blue);
- gdispDrawLine(5, 30, width-50, height-40, Red);
+ gdispDrawBox(10, 10, width/2, height/2, GFX_YELLOW);
+ gdispFillArea(width/2, height/2, width/2-10, height/2-10, GFX_BLUE);
+ gdispDrawLine(5, 30, width-50, height-40, GFX_RED);
for(i = 5, j = 0; i < width && j < height; i += 7, j += i/20)
- gdispDrawPixel(i, j, White);
+ gdispDrawPixel(i, j, GFX_WHITE);
while(TRUE) {
gfxSleepMilliseconds(500);
diff --git a/demos/modules/gdisp/circles/main.c b/demos/modules/gdisp/circles/main.c
index 9253439d..4efb896a 100644
--- a/demos/modules/gdisp/circles/main.c
+++ b/demos/modules/gdisp/circles/main.c
@@ -40,12 +40,12 @@ int main(void) {
height = gdispGetHeight();
// Code Here
- 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);
+ gdispFillArc(width/2, height/2, width/4, -10, -45, GFX_WHITE);
+ gdispDrawCircle(width/2+width/8, height/2-height/8, 13, GFX_GREEN);
+ gdispFillCircle (width/2+width/8, height/2-height/8, 10, GFX_RED);
+ gdispDrawArc(width/2+width/8, height/2-height/8, 20, 25, 115, GFX_GRAY);
+ gdispFillEllipse (width-width/6, height-height/6, width/8, height/16, GFX_BLUE);
+ gdispDrawEllipse (width-width/6, height-height/6, width/16, height/8, GFX_YELLOW);
while(TRUE) {
gfxSleepMilliseconds(500);
diff --git a/demos/modules/gdisp/fonts/main.c b/demos/modules/gdisp/fonts/main.c
index b43e32dc..73d7c54e 100644
--- a/demos/modules/gdisp/fonts/main.c
+++ b/demos/modules/gdisp/fonts/main.c
@@ -60,21 +60,21 @@ int main(void) {
line2 = "0123456789~!@#$%^&*_-+=(){}[]<>|/\\:;,.?'\"`";
// Font 1
- gdispFillStringBox(0, y, width, fheight1, line1, font1, Black, White, justifyCenter);
+ gdispFillStringBox(0, y, width, fheight1, line1, font1, GFX_BLACK, GFX_WHITE, justifyCenter);
y += fheight1+1;
- gdispFillStringBox(0, y, width, fheight1, line2, font1, Black, White, justifyCenter);
+ gdispFillStringBox(0, y, width, fheight1, line2, font1, GFX_BLACK, GFX_WHITE, justifyCenter);
y += fheight1+1;
// Font 2
- gdispFillStringBox(0, y, width, fheight2, line1, font2, Black, White, justifyCenter);
+ gdispFillStringBox(0, y, width, fheight2, line1, font2, GFX_BLACK, GFX_WHITE, justifyCenter);
y += fheight2+1;
- gdispFillStringBox(0, y, width, fheight2, line2, font2, Black, White, justifyCenter);
+ gdispFillStringBox(0, y, width, fheight2, line2, font2, GFX_BLACK, GFX_WHITE, justifyCenter);
y += fheight2+1;
// Font 1 drawing White on the (black) background
- gdispDrawStringBox(0, y, width, fheight1, line1, font1, White, justifyCenter);
+ gdispDrawStringBox(0, y, width, fheight1, line1, font1, GFX_WHITE, justifyCenter);
y += fheight1+1;
- gdispDrawStringBox(0, y, width, fheight1, line2, font1, White, justifyCenter);
+ gdispDrawStringBox(0, y, width, fheight1, line2, font1, GFX_WHITE, justifyCenter);
y += fheight1+1;
// Show Sizes
@@ -85,7 +85,7 @@ int main(void) {
buf[4] = (fheight2-2)/10 + '0';
buf[5] = (fheight2-2)%10 + '0';
buf[6] = 0;
- gdispFillStringBox(0, y, width, fheight1, buf, font1, Red, White, justifyCenter);
+ gdispFillStringBox(0, y, width, fheight1, buf, font1, GFX_RED, GFX_WHITE, justifyCenter);
// Wait forever
while(TRUE) {
diff --git a/demos/modules/gdisp/fonts_cyrillic/main.c b/demos/modules/gdisp/fonts_cyrillic/main.c
index bd504722..b65801a1 100644
--- a/demos/modules/gdisp/fonts_cyrillic/main.c
+++ b/demos/modules/gdisp/fonts_cyrillic/main.c
@@ -39,7 +39,7 @@ int main(void) {
font1 = gdispOpenFont("Archangelsk Regular 12");
// Demonstrate our other fonts
- gdispDrawString(10, 10, "привет мир", font1, Yellow);
+ gdispDrawString(10, 10, "привет мир", font1, GFX_YELLOW);
// Wait forever
while(TRUE) {
diff --git a/demos/modules/gdisp/images_animated/main.c b/demos/modules/gdisp/images_animated/main.c
index 5f24c0fc..a50e593f 100644
--- a/demos/modules/gdisp/images_animated/main.c
+++ b/demos/modules/gdisp/images_animated/main.c
@@ -85,21 +85,21 @@ int main(void) {
gdispImageCache(&myImage);
#endif
if (gdispImageDraw(&myImage, 0, 0, myImage.width, myImage.height, 0, 0) != GDISP_IMAGE_ERR_OK) {
- SHOW_ERROR(Orange);
+ SHOW_ERROR(GFX_ORANGE);
break;
}
delay = gdispImageNext(&myImage);
if (delay == TIME_INFINITE) {
- SHOW_ERROR(Green);
+ SHOW_ERROR(GFX_GREEN);
break;
}
- SHOW_ERROR(Yellow);
+ SHOW_ERROR(GFX_YELLOW);
if (delay != TIME_IMMEDIATE)
gfxSleepMilliseconds(delay);
}
gdispImageClose(&myImage);
} else
- SHOW_ERROR(Red);
+ SHOW_ERROR(GFX_RED);
while(1) {
gfxSleepMilliseconds(1000);
diff --git a/demos/modules/gdisp/images_palettes/main.c b/demos/modules/gdisp/images_palettes/main.c
index ceb9534f..b9327e52 100644
--- a/demos/modules/gdisp/images_palettes/main.c
+++ b/demos/modules/gdisp/images_palettes/main.c
@@ -48,7 +48,7 @@ int main(void)
// Initialize everything
gfxInit();
- gdispClear(Silver);
+ gdispClear(GFX_SILVER);
// Open the image file
gdispImageOpenFile(&_imgHome, "icon_home.bmp");
@@ -56,7 +56,7 @@ int main(void)
// Retrieve the color palette size and dump it - just for fun.
paletteSize = gdispImageGetPaletteSize(&_imgHome);
if (paletteSize != 2) { // With this image we expect the palette to have only two entries!
- gdispClear(Red);
+ gdispClear(GFX_RED);
while (1);
}
@@ -64,33 +64,33 @@ int main(void)
gdispImageDraw(&_imgHome, 10, 10, gdispGetWidth(), gdispGetHeight(), 0, 0);
// Modify the palette & redraw at a different location
- gdispImageAdjustPalette(&_imgHome, 0, Blue);
- gdispImageAdjustPalette(&_imgHome, 1, Red);
+ gdispImageAdjustPalette(&_imgHome, 0, GFX_BLUE);
+ gdispImageAdjustPalette(&_imgHome, 1, GFX_RED);
gdispImageDraw(&_imgHome, 10, 60, gdispGetWidth(), gdispGetHeight(), 0, 0);
// Modify the palette & redraw at a different location
- gdispImageAdjustPalette(&_imgHome, 0, White);
- gdispImageAdjustPalette(&_imgHome, 1, Black);
+ gdispImageAdjustPalette(&_imgHome, 0, GFX_WHITE);
+ gdispImageAdjustPalette(&_imgHome, 1, GFX_BLACK);
gdispImageDraw(&_imgHome, 10, 110, gdispGetWidth(), gdispGetHeight(), 0, 0);
// Modify the palette & redraw at a different location
- gdispImageAdjustPalette(&_imgHome, 0, Lime);
- gdispImageAdjustPalette(&_imgHome, 1, Navy);
+ gdispImageAdjustPalette(&_imgHome, 0, GFX_LIME);
+ gdispImageAdjustPalette(&_imgHome, 1, GFX_NAVY);
gdispImageDraw(&_imgHome, 10, 160, gdispGetWidth(), gdispGetHeight(), 0, 0);
// Modify the palette & redraw at a different location
- gdispImageAdjustPalette(&_imgHome, 0, Gray);
- gdispImageAdjustPalette(&_imgHome, 1, Yellow);
+ gdispImageAdjustPalette(&_imgHome, 0, GFX_GRAY);
+ gdispImageAdjustPalette(&_imgHome, 1, GFX_YELLOW);
gdispImageDraw(&_imgHome, 60, 60, gdispGetWidth(), gdispGetHeight(), 0, 0);
// Modify the palette & redraw at a different location
- gdispImageAdjustPalette(&_imgHome, 0, Green);
- gdispImageAdjustPalette(&_imgHome, 1, Black);
+ gdispImageAdjustPalette(&_imgHome, 0, GFX_GREEN);
+ gdispImageAdjustPalette(&_imgHome, 1, GFX_BLACK);
gdispImageDraw(&_imgHome, 60, 110, gdispGetWidth(), gdispGetHeight(), 0, 0);
// Modify the palette & redraw at a different location
- gdispImageAdjustPalette(&_imgHome, 0, Lime);
- gdispImageAdjustPalette(&_imgHome, 1, Teal);
+ gdispImageAdjustPalette(&_imgHome, 0, GFX_LIME);
+ gdispImageAdjustPalette(&_imgHome, 1, GFX_TEAL);
gdispImageDraw(&_imgHome, 60, 160, gdispGetWidth(), gdispGetHeight(), 0, 0);
// We're done. Clean up.
diff --git a/demos/modules/gdisp/multiple_displays/main.c b/demos/modules/gdisp/multiple_displays/main.c
index 8c590f6d..8b38a22a 100644
--- a/demos/modules/gdisp/multiple_displays/main.c
+++ b/demos/modules/gdisp/multiple_displays/main.c
@@ -71,16 +71,16 @@
/* Draw draw draw */
sprintg(buf, "Display %u", display);
if (width < 128) {
- gdispGDrawBox(g, 0, 0, width/2, height/2, Yellow);
- gdispGFillStringBox(g, 0, height/2, width, height/2, buf, f, Black, Blue, justifyCenter);
+ gdispGDrawBox(g, 0, 0, width/2, height/2, GFX_YELLOW);
+ gdispGFillStringBox(g, 0, height/2, width, height/2, buf, f, GFX_BLACK, GFX_BLUE, justifyCenter);
} else {
- gdispGDrawBox(g, 10, 10, width/2, height/2, Yellow);
- gdispGFillStringBox(g, width/2, height/2, width/2-10, height/2-10, buf, f, White, Blue, justifyCenter);
+ gdispGDrawBox(g, 10, 10, width/2, height/2, GFX_YELLOW);
+ gdispGFillStringBox(g, width/2, height/2, width/2-10, height/2-10, buf, f, GFX_WHITE, GFX_BLUE, justifyCenter);
}
- gdispGDrawLine(g, 5, 30, width-50, height-40, Red);
+ gdispGDrawLine(g, 5, 30, width-50, height-40, GFX_RED);
for(i = 5, j = 0; i < width && j < height; i += 7, j += i/20)
- gdispGDrawPixel(g, i, j, White);
+ gdispGDrawPixel(g, i, j, GFX_WHITE);
}
while(TRUE) {
@@ -114,16 +114,16 @@
/* Draw draw draw */
sprintg(buf, "Display %u", display);
if (width < 128) {
- gdispDrawBox(0, 0, width/2, height/2, Yellow);
- gdispFillStringBox(0, height/2, width, height/2, buf, f, Black, Blue, justifyCenter);
+ gdispDrawBox(0, 0, width/2, height/2, GFX_YELLOW);
+ gdispFillStringBox(0, height/2, width, height/2, buf, f, GFX_BLACK, GFX_BLUE, justifyCenter);
} else {
- gdispDrawBox(10, 10, width/2, height/2, Yellow);
- gdispFillStringBox(width/2, height/2, width/2-10, height/2-10, buf, f, White, Blue, justifyCenter);
+ gdispDrawBox(10, 10, width/2, height/2, GFX_YELLOW);
+ gdispFillStringBox(width/2, height/2, width/2-10, height/2-10, buf, f, GFX_WHITE, GFX_BLUE, justifyCenter);
}
- gdispDrawLine(5, 30, width-50, height-40, Red);
+ gdispDrawLine(5, 30, width-50, height-40, GFX_RED);
for(i = 5, j = 0; i < width && j < height; i += 7, j += i/20)
- gdispDrawPixel(i, j, White);
+ gdispDrawPixel(i, j, GFX_WHITE);
}
while(TRUE) {
diff --git a/demos/modules/gdisp/pixmap/main.c b/demos/modules/gdisp/pixmap/main.c
index c1cb9b55..a6791ec9 100644
--- a/demos/modules/gdisp/pixmap/main.c
+++ b/demos/modules/gdisp/pixmap/main.c
@@ -59,12 +59,12 @@ int main(void) {
surface[j*PIXMAP_WIDTH + i] = RGB2COLOR(0, 255-i*(256/PIXMAP_WIDTH), j*(256/PIXMAP_HEIGHT));
// Secondly, show drawing a line on it like a virtual display
- gdispGDrawLine(pixmap, 0, 0, gdispGGetWidth(pixmap)-1, gdispGGetHeight(pixmap)-1, White);
+ gdispGDrawLine(pixmap, 0, 0, gdispGGetWidth(pixmap)-1, gdispGGetHeight(pixmap)-1, GFX_WHITE);
i = j = 0;
while(TRUE) {
// Clear the old position
- gdispFillArea(i, j, PIXMAP_WIDTH, PIXMAP_HEIGHT, Black);
+ gdispFillArea(i, j, PIXMAP_WIDTH, PIXMAP_HEIGHT, GFX_BLACK);
// Change the position
i += PIXMAP_WIDTH/2;
diff --git a/demos/modules/gdisp/polygons/main.c b/demos/modules/gdisp/polygons/main.c
index f71505d9..8a4f7df3 100644
--- a/demos/modules/gdisp/polygons/main.c
+++ b/demos/modules/gdisp/polygons/main.c
@@ -81,7 +81,7 @@ int main(void) {
// Initialize and clear the display
gfxInit();
- gdispClear(White);
+ gdispClear(GFX_WHITE);
// Get the screen size
width = gdispGetWidth();
@@ -136,16 +136,16 @@ int main(void) {
#endif
// Clear the old shape
- gdispDrawPoly(0, 0, oldresult, NUM_POINTS, White);
- gdispFillConvexPoly(0, 0, oldresult, NUM_POINTS, White);
+ gdispDrawPoly(0, 0, oldresult, NUM_POINTS, GFX_WHITE);
+ gdispFillConvexPoly(0, 0, oldresult, NUM_POINTS, GFX_WHITE);
// Play the new shape position
// NOTE: Because our shape is not a true convex polygon, we get some frames
// where the line outline and the filled shape don't match. This is
// expected due to the shapes non-convex nature and was left in the
// demo to demonstrate this exact point.
- gdispFillConvexPoly(0, 0, result, NUM_POINTS, Red);
- gdispDrawPoly(0, 0, result, NUM_POINTS, Blue);
+ gdispFillConvexPoly(0, 0, result, NUM_POINTS, GFX_RED);
+ gdispDrawPoly(0, 0, result, NUM_POINTS, GFX_BLUE);
// Make sure the display is updated
gdispFlush();
diff --git a/demos/modules/gdisp/streaming/main.c b/demos/modules/gdisp/streaming/main.c
index be94608f..a360ecc2 100644
--- a/demos/modules/gdisp/streaming/main.c
+++ b/demos/modules/gdisp/streaming/main.c
@@ -49,8 +49,8 @@
* #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 */
}
diff --git a/demos/modules/gdisp/thickarcs/main.c b/demos/modules/gdisp/thickarcs/main.c
index 5ddd38c7..adf42810 100644
--- a/demos/modules/gdisp/thickarcs/main.c
+++ b/demos/modules/gdisp/thickarcs/main.c
@@ -32,8 +32,8 @@
// This function draws a thick arc and a non-thick arc together
static void _drawCombinedArc(int x, int y, int angle1, int angle2)
{
- gdispDrawThickArc(x, y, 40, 60, angle1, angle2, Red);
- gdispDrawArc(x, y, 50, angle1, angle2, White);
+ gdispDrawThickArc(x, y, 40, 60, angle1, angle2, GFX_RED);
+ gdispDrawArc(x, y, 50, angle1, angle2, GFX_WHITE);
}
int main(void)
@@ -45,7 +45,7 @@ int main(void)
while(TRUE) {
// Clear the entire screen
- gdispClear(Black);
+ gdispClear(GFX_BLACK);
// Draw some thick arcs with an outline
_drawCombinedArc(150, 150, (i / 360) * 15 + 55, 55+i);
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-11 22:06:40 +0000