From 94f1cc2f0a4db0c6f1483e6d648068e031bcc094 Mon Sep 17 00:00:00 2001 From: inmarket Date: Sat, 10 Mar 2018 20:36:12 +1000 Subject: Change new colors to GFX_RED instead of GFXRED. Use the new color defs --- drivers/gaudio/Win32/gaudio_play_Win32.c | 8 +++++--- drivers/gaudio/Win32/gaudio_record_Win32.c | 8 +++++--- drivers/gdisp/ED060SC4/gdisp_lld_ED060SC4.c | 2 +- drivers/gdisp/KS0108/gdisp_lld_KS0108.c | 4 ++-- drivers/gdisp/PCD8544/gdisp_lld_PCD8544.c | 4 ++-- drivers/gdisp/PCF8812/gdisp_lld_PCF8812.c | 4 ++-- drivers/gdisp/RA6963/gdisp_lld_RA6963.c | 4 ++-- drivers/gdisp/SSD1306/gdisp_lld_SSD1306.c | 6 +++--- drivers/gdisp/SSD1331/gdisp_lld_SSD1331.c | 2 +- drivers/gdisp/SSD1848/gdisp_lld_SSD1848.c | 4 ++-- drivers/gdisp/ST7565/gdisp_lld_ST7565.c | 4 ++-- drivers/gdisp/TLS8204/gdisp_lld_TLS8204.c | 4 ++-- drivers/gdisp/UC1601s/gdisp_lld_UC1601s.c | 4 ++-- drivers/multiple/Win32/gdisp_lld_Win32.c | 8 +++++--- 14 files changed, 36 insertions(+), 30 deletions(-) (limited to 'drivers') diff --git a/drivers/gaudio/Win32/gaudio_play_Win32.c b/drivers/gaudio/Win32/gaudio_play_Win32.c index baafd4ce..7bca6e04 100644 --- a/drivers/gaudio/Win32/gaudio_play_Win32.c +++ b/drivers/gaudio/Win32/gaudio_play_Win32.c @@ -15,9 +15,11 @@ /* Include the driver defines */ #include "../../../src/gaudio/gaudio_driver_play.h" -#undef Red -#undef Green -#undef Blue +#if GFX_COMPAT_V2 && GFX_COMPAT_OLDCOLORS + #undef Red + #undef Green + #undef Blue +#endif #define WIN32_LEAN_AND_MEAN #include #include diff --git a/drivers/gaudio/Win32/gaudio_record_Win32.c b/drivers/gaudio/Win32/gaudio_record_Win32.c index e3e122d8..1c86c37f 100644 --- a/drivers/gaudio/Win32/gaudio_record_Win32.c +++ b/drivers/gaudio/Win32/gaudio_record_Win32.c @@ -15,9 +15,11 @@ /* Include the driver defines */ #include "../../../src/gaudio/gaudio_driver_record.h" -#undef Red -#undef Green -#undef Blue +#if GFX_COMPAT_V2 && GFX_COMPAT_OLDCOLORS + #undef Red + #undef Green + #undef Blue +#endif #define WIN32_LEAN_AND_MEAN #include #include diff --git a/drivers/gdisp/ED060SC4/gdisp_lld_ED060SC4.c b/drivers/gdisp/ED060SC4/gdisp_lld_ED060SC4.c index 8291cdcc..3272ca0a 100644 --- a/drivers/gdisp/ED060SC4/gdisp_lld_ED060SC4.c +++ b/drivers/gdisp/ED060SC4/gdisp_lld_ED060SC4.c @@ -520,7 +520,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { bitpos = (6 - 2 * (dx % EINK_PPB)); byte = block->data[dy][dx / EINK_PPB]; byte &= ~(PIXELMASK << bitpos); - if (gdispColor2Native(g->p.color) != Black) + if (gdispColor2Native(g->p.color) != GFX_BLACK) byte |= PIXEL_WHITE << bitpos; else byte |= PIXEL_BLACK << bitpos; diff --git a/drivers/gdisp/KS0108/gdisp_lld_KS0108.c b/drivers/gdisp/KS0108/gdisp_lld_KS0108.c index af058ebb..20b3a5c9 100644 --- a/drivers/gdisp/KS0108/gdisp_lld_KS0108.c +++ b/drivers/gdisp/KS0108/gdisp_lld_KS0108.c @@ -159,7 +159,7 @@ LLDSPEC void gdisp_lld_write_color(GDisplay *g) { uint16_t data; data = (g->p.x >> 6) << 8; // Set the chip - if (g->p.color != White) + if (g->p.color != GFX_WHITE) data |= 0x01; // set dot write_data(g, data); } @@ -206,7 +206,7 @@ LLDSPEC void gdisp_lld_draw_pixel(GDisplay *g) { uint8_t data, j; set_viewport(g); - if (g->p.color != White) { + if (g->p.color != GFX_WHITE) { data = 0xFF; // set dot } else { diff --git a/drivers/gdisp/PCD8544/gdisp_lld_PCD8544.c b/drivers/gdisp/PCD8544/gdisp_lld_PCD8544.c index 8db73bc5..fae87409 100644 --- a/drivers/gdisp/PCD8544/gdisp_lld_PCD8544.c +++ b/drivers/gdisp/PCD8544/gdisp_lld_PCD8544.c @@ -144,7 +144,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { y = g->p.y; #endif - if (g->p.color != Black) { + if (g->p.color != GFX_BLACK) { RAM(g)[xyaddr(x, y)] |= xybit(y); } else { RAM(g)[xyaddr(x, y)] &= ~xybit(y); @@ -177,7 +177,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { y = g->p.x; break; } - return (RAM(g)[xyaddr(x, y)] & xybit(y)) ? White : Black; + return (RAM(g)[xyaddr(x, y)] & xybit(y)) ? GFX_WHITE : GFX_BLACK; } #endif diff --git a/drivers/gdisp/PCF8812/gdisp_lld_PCF8812.c b/drivers/gdisp/PCF8812/gdisp_lld_PCF8812.c index 0716215c..5d96c4b1 100644 --- a/drivers/gdisp/PCF8812/gdisp_lld_PCF8812.c +++ b/drivers/gdisp/PCF8812/gdisp_lld_PCF8812.c @@ -154,7 +154,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { y = g->p.y; #endif - if (gdispColor2Native(g->p.color) != Black) { + if (gdispColor2Native(g->p.color) != GFX_BLACK) { RAM(g)[xyaddr(x, y)] |= xybit(y); } else { RAM(g)[xyaddr(x, y)] &= ~xybit(y); @@ -187,7 +187,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { y = g->p.x; break; } - return (RAM(g)[xyaddr(x, y)] & xybit(y)) ? White : Black; + return (RAM(g)[xyaddr(x, y)] & xybit(y)) ? GFX_WHITE : GFX_BLACK; } #endif diff --git a/drivers/gdisp/RA6963/gdisp_lld_RA6963.c b/drivers/gdisp/RA6963/gdisp_lld_RA6963.c index 7cf741d6..97090d5e 100755 --- a/drivers/gdisp/RA6963/gdisp_lld_RA6963.c +++ b/drivers/gdisp/RA6963/gdisp_lld_RA6963.c @@ -234,7 +234,7 @@ LLDSPEC void gdisp_lld_write_color(GDisplay *g) { temp = RAM(g)[POS]; #endif - if (g->p.color != White) { + if (g->p.color != GFX_WHITE) { temp |= (1 << (RA6963_FONT_WIDTH - 1 - ((g->p.x) % RA6963_FONT_WIDTH))); } else { @@ -292,7 +292,7 @@ LLDSPEC void gdisp_lld_fill_area(GDisplay *g) { uint8_t data, j; set_viewport(g); - if (g->p.color != White) { + if (g->p.color != GFX_WHITE) { data = 0xFF; // set dot } else { diff --git a/drivers/gdisp/SSD1306/gdisp_lld_SSD1306.c b/drivers/gdisp/SSD1306/gdisp_lld_SSD1306.c index 08c66f1f..39d48317 100644 --- a/drivers/gdisp/SSD1306/gdisp_lld_SSD1306.c +++ b/drivers/gdisp/SSD1306/gdisp_lld_SSD1306.c @@ -209,7 +209,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { mask = 0xff << (sy&7); zpages = (ey / 8) - spage; - if (gdispColor2Native(g->p.color) == gdispColor2Native(Black)) { + if (gdispColor2Native(g->p.color) == gdispColor2Native(GFX_BLACK)) { while (zpages--) { for (col = sx; col <= ex; col++) base[col] &= ~mask; @@ -257,7 +257,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { y = g->p.x; break; } - if (gdispColor2Native(g->p.color) != gdispColor2Native(Black)) + if (gdispColor2Native(g->p.color) != gdispColor2Native(GFX_BLACK)) RAM(g)[xyaddr(x, y)] |= xybit(y); else RAM(g)[xyaddr(x, y)] &= ~xybit(y); @@ -288,7 +288,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { y = g->p.x; break; } - return (RAM(g)[xyaddr(x, y)] & xybit(y)) ? White : Black; + return (RAM(g)[xyaddr(x, y)] & xybit(y)) ? GFX_WHITE : GFX_BLACK; } #endif diff --git a/drivers/gdisp/SSD1331/gdisp_lld_SSD1331.c b/drivers/gdisp/SSD1331/gdisp_lld_SSD1331.c index 91596917..a36320d7 100644 --- a/drivers/gdisp/SSD1331/gdisp_lld_SSD1331.c +++ b/drivers/gdisp/SSD1331/gdisp_lld_SSD1331.c @@ -161,7 +161,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { acquire_bus(g); - if (g->p.color == Black) { + if (g->p.color == GFX_BLACK) { // Use clear window command write_cmd(g, SSD1331_DRAW_CLEAR); write_cmd(g, g->p.x); diff --git a/drivers/gdisp/SSD1848/gdisp_lld_SSD1848.c b/drivers/gdisp/SSD1848/gdisp_lld_SSD1848.c index de02a2e1..a1247315 100644 --- a/drivers/gdisp/SSD1848/gdisp_lld_SSD1848.c +++ b/drivers/gdisp/SSD1848/gdisp_lld_SSD1848.c @@ -425,7 +425,7 @@ LLDSPEC void gdisp_lld_draw_pixel (GDisplay *g) y = g->p.x; break; } - if (gdispColor2Native (g->p.color) != gdispColor2Native (Black)) + if (gdispColor2Native (g->p.color) != gdispColor2Native (GFX_BLACK)) RAM (g)[xyaddr (x, y)] |= xybit (y); else RAM (g)[xyaddr (x, y)] &= ~xybit(y); @@ -461,7 +461,7 @@ LLDSPEC color_t gdisp_lld_get_pixel_color (GDisplay *g) y = g->p.x; break; } - return (RAM (g)[xyaddr (x, y)] & xybit (y)) ? White : Black; + return (RAM (g)[xyaddr (x, y)] & xybit (y)) ? GFX_WHITE : GFX_BLACK; } #endif diff --git a/drivers/gdisp/ST7565/gdisp_lld_ST7565.c b/drivers/gdisp/ST7565/gdisp_lld_ST7565.c index fff1a37a..ed98a6fa 100644 --- a/drivers/gdisp/ST7565/gdisp_lld_ST7565.c +++ b/drivers/gdisp/ST7565/gdisp_lld_ST7565.c @@ -187,7 +187,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { y = g->p.x; break; } - if (gdispColor2Native(g->p.color) != Black) + if (gdispColor2Native(g->p.color) != GFX_BLACK) RAM(g)[xyaddr(x, y)] |= xybit(y); else RAM(g)[xyaddr(x, y)] &= ~xybit(y); @@ -218,7 +218,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { x = g->p.x; break; } - return (RAM(g)[xyaddr(x, y)] & xybit(y)) ? White : Black; + return (RAM(g)[xyaddr(x, y)] & xybit(y)) ? GFX_WHITE : GFX_BLACK; } #endif diff --git a/drivers/gdisp/TLS8204/gdisp_lld_TLS8204.c b/drivers/gdisp/TLS8204/gdisp_lld_TLS8204.c index aa7738ba..3157eb73 100644 --- a/drivers/gdisp/TLS8204/gdisp_lld_TLS8204.c +++ b/drivers/gdisp/TLS8204/gdisp_lld_TLS8204.c @@ -160,7 +160,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { y = g->p.y; #endif - if (g->p.color != Black) { + if (g->p.color != GFX_BLACK) { RAM(g)[xyaddr(x, y)] |= xybit(y); } else { RAM(g)[xyaddr(x, y)] &= ~xybit(y); @@ -193,7 +193,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { y = g->p.x; break; } - return (RAM(g)[xyaddr(x, y)] & xybit(y)) ? White : Black; + return (RAM(g)[xyaddr(x, y)] & xybit(y)) ? GFX_WHITE : GFX_BLACK; } #endif diff --git a/drivers/gdisp/UC1601s/gdisp_lld_UC1601s.c b/drivers/gdisp/UC1601s/gdisp_lld_UC1601s.c index cd538628..a6d15c26 100644 --- a/drivers/gdisp/UC1601s/gdisp_lld_UC1601s.c +++ b/drivers/gdisp/UC1601s/gdisp_lld_UC1601s.c @@ -165,7 +165,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { y = g->p.y; #endif - if (gdispColor2Native(g->p.color) != Black) { + if (gdispColor2Native(g->p.color) != GFX_BLACK) { RAM(g)[xyaddr(x, y)] |= xybit(y); } else { RAM(g)[xyaddr(x, y)] &= ~xybit(y); @@ -198,7 +198,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { y = g->p.x; break; } - return (RAM(g)[xyaddr(x, y)] & xybit(y)) ? White : Black; + return (RAM(g)[xyaddr(x, y)] & xybit(y)) ? GFX_WHITE : GFX_BLACK; } #endif diff --git a/drivers/multiple/Win32/gdisp_lld_Win32.c b/drivers/multiple/Win32/gdisp_lld_Win32.c index 0ce0f25a..10818269 100644 --- a/drivers/multiple/Win32/gdisp_lld_Win32.c +++ b/drivers/multiple/Win32/gdisp_lld_Win32.c @@ -61,9 +61,11 @@ #define DISPLAY_Y_OFFSET 50 // Oops - name clashes with Win32 symbols -#undef Red -#undef Green -#undef Blue +#if GFX_COMPAT_V2 && GFX_COMPAT_OLDCOLORS + #undef Red + #undef Green + #undef Blue +#endif #define WIN32_LEAN_AND_MEAN #include -- cgit v1.2.3