diff options
Diffstat (limited to 'demos/modules/gdisp')
25 files changed, 247 insertions, 247 deletions
diff --git a/demos/modules/gdisp/arcsectors/gfxconf.h b/demos/modules/gdisp/arcsectors/gfxconf.h index df6d85c0..b2c64fbd 100644 --- a/demos/modules/gdisp/arcsectors/gfxconf.h +++ b/demos/modules/gdisp/arcsectors/gfxconf.h @@ -31,17 +31,17 @@ #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_GDISP GFXON /* Features for the GDISP subsystem. */ -#define GDISP_NEED_VALIDATION TRUE -#define GDISP_NEED_ARCSECTORS TRUE +#define GDISP_NEED_VALIDATION GFXON +#define GDISP_NEED_ARCSECTORS GFXON #endif /* _GFXCONF_H */ 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/gfxconf.h b/demos/modules/gdisp/basics/gfxconf.h index a37ef1e7..931f2fe7 100644 --- a/demos/modules/gdisp/basics/gfxconf.h +++ b/demos/modules/gdisp/basics/gfxconf.h @@ -31,17 +31,17 @@ #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_GDISP GFXON
/* Features for the GDISP sub-system. */
-#define GDISP_NEED_VALIDATION TRUE
-#define GDISP_NEED_CLIP TRUE
+#define GDISP_NEED_VALIDATION GFXON
+#define GDISP_NEED_CLIP GFXON
#endif /* _GFXCONF_H */
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/gfxconf.h b/demos/modules/gdisp/circles/gfxconf.h index 4bb605ac..a0534700 100644 --- a/demos/modules/gdisp/circles/gfxconf.h +++ b/demos/modules/gdisp/circles/gfxconf.h @@ -31,25 +31,25 @@ #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 subsystem. */
-#define GDISP_NEED_VALIDATION TRUE
-#define GDISP_NEED_CLIP TRUE
-#define GDISP_NEED_CIRCLE TRUE
-#define GDISP_NEED_ELLIPSE TRUE
-#define GDISP_NEED_ARC TRUE
+#define GDISP_NEED_VALIDATION GFXON
+#define GDISP_NEED_CLIP GFXON
+#define GDISP_NEED_CIRCLE GFXON
+#define GDISP_NEED_ELLIPSE GFXON
+#define GDISP_NEED_ARC GFXON
/* Features for the GMISC subsystem */
-#define GMISC_NEED_FIXEDTRIG TRUE
-#define GMISC_NEED_FASTTRIG TRUE
+#define GMISC_NEED_FIXEDTRIG GFXON
+#define GMISC_NEED_FASTTRIG GFXON
#endif /* _GFXCONF_H */
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/gfxconf.h b/demos/modules/gdisp/fonts/gfxconf.h index 1ea84e1b..2e24dd64 100644 --- a/demos/modules/gdisp/fonts/gfxconf.h +++ b/demos/modules/gdisp/fonts/gfxconf.h @@ -31,41 +31,41 @@ #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_GDISP 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_ANTIALIAS TRUE +#define GDISP_NEED_VALIDATION GFXON +#define GDISP_NEED_CLIP GFXON +#define GDISP_NEED_TEXT GFXON +#define GDISP_NEED_ANTIALIAS GFXON /* GDISP - fonts to include */ -#define GDISP_INCLUDE_USER_FONTS TRUE -#define GDISP_INCLUDE_FONT_UI1 FALSE -#define GDISP_INCLUDE_FONT_UI2 TRUE -#define GDISP_INCLUDE_FONT_LARGENUMBERS FALSE -#define GDISP_INCLUDE_FONT_DEJAVUSANS10 FALSE -#define GDISP_INCLUDE_FONT_DEJAVUSANS12 FALSE -#define GDISP_INCLUDE_FONT_DEJAVUSANS16 FALSE -#define GDISP_INCLUDE_FONT_DEJAVUSANS20 FALSE -#define GDISP_INCLUDE_FONT_DEJAVUSANS24 FALSE -#define GDISP_INCLUDE_FONT_DEJAVUSANS32 FALSE -#define GDISP_INCLUDE_FONT_DEJAVUSANSBOLD12 FALSE -#define GDISP_INCLUDE_FONT_FIXED_10x20 FALSE -#define GDISP_INCLUDE_FONT_FIXED_7x14 FALSE -#define GDISP_INCLUDE_FONT_FIXED_5x8 FALSE -#define GDISP_INCLUDE_FONT_DEJAVUSANS12_AA FALSE -#define GDISP_INCLUDE_FONT_DEJAVUSANS16_AA FALSE -#define GDISP_INCLUDE_FONT_DEJAVUSANS20_AA TRUE -#define GDISP_INCLUDE_FONT_DEJAVUSANS24_AA FALSE -#define GDISP_INCLUDE_FONT_DEJAVUSANS32_AA FALSE -#define GDISP_INCLUDE_FONT_DEJAVUSANSBOLD12_AA FALSE +#define GDISP_INCLUDE_USER_FONTS GFXON +#define GDISP_INCLUDE_FONT_UI1 GFXOFF +#define GDISP_INCLUDE_FONT_UI2 GFXON +#define GDISP_INCLUDE_FONT_LARGENUMBERS GFXOFF +#define GDISP_INCLUDE_FONT_DEJAVUSANS10 GFXOFF +#define GDISP_INCLUDE_FONT_DEJAVUSANS12 GFXOFF +#define GDISP_INCLUDE_FONT_DEJAVUSANS16 GFXOFF +#define GDISP_INCLUDE_FONT_DEJAVUSANS20 GFXOFF +#define GDISP_INCLUDE_FONT_DEJAVUSANS24 GFXOFF +#define GDISP_INCLUDE_FONT_DEJAVUSANS32 GFXOFF +#define GDISP_INCLUDE_FONT_DEJAVUSANSBOLD12 GFXOFF +#define GDISP_INCLUDE_FONT_FIXED_10x20 GFXOFF +#define GDISP_INCLUDE_FONT_FIXED_7x14 GFXOFF +#define GDISP_INCLUDE_FONT_FIXED_5x8 GFXOFF +#define GDISP_INCLUDE_FONT_DEJAVUSANS12_AA GFXOFF +#define GDISP_INCLUDE_FONT_DEJAVUSANS16_AA GFXOFF +#define GDISP_INCLUDE_FONT_DEJAVUSANS20_AA GFXON +#define GDISP_INCLUDE_FONT_DEJAVUSANS24_AA GFXOFF +#define GDISP_INCLUDE_FONT_DEJAVUSANS32_AA GFXOFF +#define GDISP_INCLUDE_FONT_DEJAVUSANSBOLD12_AA GFXOFF #endif /* _GFXCONF_H */ 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/gfxconf.h b/demos/modules/gdisp/fonts_cyrillic/gfxconf.h index dab77ba1..359061de 100644 --- a/demos/modules/gdisp/fonts_cyrillic/gfxconf.h +++ b/demos/modules/gdisp/fonts_cyrillic/gfxconf.h @@ -31,26 +31,26 @@ #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 subsystems to turn on */ -#define GFX_USE_GDISP TRUE +#define GFX_USE_GDISP GFXON /* Features for the GDISP subsystem */ -#define GDISP_NEED_VALIDATION TRUE -#define GDISP_NEED_CLIP TRUE -#define GDISP_NEED_TEXT TRUE -#define GDISP_NEED_CIRCLE TRUE -#define GDISP_NEED_ELLIPSE TRUE -#define GDISP_NEED_ANTIALIAS TRUE -#define GDISP_NEED_UTF8 TRUE -#define GDISP_NEED_TEXT_KERNING TRUE +#define GDISP_NEED_VALIDATION GFXON +#define GDISP_NEED_CLIP GFXON +#define GDISP_NEED_TEXT GFXON +#define GDISP_NEED_CIRCLE GFXON +#define GDISP_NEED_ELLIPSE GFXON +#define GDISP_NEED_ANTIALIAS GFXON +#define GDISP_NEED_UTF8 GFXON +#define GDISP_NEED_TEXT_KERNING GFXON /* GDISP - fonts to include */ -#define GDISP_INCLUDE_USER_FONTS TRUE +#define GDISP_INCLUDE_USER_FONTS GFXON #endif /* _GFXCONF_H */ 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/gfxconf.h b/demos/modules/gdisp/images/gfxconf.h index 55420275..7a37b48e 100644 --- a/demos/modules/gdisp/images/gfxconf.h +++ b/demos/modules/gdisp/images/gfxconf.h @@ -31,30 +31,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_GDISP GFXON /* Features for the GDISP sub-system. */ -#define GDISP_NEED_VALIDATION TRUE -#define GDISP_NEED_CLIP TRUE -#define GDISP_NEED_IMAGE TRUE +#define GDISP_NEED_VALIDATION GFXON +#define GDISP_NEED_CLIP GFXON +#define GDISP_NEED_IMAGE GFXON #define GDISP_STARTUP_COLOR HTML2COLOR(0xC0C0C0) /* GDISP image decoders */ -//#define GDISP_NEED_IMAGE_NATIVE TRUE -//#define GDISP_NEED_IMAGE_GIF TRUE -#define GDISP_NEED_IMAGE_BMP TRUE -//#define GDISP_NEED_IMAGE_JPG TRUE -//#define GDISP_NEED_IMAGE_PNG TRUE - -#define GFX_USE_GFILE TRUE -#define GFILE_NEED_ROMFS TRUE -//#define GFILE_NEED_NATIVEFS TRUE +//#define GDISP_NEED_IMAGE_NATIVE GFXON +//#define GDISP_NEED_IMAGE_GIF GFXON +#define GDISP_NEED_IMAGE_BMP GFXON +//#define GDISP_NEED_IMAGE_JPG GFXON +//#define GDISP_NEED_IMAGE_PNG GFXON + +#define GFX_USE_GFILE GFXON +#define GFILE_NEED_ROMFS GFXON +//#define GFILE_NEED_NATIVEFS GFXON #endif /* _GFXCONF_H */ diff --git a/demos/modules/gdisp/images_animated/gfxconf.h b/demos/modules/gdisp/images_animated/gfxconf.h index fddda437..edbe126d 100644 --- a/demos/modules/gdisp/images_animated/gfxconf.h +++ b/demos/modules/gdisp/images_animated/gfxconf.h @@ -31,28 +31,28 @@ #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_GDISP GFXON /* Features for the GDISP sub-system. */ -#define GDISP_NEED_VALIDATION TRUE -#define GDISP_NEED_CLIP TRUE -#define GDISP_NEED_IMAGE TRUE +#define GDISP_NEED_VALIDATION GFXON +#define GDISP_NEED_CLIP GFXON +#define GDISP_NEED_IMAGE GFXON /* GDISP image decoders */ -#define GDISP_NEED_IMAGE_NATIVE FALSE -#define GDISP_NEED_IMAGE_GIF TRUE -#define GDISP_NEED_IMAGE_BMP FALSE -#define GDISP_NEED_IMAGE_JPG FALSE -#define GDISP_NEED_IMAGE_PNG FALSE - -#define GFX_USE_GFILE TRUE -#define GFILE_NEED_ROMFS TRUE +#define GDISP_NEED_IMAGE_NATIVE GFXOFF +#define GDISP_NEED_IMAGE_GIF GFXON +#define GDISP_NEED_IMAGE_BMP GFXOFF +#define GDISP_NEED_IMAGE_JPG GFXOFF +#define GDISP_NEED_IMAGE_PNG GFXOFF + +#define GFX_USE_GFILE GFXON +#define GFILE_NEED_ROMFS GFXON #endif /* _GFXCONF_H */ diff --git a/demos/modules/gdisp/images_animated/main.c b/demos/modules/gdisp/images_animated/main.c index 039cf584..a50e593f 100644 --- a/demos/modules/gdisp/images_animated/main.c +++ b/demos/modules/gdisp/images_animated/main.c @@ -36,7 +36,7 @@ * The ROMFS uses the file "romfs_files.h" to describe the set of files in the ROMFS. */ -#define USE_IMAGE_CACHE FALSE // Only if you want to get performance at the expense of RAM +#define USE_IMAGE_CACHE GFXOFF // Only if you want to get performance at the expense of RAM #define MY_BG_COLOR RGB2COLOR(220, 220, 255) // Pale blue so we can see the transparent parts static gdispImage myImage; @@ -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/gfxconf.h b/demos/modules/gdisp/images_palettes/gfxconf.h index a98776f5..db09cf0b 100644 --- a/demos/modules/gdisp/images_palettes/gfxconf.h +++ b/demos/modules/gdisp/images_palettes/gfxconf.h @@ -31,30 +31,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_GDISP GFXON /* Features for the GDISP sub-system. */ -#define GDISP_NEED_VALIDATION TRUE -#define GDISP_NEED_CLIP TRUE -#define GDISP_NEED_IMAGE TRUE +#define GDISP_NEED_VALIDATION GFXON +#define GDISP_NEED_CLIP GFXON +#define GDISP_NEED_IMAGE GFXON #define GDISP_STARTUP_COLOR HTML2COLOR(0xC0C0C0) /* GDISP image decoders */ -//#define GDISP_NEED_IMAGE_NATIVE TRUE -//#define GDISP_NEED_IMAGE_GIF TRUE -#define GDISP_NEED_IMAGE_BMP TRUE -//#define GDISP_NEED_IMAGE_JPG TRUE -//#define GDISP_NEED_IMAGE_PNG TRUE - -#define GFX_USE_GFILE TRUE -#define GFILE_NEED_ROMFS TRUE -//#define GFILE_NEED_NATIVEFS TRUE +//#define GDISP_NEED_IMAGE_NATIVE GFXON +//#define GDISP_NEED_IMAGE_GIF GFXON +#define GDISP_NEED_IMAGE_BMP GFXON +//#define GDISP_NEED_IMAGE_JPG GFXON +//#define GDISP_NEED_IMAGE_PNG GFXON + +#define GFX_USE_GFILE GFXON +#define GFILE_NEED_ROMFS GFXON +//#define GFILE_NEED_NATIVEFS GFXON #endif /* _GFXCONF_H */ diff --git a/demos/modules/gdisp/images_palettes/main.c b/demos/modules/gdisp/images_palettes/main.c index 7d63088b..b9327e52 100644 --- a/demos/modules/gdisp/images_palettes/main.c +++ b/demos/modules/gdisp/images_palettes/main.c @@ -36,7 +36,7 @@ * the same time there's still just one copy of the image in memory at all times. */ -#define USE_PRINTF TRUE +#define USE_PRINTF GFXON #include "gfx.h" @@ -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/gfxconf.h b/demos/modules/gdisp/multiple_displays/gfxconf.h index af71500e..a07c2993 100644 --- a/demos/modules/gdisp/multiple_displays/gfxconf.h +++ b/demos/modules/gdisp/multiple_displays/gfxconf.h @@ -31,20 +31,20 @@ #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_GDISP 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_VALIDATION GFXON +#define GDISP_NEED_CLIP GFXON +#define GDISP_NEED_TEXT GFXON -#define GDISP_INCLUDE_FONT_UI2 TRUE +#define GDISP_INCLUDE_FONT_UI2 GFXON /* You must either define GDISP_TOTAL_DISPLAYS or GDISP_DRIVER_LIST for multiple displays. * You cannot define both! @@ -66,15 +66,15 @@ * as the program doesn't have to detect the hardware method to use on each call. * * Hardware definitions can be set to: - * - TRUE - all controllers support this routine - * - FALSE - no controllers support this routine + * - GFXON - all controllers support this routine + * - GFXOFF - no controllers support this routine * - if not specified then the code auto-detects the hardware. * * e.g - * #define GDISP_HARDWARE_STREAM_WRITE FALSE - * #define GDISP_HARDWARE_STREAM_READ FALSE - * #define GDISP_HARDWARE_DRAWPIXEL TRUE - * #define GDISP_HARDWARE_FILLS TRUE + * #define GDISP_HARDWARE_STREAM_WRITE GFXOFF + * #define GDISP_HARDWARE_STREAM_READ GFXOFF + * #define GDISP_HARDWARE_DRAWPIXEL GFXON + * #define GDISP_HARDWARE_FILLS GFXON */ #if GFX_USE_OS_WIN32 || GFX_USE_OS_LINUX || GFX_USE_OS_OSX // Emulator @@ -90,8 +90,8 @@ /* * The following are needed only for the sprintg() call */ -#define GFX_USE_GFILE TRUE -#define GFILE_NEED_PRINTG TRUE -#define GFILE_NEED_STRINGS TRUE +#define GFX_USE_GFILE GFXON +#define GFILE_NEED_PRINTG GFXON +#define GFILE_NEED_STRINGS GFXON #endif /* _GFXCONF_H */ diff --git a/demos/modules/gdisp/multiple_displays/main.c b/demos/modules/gdisp/multiple_displays/main.c index 0a474d0f..8b38a22a 100644 --- a/demos/modules/gdisp/multiple_displays/main.c +++ b/demos/modules/gdisp/multiple_displays/main.c @@ -41,7 +41,7 @@ * and method 1 for any extra displays. */ -#define USE_METHOD_1 FALSE +#define USE_METHOD_1 GFXOFF #if USE_METHOD_1 int main(void) { @@ -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/gfxconf.h b/demos/modules/gdisp/pixmap/gfxconf.h index ddd7d1ec..122caec2 100644 --- a/demos/modules/gdisp/pixmap/gfxconf.h +++ b/demos/modules/gdisp/pixmap/gfxconf.h @@ -31,18 +31,18 @@ #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_GDISP GFXON /* Features for the GDISP sub-system. */ -#define GDISP_NEED_VALIDATION TRUE -#define GDISP_NEED_CLIP TRUE -#define GDISP_NEED_PIXMAP TRUE +#define GDISP_NEED_VALIDATION GFXON +#define GDISP_NEED_CLIP GFXON +#define GDISP_NEED_PIXMAP GFXON #endif /* _GFXCONF_H */ 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/gfxconf.h b/demos/modules/gdisp/polygons/gfxconf.h index 51170ecc..d0388c34 100644 --- a/demos/modules/gdisp/polygons/gfxconf.h +++ b/demos/modules/gdisp/polygons/gfxconf.h @@ -31,19 +31,19 @@ #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_CLIP TRUE -#define GDISP_NEED_CONVEX_POLYGON TRUE +#define GDISP_NEED_VALIDATION GFXON +#define GDISP_NEED_CLIP GFXON +#define GDISP_NEED_CONVEX_POLYGON GFXON /* For this demo define either: * GMISC_NEED_MATRIXFLOAT2D to use floating point math operations @@ -56,11 +56,11 @@ * If you choose fixed point you MUST define GMISC_NEED_FIXEDTRIG for this demo. */ -//#define GMISC_NEED_FASTTRIG TRUE -//#define GMISC_NEED_MATRIXFLOAT2D TRUE +//#define GMISC_NEED_FASTTRIG GFXON +//#define GMISC_NEED_MATRIXFLOAT2D GFXON -#define GMISC_NEED_FIXEDTRIG TRUE -#define GMISC_NEED_MATRIXFIXED2D TRUE +#define GMISC_NEED_FIXEDTRIG GFXON +#define GMISC_NEED_MATRIXFIXED2D GFXON #endif /* _GFXCONF_H */ 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/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 */ } diff --git a/demos/modules/gdisp/thickarcs/gfxconf.h b/demos/modules/gdisp/thickarcs/gfxconf.h index 50e3092e..e81b5e06 100644 --- a/demos/modules/gdisp/thickarcs/gfxconf.h +++ b/demos/modules/gdisp/thickarcs/gfxconf.h @@ -31,17 +31,17 @@ #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_GDISP GFXON /* Features for the GDISP subsystem. */ -#define GDISP_NEED_VALIDATION TRUE -#define GDISP_NEED_ARC TRUE +#define GDISP_NEED_VALIDATION GFXON +#define GDISP_NEED_ARC GFXON #endif /* _GFXCONF_H */ 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); |