diff options
| author | Joel Bodenmann <info@b-electronics.ch> | 2018-09-27 14:01:37 +0200 |
|---|---|---|
| committer | Gogs <gogs@fake.local> | 2018-09-27 14:01:37 +0200 |
| commit | df0200c0f9662b51b4e9b5cfa0ab7e222c3b7a48 (patch) | |
| tree | ca57036ae8c2baa469908b1e69f912a0209773d1 | |
| parent | 330f891081dbd755063767a25f39c517fbe5c432 (diff) | |
| parent | 601d8f893ddee7296f24fee47f401c1be2b4c4e9 (diff) | |
| download | uGFX-df0200c0f9662b51b4e9b5cfa0ab7e222c3b7a48.tar.gz uGFX-df0200c0f9662b51b4e9b5cfa0ab7e222c3b7a48.tar.bz2 uGFX-df0200c0f9662b51b4e9b5cfa0ab7e222c3b7a48.zip | |
Merge branch 'hotfix/color' of XenotriX/uGFX into master
| -rw-r--r-- | src/gdisp/gdisp_colors.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gdisp/gdisp_colors.h b/src/gdisp/gdisp_colors.h index 5ee49801..1629c076 100644 --- a/src/gdisp/gdisp_colors.h +++ b/src/gdisp/gdisp_colors.h @@ -83,15 +83,15 @@ typedef uint16_t gColorformat; #define GFX_WHITE HTML2COLOR(0xFFFFFF) #define GFX_BLACK HTML2COLOR(0x000000) #define GFX_GRAY HTML2COLOR(0x808080) -#define GFX_GREY GFXGRAY +#define GFX_GREY GFX_GRAY #define GFX_BLUE HTML2COLOR(0x0000FF) #define GFX_RED HTML2COLOR(0xFF0000) #define GFX_FUCHSIA HTML2COLOR(0xFF00FF) -#define GFX_MAGENTA GFXFUCHSIA +#define GFX_MAGENTA GFX_FUCHSIA #define GFX_GREEN HTML2COLOR(0x008000) #define GFX_YELLOW HTML2COLOR(0xFFFF00) #define GFX_AQUA HTML2COLOR(0x00FFFF) -#define GFX_CYAN GFXAQUA +#define GFX_CYAN GFX_AQUA #define GFX_LIME HTML2COLOR(0x00FF00) #define GFX_MAROON HTML2COLOR(0x800000) #define GFX_NAVY HTML2COLOR(0x000080) |