glcdsetup: use beautiful material colors palette

Origin commit data
------------------
Commit: 506f099ad9
Author: vanhofen <vanhofen@gmx.de>
Date: 2020-06-13 (Sat, 13 Jun 2020)

Origin message was:
------------------
- glcdsetup: use beautiful material colors palette
This commit is contained in:
vanhofen
2020-06-13 12:56:03 +02:00
parent 24ce5b8e1e
commit acc71cfd40
6 changed files with 117 additions and 94 deletions

View File

@@ -39,42 +39,50 @@
#define KEY_GLCD_BLACK 0
#define KEY_GLCD_WHITE 1
#define KEY_GLCD_RED 2
#define KEY_GLCD_GREEN 3
#define KEY_GLCD_BLUE 4
#define KEY_GLCD_MAGENTA 5
#define KEY_GLCD_CYAN 6
#define KEY_GLCD_YELLOW 7
#define KEY_GLCD_ORANGE 8
#define KEY_GLCD_LIGHT_GRAY 9
#define KEY_GLCD_GRAY 10
#define KEY_GLCD_DARK_GRAY 11
#define KEY_GLCD_DARK_RED 12
#define KEY_GLCD_DARK_GREEN 13
#define KEY_GLCD_DARK_BLUE 14
#define KEY_GLCD_PURPLE 15
#define KEY_GLCD_MINT 16
#define KEY_GLCD_GOLDEN 17
#define GLCD_COLOR_OPTION_COUNT 18
#define KEY_GLCD_PINK 3
#define KEY_GLCD_PURPLE 4
#define KEY_GLCD_DEEPPURPLE 5
#define KEY_GLCD_INDIGO 6
#define KEY_GLCD_BLUE 7
#define KEY_GLCD_LIGHTBLUE 8
#define KEY_GLCD_CYAN 9
#define KEY_GLCD_TEAL 10
#define KEY_GLCD_GREEN 11
#define KEY_GLCD_LIGHTGREEN 12
#define KEY_GLCD_LIME 13
#define KEY_GLCD_YELLOW 14
#define KEY_GLCD_AMBER 15
#define KEY_GLCD_ORANGE 16
#define KEY_GLCD_DEEPORANGE 17
#define KEY_GLCD_BROWN 18
#define KEY_GLCD_GRAY 19
#define KEY_GLCD_BLUEGRAY 20
#define GLCD_COLOR_OPTION_COUNT 21
static const CMenuOptionChooser::keyval GLCD_COLOR_OPTIONS[GLCD_COLOR_OPTION_COUNT] =
{
{ KEY_GLCD_BLACK, LOCALE_GLCD_COLOR_BLACK },
{ KEY_GLCD_WHITE, LOCALE_GLCD_COLOR_WHITE },
{ KEY_GLCD_RED, LOCALE_GLCD_COLOR_RED },
{ KEY_GLCD_GREEN, LOCALE_GLCD_COLOR_GREEN },
{ KEY_GLCD_BLUE, LOCALE_GLCD_COLOR_BLUE },
{ KEY_GLCD_MAGENTA, LOCALE_GLCD_COLOR_MAGENTA },
{ KEY_GLCD_CYAN, LOCALE_GLCD_COLOR_CYAN },
{ KEY_GLCD_YELLOW, LOCALE_GLCD_COLOR_YELLOW },
{ KEY_GLCD_ORANGE, LOCALE_GLCD_COLOR_ORANGE },
{ KEY_GLCD_LIGHT_GRAY, LOCALE_GLCD_COLOR_LIGHT_GRAY },
{ KEY_GLCD_GRAY, LOCALE_GLCD_COLOR_GRAY },
{ KEY_GLCD_DARK_GRAY, LOCALE_GLCD_COLOR_DARK_GRAY },
{ KEY_GLCD_DARK_RED, LOCALE_GLCD_COLOR_DARK_RED },
{ KEY_GLCD_DARK_GREEN, LOCALE_GLCD_COLOR_DARK_GREEN },
{ KEY_GLCD_DARK_BLUE, LOCALE_GLCD_COLOR_DARK_BLUE },
{ KEY_GLCD_PINK, LOCALE_GLCD_COLOR_PINK },
{ KEY_GLCD_PURPLE, LOCALE_GLCD_COLOR_PURPLE },
{ KEY_GLCD_MINT, LOCALE_GLCD_COLOR_MINT },
{ KEY_GLCD_GOLDEN, LOCALE_GLCD_COLOR_GOLDEN }
{ KEY_GLCD_DEEPPURPLE, LOCALE_GLCD_COLOR_DEEPPURPLE },
{ KEY_GLCD_INDIGO, LOCALE_GLCD_COLOR_INDIGO },
{ KEY_GLCD_BLUE, LOCALE_GLCD_COLOR_BLUE },
{ KEY_GLCD_LIGHTBLUE, LOCALE_GLCD_COLOR_LIGHTBLUE },
{ KEY_GLCD_CYAN, LOCALE_GLCD_COLOR_CYAN },
{ KEY_GLCD_TEAL, LOCALE_GLCD_COLOR_TEAL },
{ KEY_GLCD_GREEN, LOCALE_GLCD_COLOR_GREEN },
{ KEY_GLCD_LIGHTGREEN, LOCALE_GLCD_COLOR_LIGHTGREEN },
{ KEY_GLCD_LIME, LOCALE_GLCD_COLOR_LIME },
{ KEY_GLCD_YELLOW, LOCALE_GLCD_COLOR_YELLOW },
{ KEY_GLCD_AMBER, LOCALE_GLCD_COLOR_AMBER },
{ KEY_GLCD_ORANGE, LOCALE_GLCD_COLOR_ORANGE },
{ KEY_GLCD_DEEPORANGE, LOCALE_GLCD_COLOR_DEEPORANGE },
{ KEY_GLCD_BROWN, LOCALE_GLCD_COLOR_BROWN },
{ KEY_GLCD_GRAY, LOCALE_GLCD_COLOR_GRAY },
{ KEY_GLCD_BLUEGRAY, LOCALE_GLCD_COLOR_BLUEGRAY },
};
static const uint32_t colormap[GLCD_COLOR_OPTION_COUNT] =
@@ -82,21 +90,24 @@ static const uint32_t colormap[GLCD_COLOR_OPTION_COUNT] =
GLCD::cColor::Black,
GLCD::cColor::White,
GLCD::cColor::Red,
GLCD::cColor::Green,
GLCD::cColor::Blue,
GLCD::cColor::Magenta,
GLCD::cColor::Cyan,
GLCD::cColor::Yellow,
GLCD::cColor::Orange,
GLCD::cColor::Light_Gray,
GLCD::cColor::Gray,
GLCD::cColor::Dark_Gray,
GLCD::cColor::Dark_Red,
GLCD::cColor::Dark_Green,
GLCD::cColor::Dark_Blue,
GLCD::cColor::Pink,
GLCD::cColor::Purple,
GLCD::cColor::Mint,
GLCD::cColor::Golden
GLCD::cColor::DeepPurple,
GLCD::cColor::Indigo,
GLCD::cColor::Blue,
GLCD::cColor::LightBlue,
GLCD::cColor::Cyan,
GLCD::cColor::Teal,
GLCD::cColor::Green,
GLCD::cColor::LightGreen,
GLCD::cColor::Lime,
GLCD::cColor::Yellow,
GLCD::cColor::Amber,
GLCD::cColor::Orange,
GLCD::cColor::DeepOrange,
GLCD::cColor::Brown,
GLCD::cColor::Gray,
GLCD::cColor::BlueGray
};
int GLCD_Menu::color2index(uint32_t color) {