kuba/TEF6686_ESP32
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

Merge pull request #178 from MCelliotG/main

Browse Source 
Themes optimizations, added new theme, small UI adjustments
This commit is contained in:
Sjef Verhoeven PE5PVB
2023-08-03 09:44:49 +02:00
committed by GitHub
parent c0ade96758 6fd7a5f02c
commit 4c27b372cc
3 changed files with 165 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TEF6686_ESP32.ino
+122 -97
View File
@@ -2605,7 +2605,7 @@ void KeyUp() {
switch (menuoption) { switch (menuoption) {
case 30: case 30:
CurrentTheme ++; CurrentTheme ++;
if (CurrentTheme > 9) CurrentTheme = 0; if (CurrentTheme > 10) CurrentTheme = 0;
doTheme(); doTheme();
tft.drawRoundRect(10, 30, 300, 170, 5, ActiveColor); tft.drawRoundRect(10, 30, 300, 170, 5, ActiveColor);
tft.fillRoundRect(12, 32, 296, 166, 5, BackgroundColor); tft.fillRoundRect(12, 32, 296, 166, 5, BackgroundColor);
@@ -3023,7 +3023,7 @@ void KeyDown() {
switch (menuoption) { switch (menuoption) {
case 30: case 30:
CurrentTheme --; CurrentTheme --;
if (CurrentTheme > 9) CurrentTheme = 9; if (CurrentTheme > 10) CurrentTheme = 9;
doTheme(); doTheme();
tft.drawRoundRect(10, 30, 300, 170, 5, ActiveColor); tft.drawRoundRect(10, 30, 300, 170, 5, ActiveColor);
tft.fillRoundRect(12, 32, 296, 166, 5, BackgroundColor); tft.fillRoundRect(12, 32, 296, 166, 5, BackgroundColor);
@@ -3748,8 +3748,8 @@ void BuildMenu() {
tft.fillScreen(BackgroundColor); tft.fillScreen(BackgroundColor);
tft.drawRect(0, 0, 320, 240, FrameColor); tft.drawRect(0, 0, 320, 240, FrameColor);
tft.drawLine(0, 23, 320, 23, FrameColor); tft.drawLine(0, 23, 320, 23, FrameColor);
tftPrint(-1, myLanguage[language][41], 10, 7, PrimaryColor, PrimaryColorSmooth, FONT16); tftPrint(-1, myLanguage[language][41], 4, 7, PrimaryColor, PrimaryColorSmooth, FONT16);
tftPrint(1, String(menupage) + "/" + String(menupagestotal), 305, 7, ActiveColor, ActiveColorSmooth, FONT16); tftPrint(1, String(menupage) + "/" + String(menupagestotal), 314, 7, ActiveColor, ActiveColorSmooth, FONT16);
tft.drawRoundRect(8, menuoption + 3, 302, 21, 5, ActiveColor); tft.drawRoundRect(8, menuoption + 3, 302, 21, 5, ActiveColor);
switch (menupage) { switch (menupage) {
case 1: case 1:
@@ -4155,13 +4155,13 @@ void BuildDisplay() {
for (byte segments = 0; segments < 94; segments++) { for (byte segments = 0; segments < 94; segments++) {
if (segments > 54) { if (segments > 54) {
if (((segments - 53) % 10) == 0) { if (((segments - 53) % 10) == 0) {
tft.fillRect(16 + (2 * segments), 112, 2, 2, SignificantColor); tft.fillRect(16 + (2 * segments), 112, 2, 2, BarSignificantColor);
if (!showmodulation) tft.fillRect(16 + (2 * segments), 141, 2, 2, GreyoutColor); else tft.fillRect(16 + (2 * segments), 141, 2, 2, SignificantColor); if (!showmodulation) tft.fillRect(16 + (2 * segments), 141, 2, 2, GreyoutColor); else tft.fillRect(16 + (2 * segments), 141, 2, 2, BarSignificantColor);
} }
} else { } else {
if (((segments + 1) % 6) == 0) { if (((segments + 1) % 6) == 0) {
tft.fillRect(16 + (2 * segments), 112, 2, 2, InsignificantColor); tft.fillRect(16 + (2 * segments), 112, 2, 2, BarInsignificantColor);
if (!showmodulation) tft.fillRect(16 + (2 * segments), 141, 2, 2, GreyoutColor); else tft.fillRect(16 + (2 * segments), 141, 2, 2, InsignificantColor); if (!showmodulation) tft.fillRect(16 + (2 * segments), 141, 2, 2, GreyoutColor); else tft.fillRect(16 + (2 * segments), 141, 2, 2, BarInsignificantColor);
} }
} }
} }
@@ -5764,26 +5764,26 @@ void SetTunerPatch() {
void doTheme() { // Use this to put your own colors in: http://www.barth-dev.de/online/rgb565-color-picker/ void doTheme() { // Use this to put your own colors in: http://www.barth-dev.de/online/rgb565-color-picker/
switch (CurrentTheme) { switch (CurrentTheme) {
case 0: // Default PE5PVB theme case 0: // Default PE5PVB theme
PrimaryColor = 0xFFE0; PrimaryColor = TFT_YELLOW;
PrimaryColorSmooth = 0x2120; PrimaryColorSmooth = 0x2120;
SecondaryColor = 0x867D; SecondaryColor = TFT_SKYBLUE;
SecondaryColorSmooth = 0x10E4; SecondaryColorSmooth = 0x10E4;
FrequencyColor = 0xFFE0; FrequencyColor = TFT_YELLOW;
FrameColor = 0x001F ; FrameColor = TFT_BLUE;
GreyoutColor = 0x38E7; GreyoutColor = 0x39A7;
BackgroundColor = 0x0000; BackgroundColor = TFT_BLACK;
ActiveColor = 0xFFFF; ActiveColor = TFT_WHITE;
ActiveColorSmooth = 0x18E3; ActiveColorSmooth = 0x18E3;
SignificantColor = 0xF800; SignificantColor = TFT_RED;
SignificantColorSmooth = 0x2000; SignificantColorSmooth = 0x2000;
InsignificantColor = 0x07E0; InsignificantColor = TFT_GREEN;
InsignificantColorSmooth = 0x00C0; InsignificantColorSmooth = 0x00C0;
StereoColor = 0xF800; StereoColor = TFT_RED;
StereoColorSmooth = 0x2000; StereoColorSmooth = 0x2000;
RDSColor = 0xFFE0; RDSColor = TFT_YELLOW;
RDSColorSmooth = 0x2120; RDSColorSmooth = 0x2120;
BarSignificantColor = 0xF800; BarSignificantColor = TFT_RED;
BarInsignificantColor = 0x07E0; BarInsignificantColor = TFT_GREEN;
BWAutoColor = 0x07F7; BWAutoColor = 0x07F7;
BWAutoColorSmooth = 0x0144; BWAutoColorSmooth = 0x0144;
CurrentThemeString = myLanguage[language][78]; CurrentThemeString = myLanguage[language][78];
@@ -5791,23 +5791,23 @@ void doTheme() { // Use this to put your own colors in: http://www.barth-dev.de
case 1: // Cyan theme case 1: // Cyan theme
PrimaryColor = 0x0F3F; PrimaryColor = 0x0F3F;
PrimaryColorSmooth = 0x0105; PrimaryColorSmooth = 0x0105;
SecondaryColor = 0x867D; SecondaryColor = TFT_SKYBLUE;
SecondaryColorSmooth = 0x10E4; SecondaryColorSmooth = 0x10E4;
FrequencyColor = 0x0F3F; FrequencyColor = 0x0F3F;
FrameColor = 0x01e9; FrameColor = 0x01e9;
GreyoutColor = 0x4A69; GreyoutColor = 0x4A69;
BackgroundColor = 0x0000; BackgroundColor = TFT_BLACK;
ActiveColor = 0xFFFF; ActiveColor = TFT_WHITE;
ActiveColorSmooth = 0x18E3; ActiveColorSmooth = 0x18E3;
SignificantColor = 0xF800; SignificantColor = TFT_RED;
SignificantColorSmooth = 0x2000; SignificantColorSmooth = 0x2000;
InsignificantColor = 0x07E0; InsignificantColor = TFT_GREEN;
InsignificantColorSmooth = 0x00C0; InsignificantColorSmooth = 0x00C0;
StereoColor = 0x0F3F; StereoColor = 0x0F3F;
StereoColorSmooth = 0x0105; StereoColorSmooth = 0x0105;
RDSColor = 0x0F3F; RDSColor = 0x0F3F;
RDSColorSmooth = 0x0105; RDSColorSmooth = 0x0105;
BarSignificantColor = 0xF800; BarSignificantColor = TFT_RED;
BarInsignificantColor = 0x0F3F; BarInsignificantColor = 0x0F3F;
BWAutoColor = 0x07F7; BWAutoColor = 0x07F7;
BWAutoColorSmooth = 0x0144; BWAutoColorSmooth = 0x0144;
@@ -5816,74 +5816,74 @@ void doTheme() { // Use this to put your own colors in: http://www.barth-dev.de
case 2: // Crimson theme case 2: // Crimson theme
PrimaryColor = 0xF8C3; PrimaryColor = 0xF8C3;
PrimaryColorSmooth = 0x3800; PrimaryColorSmooth = 0x3800;
SecondaryColor = 0x867D; SecondaryColor = TFT_SKYBLUE;
SecondaryColorSmooth = 0x10E4; SecondaryColorSmooth = 0x10E4;
FrequencyColor = 0xF8C3; FrequencyColor = 0xF8C3;
FrameColor = 0x3800; FrameColor = 0x3800;
GreyoutColor = 0x4A69; GreyoutColor = 0x4A69;
BackgroundColor = 0x0000; BackgroundColor = TFT_BLACK;
ActiveColor = 0xFFFF; ActiveColor = TFT_WHITE;
ActiveColorSmooth = 0x18E3; ActiveColorSmooth = 0x18E3;
SignificantColor = 0xF800; SignificantColor = TFT_RED;
SignificantColorSmooth = 0x2000; SignificantColorSmooth = 0x2000;
InsignificantColor = 0x07E0; InsignificantColor = TFT_GREEN;
InsignificantColorSmooth = 0x00C0; InsignificantColorSmooth = 0x00C0;
StereoColor = 0xF8C3; StereoColor = 0xF8C3;
StereoColorSmooth = 0x0000; StereoColorSmooth = TFT_BLACK;
RDSColor = 0xF8C3; RDSColor = 0xF8C3;
RDSColorSmooth = 0x0000; RDSColorSmooth = TFT_BLACK;
BarSignificantColor = 0xF800; BarSignificantColor = TFT_YELLOW;
BarInsignificantColor = 0x07E0; BarInsignificantColor = 0xF8C3;
BWAutoColor = 0x07F7; BWAutoColor = 0x07F7;
BWAutoColorSmooth = 0x0144; BWAutoColorSmooth = 0x0144;
CurrentThemeString = myLanguage[language][80]; CurrentThemeString = myLanguage[language][80];
break; break;
case 3: // Monochrome theme case 3: // Monochrome theme
PrimaryColor = 0xFFFF; PrimaryColor = TFT_WHITE;
PrimaryColorSmooth = 0x0000; PrimaryColorSmooth = TFT_BLACK;
SecondaryColor = 0x867D; SecondaryColor = TFT_SKYBLUE;
SecondaryColorSmooth = 0x10E4; SecondaryColorSmooth = 0x10E4;
FrequencyColor = 0xFFFF; FrequencyColor = TFT_WHITE;
FrameColor = 0x2965; FrameColor = 0x2965;
GreyoutColor = 0x4A69; GreyoutColor = 0x4A69;
BackgroundColor = 0x0000; BackgroundColor = TFT_BLACK;
ActiveColor = 0xFFFF; ActiveColor = TFT_WHITE;
ActiveColorSmooth = 0x0000; ActiveColorSmooth = TFT_BLACK;
SignificantColor = 0xF800; SignificantColor = TFT_RED;
SignificantColorSmooth = 0x2000; SignificantColorSmooth = 0x2000;
InsignificantColor = 0x07E0; InsignificantColor = TFT_GREEN;
InsignificantColorSmooth = 0x00C0; InsignificantColorSmooth = 0x00C0;
StereoColor = 0xFFFF; StereoColor = TFT_WHITE;
StereoColorSmooth = 0x0000; StereoColorSmooth = TFT_BLACK;
RDSColor = 0xFFFF; RDSColor = TFT_WHITE;
RDSColorSmooth = 0x0000; RDSColorSmooth = TFT_BLACK;
BarSignificantColor = 0xF8C3; BarSignificantColor = TFT_RED;
BarInsignificantColor = 0x07E0; BarInsignificantColor = TFT_GREEN;
BWAutoColor = 0x7BCF; BWAutoColor = 0x7BCF;
BWAutoColorSmooth = 0x1082; BWAutoColorSmooth = 0x1082;
CurrentThemeString = myLanguage[language][81]; CurrentThemeString = myLanguage[language][81];
break; break;
case 4: // Volcano theme case 4: // Volcano theme
PrimaryColor = 0xFC00; PrimaryColor = TFT_ORANGE;
PrimaryColorSmooth = 0x2965; PrimaryColorSmooth = 0x2965;
SecondaryColor = 0x867D; SecondaryColor = TFT_SKYBLUE;
SecondaryColorSmooth = 0x10E4; SecondaryColorSmooth = 0x10E4;
FrequencyColor = 0xFC00; FrequencyColor = TFT_ORANGE;
FrameColor = 0x2965; FrameColor = 0x2965;
GreyoutColor = 0x5140; GreyoutColor = 0x5140;
BackgroundColor = 0x0806; BackgroundColor = 0x0806;
ActiveColor = 0xFFFF; ActiveColor = TFT_WHITE;
ActiveColorSmooth = 0x18E3; ActiveColorSmooth = 0x18E3;
SignificantColor = 0xF800; SignificantColor = TFT_RED;
SignificantColorSmooth = 0x2000; SignificantColorSmooth = 0x2000;
InsignificantColor = 0x07E0; InsignificantColor = TFT_GREEN;
InsignificantColorSmooth = 0x00C0; InsignificantColorSmooth = 0x00C0;
StereoColor = 0xFC00; StereoColor = TFT_ORANGE;
StereoColorSmooth = 0x0105; StereoColorSmooth = 0x0105;
RDSColor = 0xFC00; RDSColor = TFT_ORANGE;
RDSColorSmooth = 0xFFFF; RDSColorSmooth = TFT_WHITE;
BarSignificantColor = 0xF800; BarSignificantColor = TFT_RED;
BarInsignificantColor = 0xFC00; BarInsignificantColor = TFT_ORANGE;
BWAutoColor = 0x07F7; BWAutoColor = 0x07F7;
BWAutoColorSmooth = 0x0144; BWAutoColorSmooth = 0x0144;
CurrentThemeString = myLanguage[language][82]; CurrentThemeString = myLanguage[language][82];
@@ -5891,23 +5891,23 @@ void doTheme() { // Use this to put your own colors in: http://www.barth-dev.de
case 5: // Dendro theme case 5: // Dendro theme
PrimaryColor = TFT_GREEN; PrimaryColor = TFT_GREEN;
PrimaryColorSmooth = 0x0200; PrimaryColorSmooth = 0x0200;
SecondaryColor = 0x867D; SecondaryColor = TFT_SKYBLUE;
SecondaryColorSmooth = 0x10E4; SecondaryColorSmooth = 0x10E4;
FrequencyColor = TFT_GREEN; FrequencyColor = TFT_GREEN;
FrameColor = 0x0200; FrameColor = 0x0200;
GreyoutColor = 0x4A69; GreyoutColor = 0x4A69;
BackgroundColor = 0x0000; BackgroundColor = TFT_BLACK;
ActiveColor = 0xFFFF; ActiveColor = TFT_WHITE;
ActiveColorSmooth = 0x18E3; ActiveColorSmooth = 0x18E3;
SignificantColor = 0xF800; SignificantColor = TFT_RED;
SignificantColorSmooth = 0x2000; SignificantColorSmooth = 0x2000;
InsignificantColor = 0x07E0; InsignificantColor = TFT_GREEN;
InsignificantColorSmooth = 0x00C0; InsignificantColorSmooth = 0x00C0;
StereoColor = TFT_GREEN; StereoColor = TFT_GREEN;
StereoColorSmooth = 0x0200; StereoColorSmooth = 0x0200;
RDSColor = TFT_GREEN; RDSColor = TFT_GREEN;
RDSColorSmooth = 0x0200; RDSColorSmooth = 0x0200;
BarSignificantColor = 0xF800; BarSignificantColor = TFT_RED;
BarInsignificantColor = TFT_GREEN; BarInsignificantColor = TFT_GREEN;
BWAutoColor = 0x07F7; BWAutoColor = 0x07F7;
BWAutoColorSmooth = 0x0144; BWAutoColorSmooth = 0x0144;
@@ -5916,49 +5916,49 @@ void doTheme() { // Use this to put your own colors in: http://www.barth-dev.de
case 6: // Sakura theme case 6: // Sakura theme
PrimaryColor = 0xF3D5; PrimaryColor = 0xF3D5;
PrimaryColorSmooth = 0x3008; PrimaryColorSmooth = 0x3008;
SecondaryColor = 0x867D; SecondaryColor = TFT_SKYBLUE;
SecondaryColorSmooth = 0x10E4; SecondaryColorSmooth = 0x10E4;
FrequencyColor = 0xF3D5; FrequencyColor = 0xF3D5;
FrameColor = 0x3845; FrameColor = 0x3845;
GreyoutColor = 0x4A69; GreyoutColor = 0x4A69;
BackgroundColor = 0x0000; BackgroundColor = TFT_BLACK;
ActiveColor = 0xFFFF; ActiveColor = TFT_WHITE;
ActiveColorSmooth = 0x18E3; ActiveColorSmooth = 0x18E3;
SignificantColor = 0xF800; SignificantColor = TFT_RED;
SignificantColorSmooth = 0x2000; SignificantColorSmooth = 0x2000;
InsignificantColor = 0x07E0; InsignificantColor = TFT_GREEN;
InsignificantColorSmooth = 0x00C0; InsignificantColorSmooth = 0x00C0;
StereoColor = 0xF3D5; StereoColor = 0xF3D5;
StereoColorSmooth = 0x3008; StereoColorSmooth = 0x3008;
RDSColor = 0xF3D5; RDSColor = 0xF3D5;
RDSColorSmooth = 0x3008; RDSColorSmooth = 0x3008;
BarSignificantColor = 0xF8C3; BarSignificantColor = TFT_RED;
BarInsignificantColor = 0xF3D5; BarInsignificantColor = 0xF3D5;
BWAutoColor = 0xF00A; BWAutoColor = 0xF00A;
BWAutoColorSmooth = 0x2802; BWAutoColorSmooth = 0x2802;
CurrentThemeString = myLanguage[language][84]; CurrentThemeString = myLanguage[language][84];
break; break;
case 7: // Whiteout theme case 7: // Whiteout theme
PrimaryColor = 0x0000; PrimaryColor = TFT_BLACK;
PrimaryColorSmooth = 0xDFFC; PrimaryColorSmooth = 0xDFFC;
SecondaryColor = 0x0000; SecondaryColor = TFT_BLACK;
SecondaryColorSmooth = 0xDFFC; SecondaryColorSmooth = 0xDFFC;
FrequencyColor = 0x18C3; FrequencyColor = 0x18C3;
FrameColor = 0x630C; FrameColor = 0x630C;
GreyoutColor = 0x9492; GreyoutColor = 0x9492;
BackgroundColor = 0xDFFC; BackgroundColor = 0xDFFC;
ActiveColor = 0x0000; ActiveColor = TFT_BLACK;
ActiveColorSmooth = 0xDFFC; ActiveColorSmooth = 0xDFFC;
SignificantColor = 0x0000; SignificantColor = TFT_BLACK;
SignificantColorSmooth = 0xDFFC; SignificantColorSmooth = 0xDFFC;
InsignificantColor = 0x07E0; InsignificantColor = TFT_GREEN;
InsignificantColorSmooth = 0x0140; InsignificantColorSmooth = 0x0140;
StereoColor = 0x0000; StereoColor = TFT_BLACK;
StereoColorSmooth = 0xDFFC; StereoColorSmooth = 0xDFFC;
RDSColor = 0x0000; RDSColor = TFT_BLACK;
RDSColorSmooth = 0xDFFC; RDSColorSmooth = 0xDFFC;
BarSignificantColor = 0x0000; BarSignificantColor = TFT_BLACK;
BarInsignificantColor = 0x07E0; BarInsignificantColor = TFT_GREEN;
BWAutoColor = 0x7BCF; BWAutoColor = 0x7BCF;
BWAutoColorSmooth = 0x1082; BWAutoColorSmooth = 0x1082;
CurrentThemeString = myLanguage[language][85]; CurrentThemeString = myLanguage[language][85];
@@ -5966,24 +5966,24 @@ void doTheme() { // Use this to put your own colors in: http://www.barth-dev.de
case 8: // Tangerine theme case 8: // Tangerine theme
PrimaryColor = 0xF980; PrimaryColor = 0xF980;
PrimaryColorSmooth = 0x3080; PrimaryColorSmooth = 0x3080;
SecondaryColor = 0x867D; SecondaryColor = TFT_SKYBLUE;
SecondaryColorSmooth = 0x10E4; SecondaryColorSmooth = 0x10E4;
FrequencyColor = 0xF980; FrequencyColor = 0xF980;
FrameColor = 0x38A1; FrameColor = 0x38A1;
GreyoutColor = 0x4A69; GreyoutColor = 0x4A69;
BackgroundColor = 0x0000; BackgroundColor = TFT_BLACK;
ActiveColor = 0xFFFF; ActiveColor = TFT_WHITE;
ActiveColorSmooth = 0x18E3; ActiveColorSmooth = 0x18E3;
SignificantColor = 0xF800; SignificantColor = TFT_RED;
SignificantColorSmooth = 0x2000; SignificantColorSmooth = 0x2000;
InsignificantColor = 0x07E0; InsignificantColor = TFT_GREEN;
InsignificantColorSmooth = 0x00C0; InsignificantColorSmooth = 0x00C0;
StereoColor = 0xF980; StereoColor = 0xF980;
StereoColorSmooth = 0x3080; StereoColorSmooth = 0x3080;
RDSColor = 0xF980; RDSColor = 0xF980;
RDSColorSmooth = 0x3080; RDSColorSmooth = 0x3080;
BarSignificantColor = 0xF8C3; BarSignificantColor = TFT_RED;
BarInsignificantColor = 0x07E0; BarInsignificantColor = TFT_GREEN;
BWAutoColor = 0x07F7; BWAutoColor = 0x07F7;
BWAutoColorSmooth = 0x0144; BWAutoColorSmooth = 0x0144;
CurrentThemeString = myLanguage[language][170]; CurrentThemeString = myLanguage[language][170];
@@ -5991,28 +5991,53 @@ void doTheme() { // Use this to put your own colors in: http://www.barth-dev.de
case 9: // Ocean theme case 9: // Ocean theme
PrimaryColor = 0x01FF; PrimaryColor = 0x01FF;
PrimaryColorSmooth = 0x0006; PrimaryColorSmooth = 0x0006;
SecondaryColor = 0x867D; SecondaryColor = TFT_SKYBLUE;
SecondaryColorSmooth = 0x10E4; SecondaryColorSmooth = 0x10E4;
FrequencyColor = 0x01FF; FrequencyColor = 0x01FF;
FrameColor = 0x0010; FrameColor = 0x0010;
GreyoutColor = 0x4A69; GreyoutColor = 0x08A8;
BackgroundColor = 0x0000; BackgroundColor = TFT_BLACK;
ActiveColor = 0xFFFF; ActiveColor = TFT_WHITE;
ActiveColorSmooth = 0x18E3; ActiveColorSmooth = 0x18E3;
SignificantColor = 0xF800; SignificantColor = TFT_RED;
SignificantColorSmooth = 0x2000; SignificantColorSmooth = 0x2000;
InsignificantColor = 0x07E0; InsignificantColor = TFT_GREEN;
InsignificantColorSmooth = 0x00C0; InsignificantColorSmooth = 0x00C0;
StereoColor = 0x01FF; StereoColor = 0x01FF;
StereoColorSmooth = 0x0006; StereoColorSmooth = 0x0006;
RDSColor = 0x01FF; RDSColor = 0x01FF;
RDSColorSmooth = 0x0006; RDSColorSmooth = 0x0006;
BarSignificantColor = 0xF8C3; BarSignificantColor = TFT_RED;
BarInsignificantColor = 0x01FF; BarInsignificantColor = 0x01FF;
BWAutoColor = 0x07F7; BWAutoColor = 0x07F7;
BWAutoColorSmooth = 0x0144; BWAutoColorSmooth = 0x0144;
CurrentThemeString = myLanguage[language][171]; CurrentThemeString = myLanguage[language][171];
break; break;
case 10: // Indigo theme
PrimaryColor = 0x881F;
PrimaryColorSmooth = 0x2007;
SecondaryColor = 0x9C96;
SecondaryColorSmooth = 0x41C8;
FrequencyColor = 0x881F;
FrameColor = 0x6016;
GreyoutColor = 0x300c;
BackgroundColor = TFT_BLACK;
ActiveColor = TFT_WHITE;
ActiveColorSmooth = 0x18E3;
SignificantColor = TFT_RED;
SignificantColorSmooth = 0x2000;
InsignificantColor = TFT_GREEN;
InsignificantColorSmooth = 0x00C0;
StereoColor = 0x881F;
StereoColorSmooth = 0x2007;
RDSColor = 0x881F;
RDSColorSmooth = 0x2007;
BarSignificantColor = TFT_RED;
BarInsignificantColor = 0x881F;
BWAutoColor = 0xD01F;
BWAutoColorSmooth = 0x400A;
CurrentThemeString = myLanguage[language][172];
break;
} }
} }
src/ARS_Colors.h
+9 -7
View File
@@ -1,8 +1,10 @@
#define TFT_BLACK 0x0000 /* 0, 0, 0 */ #define TFT_BLACK 0x0000 /* 0, 0, 0 */
#define TFT_DARKGREY 0x7BEF /* 128, 128, 128 */ #define TFT_DARKGREY 0x7BEF /* 15, 31, 15 */
#define TFT_BLUE 0xF800 /* 255, 0, 0 */ #define TFT_RED 0xF800 /* 31, 0, 0 */
#define TFT_GREEN 0x07E0 /* 0, 255, 0 */ #define TFT_GREEN 0x07E0 /* 0, 63, 0 */
#define TFT_RED 0x001F /* 0, 0, 255 */ #define TFT_BLUE 0x001F /* 0, 0, 31 */
#define TFT_YELLOW 0x07FF /* 0, 255, 255 */ #define TFT_YELLOW 0xFFE0 /* 31, 63, 0 */
#define TFT_WHITE 0xFFFF /* 255, 255, 255 */ #define TFT_CYAN 0x07FF /* 0, 63, 31 */
#define TFT_SKYBLUE 0x867D /* 235, 206, 135 */ #define TFT_WHITE 0xFFFF /* 31, 63, 31 */
#define TFT_SKYBLUE 0x867D /* 16, 51, 29 */
#define TFT_ORANGE 0xFC00 /* 31, 32, 0 */
src/language.h
+33 -18
View File
@@ -1,6 +1,6 @@
// [number of languages][number of texts][max. length of text] // [number of languages][number of texts][max. length of text]
static const char* const myLanguage[16][172] = { static const char* const myLanguage[16][173] = {
{ "English", // English { "English", // English
"Rotary direction changed", // 1 "Rotary direction changed", // 1
"Please release button", // 2 "Please release button", // 2
@@ -172,7 +172,8 @@ static const char* const myLanguage[16][172] = {
"Get data", // 168 "Get data", // 168
" ", // 169 " ", // 169
"Tangerine", // 170 "Tangerine", // 170
"Ocean" // 171 "Ocean", // 171
"Indigo" // 172
}, },
{ "Nederlands", // Dutch { "Nederlands", // Dutch
@@ -346,7 +347,8 @@ static const char* const myLanguage[16][172] = {
"Verkrijg data", // 168 "Verkrijg data", // 168
" ", // 169 " ", // 169
"Tangerine", // 170 "Tangerine", // 170
"Ocean" // 171 "Ocean", // 171
"Indigo" // 172
}, },
{ "Polski", // Polish { "Polski", // Polish
@@ -520,7 +522,8 @@ static const char* const myLanguage[16][172] = {
"Get data", // 168 "Get data", // 168
" ", // 169 " ", // 169
"Tangerine", // 170 "Tangerine", // 170
"Ocean" // 171 "Ocean", // 171
"Indigo" // 172
}, },
{ "Hrvatski", // Croatian { "Hrvatski", // Croatian
@@ -694,7 +697,8 @@ static const char* const myLanguage[16][172] = {
"Get data", // 168 "Get data", // 168
" ", // 169 " ", // 169
"Tangerine", // 170 "Tangerine", // 170
"Ocean" // 171 "Ocean", // 171
"Indigo" // 172
}, },
{ "Ελληνικά", // Greek { "Ελληνικά", // Greek
@@ -867,8 +871,9 @@ static const char* const myLanguage[16][172] = {
"Αγορά", // 167 "Αγορά", // 167
"Λήψη δεδομένων", // 168 "Λήψη δεδομένων", // 168
" ", // 169 " ", // 169
"Tangerine", // 170 "Μανταρινί", // 170
"Ocean" // 171 "Ωκεανός", // 171
"Ινδικό" // 172
}, },
{ "Romana", // Romanian { "Romana", // Romanian
@@ -1042,7 +1047,8 @@ static const char* const myLanguage[16][172] = {
"Get data", // 168 "Get data", // 168
" ", // 169 " ", // 169
"Tangerine", // 170 "Tangerine", // 170
"Ocean" // 171 "Ocean", // 171
"Indigo" // 172
}, },
{ "Deutsch", // German { "Deutsch", // German
@@ -1216,7 +1222,8 @@ static const char* const myLanguage[16][172] = {
"Get data", // 168 "Get data", // 168
" ", // 169 " ", // 169
"Tangerine", // 170 "Tangerine", // 170
"Ocean" // 171 "Ocean", // 171
"Indigo" // 172
}, },
{ "Czech", // Czech { "Czech", // Czech
@@ -1390,7 +1397,8 @@ static const char* const myLanguage[16][172] = {
"Get data", // 168 "Get data", // 168
" ", // 169 " ", // 169
"Tangerine", // 170 "Tangerine", // 170
"Ocean" // 171 "Ocean", // 171
"Indigo" // 172
}, },
{ "Slovak", // Slovak { "Slovak", // Slovak
@@ -1564,7 +1572,8 @@ static const char* const myLanguage[16][172] = {
"Get data", // 168 "Get data", // 168
" ", // 169 " ", // 169
"Tangerine", // 170 "Tangerine", // 170
"Ocean" // 171 "Ocean", // 171
"Indigo" // 172
}, },
{ "Français", // French { "Français", // French
@@ -1737,8 +1746,9 @@ static const char* const myLanguage[16][172] = {
"Achat", // 167 "Achat", // 167
"Obtenir des données", // 168 "Obtenir des données", // 168
" ", // 169 " ", // 169
"Tangerine", // 170 "Mandarine", // 170
"Ocean" // 171 "Océan", // 171
"Indigo" // 172
}, },
{ "Български", // Bulgarian { "Български", // Bulgarian
@@ -1912,7 +1922,8 @@ static const char* const myLanguage[16][172] = {
"Get data", // 168 "Get data", // 168
" ", // 169 " ", // 169
"Tangerine", // 170 "Tangerine", // 170
"Ocean" // 171 "Ocean", // 171
"Indigo" // 172
}, },
{ "Русский", // Russian { "Русский", // Russian
@@ -2086,7 +2097,8 @@ static const char* const myLanguage[16][172] = {
"Получить данные", // 168 "Получить данные", // 168
" ", // 169 " ", // 169
"Мандариновый", // 170 "Мандариновый", // 170
"Океан" // 171 "Океан", // 171
"Indigo" // 172
}, },
{ "Українська", // Ukranian { "Українська", // Ukranian
@@ -2260,7 +2272,8 @@ static const char* const myLanguage[16][172] = {
"Отримати дані", // 168 "Отримати дані", // 168
" ", // 169 " ", // 169
"Мандариновий", // 170 "Мандариновий", // 170
"Океан" // 171 "Океан", // 171
"Indigo" // 172
}, },
{ "Italiano", // Italian { "Italiano", // Italian
@@ -2434,7 +2447,8 @@ static const char* const myLanguage[16][172] = {
"Get data", // 168 "Get data", // 168
" ", // 169 " ", // 169
"Tangerine", // 170 "Tangerine", // 170
"Ocean" // 171 "Ocean", // 171
"Indigo" // 172
}, },
{ "Simplified Chinese", // Simplified Chinese { "Simplified Chinese", // Simplified Chinese
@@ -2608,7 +2622,8 @@ static const char* const myLanguage[16][172] = {
"Get data", // 168 "Get data", // 168
" ", // 169 " ", // 169
"桔红", // 170 "桔红", // 170
"海之蓝" // 171 "海之蓝", // 171
"Indigo" // 172
}, },
{ "Norsk", // Norwegian { "Norsk", // Norwegian