From 086dac4444849a94bbeffa5842412bf5881e6113 Mon Sep 17 00:00:00 2001 From: Ajith P Venugopal Date: Wed, 12 Sep 2018 15:38:58 +0530 Subject: [PATCH] Ordered the colors and fixed the typo The color definitions are ordered according to the HTML color names (https://en.wikipedia.org/wiki/Web_colors). Fixed the typo of the color maroon --- lv_misc/lv_color.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/lv_misc/lv_color.h b/lv_misc/lv_color.h index d0e0027b5..76ed4b49f 100644 --- a/lv_misc/lv_color.h +++ b/lv_misc/lv_color.h @@ -20,23 +20,23 @@ extern "C" { /********************* * DEFINES *********************/ -#define LV_COLOR_BLACK LV_COLOR_MAKE(0x00,0x00,0x00) #define LV_COLOR_WHITE LV_COLOR_MAKE(0xFF,0xFF,0xFF) -#define LV_COLOR_RED LV_COLOR_MAKE(0xFF,0x00,0x00) -#define LV_COLOR_LIME LV_COLOR_MAKE(0x00,0xFF,0x00) -#define LV_COLOR_BLUE LV_COLOR_MAKE(0x00,0x00,0xFF) -#define LV_COLOR_YELLOW LV_COLOR_MAKE(0xFF,0xFF,0x00) -#define LV_COLOR_CYAN LV_COLOR_MAKE(0x00,0xFF,0xFF) -#define LV_COLOR_AQUA LV_COLOR_CYAN -#define LV_COLOR_MAGENTA LV_COLOR_MAKE(0xFF,0x00,0xFF) #define LV_COLOR_SILVER LV_COLOR_MAKE(0xC0,0xC0,0xC0) #define LV_COLOR_GRAY LV_COLOR_MAKE(0x80,0x80,0x80) -#define LV_COLOR_MARRON LV_COLOR_MAKE(0x80,0x00,0x00) +#define LV_COLOR_BLACK LV_COLOR_MAKE(0x00,0x00,0x00) +#define LV_COLOR_RED LV_COLOR_MAKE(0xFF,0x00,0x00) +#define LV_COLOR_MAROON LV_COLOR_MAKE(0x80,0x00,0x00) +#define LV_COLOR_YELLOW LV_COLOR_MAKE(0xFF,0xFF,0x00) #define LV_COLOR_OLIVE LV_COLOR_MAKE(0x80,0x80,0x00) +#define LV_COLOR_LIME LV_COLOR_MAKE(0x00,0xFF,0x00) #define LV_COLOR_GREEN LV_COLOR_MAKE(0x00,0x80,0x00) -#define LV_COLOR_PURPLE LV_COLOR_MAKE(0x80,0x00,0x80) +#define LV_COLOR_CYAN LV_COLOR_MAKE(0x00,0xFF,0xFF) +#define LV_COLOR_AQUA LV_COLOR_CYAN #define LV_COLOR_TEAL LV_COLOR_MAKE(0x00,0x80,0x80) +#define LV_COLOR_BLUE LV_COLOR_MAKE(0x00,0x00,0xFF) #define LV_COLOR_NAVY LV_COLOR_MAKE(0x00,0x00,0x80) +#define LV_COLOR_MAGENTA LV_COLOR_MAKE(0xFF,0x00,0xFF) +#define LV_COLOR_PURPLE LV_COLOR_MAKE(0x80,0x00,0x80) #define LV_COLOR_ORANGE LV_COLOR_MAKE(0xFF,0xA5,0x00) #define LV_OPA_TRANSP 0