uGFX/ugfx
2
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

Merge branch 'hotfix/color' of XenotriX/uGFX into master

Browse Source
This commit is contained in:
Joel Bodenmann 2018-09-27 14:01:37 +02:00 committed by Gogs
commit df0200c0f9
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/gdisp/gdisp_colors.h
View File

@ -83,15 +83,15 @@ typedef uint16_t gColorformat;
#define GFX_WHITE HTML2COLOR(0xFFFFFF) #define GFX_WHITE HTML2COLOR(0xFFFFFF)
#define GFX_BLACK HTML2COLOR(0x000000) #define GFX_BLACK HTML2COLOR(0x000000)
#define GFX_GRAY HTML2COLOR(0x808080) #define GFX_GRAY HTML2COLOR(0x808080)
#define GFX_GREY GFXGRAY #define GFX_GREY GFX_GRAY
#define GFX_BLUE HTML2COLOR(0x0000FF) #define GFX_BLUE HTML2COLOR(0x0000FF)
#define GFX_RED HTML2COLOR(0xFF0000) #define GFX_RED HTML2COLOR(0xFF0000)
#define GFX_FUCHSIA HTML2COLOR(0xFF00FF) #define GFX_FUCHSIA HTML2COLOR(0xFF00FF)
#define GFX_MAGENTA GFXFUCHSIA #define GFX_MAGENTA GFX_FUCHSIA
#define GFX_GREEN HTML2COLOR(0x008000) #define GFX_GREEN HTML2COLOR(0x008000)
#define GFX_YELLOW HTML2COLOR(0xFFFF00) #define GFX_YELLOW HTML2COLOR(0xFFFF00)
#define GFX_AQUA HTML2COLOR(0x00FFFF) #define GFX_AQUA HTML2COLOR(0x00FFFF)
#define GFX_CYAN GFXAQUA #define GFX_CYAN GFX_AQUA
#define GFX_LIME HTML2COLOR(0x00FF00) #define GFX_LIME HTML2COLOR(0x00FF00)
#define GFX_MAROON HTML2COLOR(0x800000) #define GFX_MAROON HTML2COLOR(0x800000)
#define GFX_NAVY HTML2COLOR(0x000080) #define GFX_NAVY HTML2COLOR(0x000080)