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

Merge pull request #193 from MCelliotG/main

Browse Source 
More theme fixes
This commit is contained in:
Sjef Verhoeven PE5PVB
2023-08-04 14:55:34 +02:00
committed by GitHub
parent 0362fd38b0 27a973259b
commit 395e5e8f92
1 changed files with 30 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TEF6686_ESP32.ino
+30 -28
View File
@@ -3589,7 +3589,7 @@ void ShowBattery() {
vPer = (batteryV - BATTERY_LOW_VALUE) / (BATTERY_FULL_VALUE - BATTERY_LOW_VALUE); vPer = (batteryV - BATTERY_LOW_VALUE) / (BATTERY_FULL_VALUE - BATTERY_LOW_VALUE);
if (vPer >= 1) vPer = 1; if (vPer >= 1) vPer = 1;
tftPrint(-1, String(vPer * 100, 0), 213, 163, BatteryValueColor, BatteryValueColorSmooth, FONT16); tftPrint(-1, String(vPer * 100, 0), 213, 163, BatteryValueColor, BatteryValueColorSmooth, FONT16);
tftPrint(-1, "%", 230, 163, PrimaryColor, PrimaryColorSmooth, FONT16); tftPrint(-1, "%", 230, 163, BatteryValueColor, BatteryValueColorSmooth, FONT16);
batteryPold = batteryV; batteryPold = batteryV;
} }
} }
@@ -4367,8 +4367,8 @@ 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 = TFT_SKYBLUE; SecondaryColor = 0x5BAF;
SecondaryColorSmooth = 0x10E4; SecondaryColorSmooth = 0x29E8;
FrequencyColor = 0x0F3F; FrequencyColor = 0x0F3F;
FrameColor = 0x01e9; FrameColor = 0x01e9;
GreyoutColor = 0x2A08; GreyoutColor = 0x2A08;
@@ -4394,8 +4394,8 @@ 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 = TFT_SKYBLUE; SecondaryColor = 0x6A08;
SecondaryColorSmooth = 0x10E4; SecondaryColorSmooth = 0x30E3;
FrequencyColor = 0xF8C3; FrequencyColor = 0xF8C3;
FrameColor = 0x3800; FrameColor = 0x3800;
GreyoutColor = 0x4A69; GreyoutColor = 0x4A69;
@@ -4412,17 +4412,17 @@ void doTheme() { // Use this to put your own colors in: http://www.barth-dev.de
RDSColorSmooth = TFT_BLACK; RDSColorSmooth = TFT_BLACK;
BarSignificantColor = TFT_YELLOW; BarSignificantColor = TFT_YELLOW;
BarInsignificantColor = 0xF8C3; BarInsignificantColor = 0xF8C3;
BWAutoColor = 0x07F7; BWAutoColor = 0xFBEF;
BWAutoColorSmooth = 0x0144; BWAutoColorSmooth = 0x4124;
BatteryValueColor = 0x07F7; BatteryValueColor = 0xFA8D;
BatteryValueColorSmooth = 0x0144; BatteryValueColorSmooth = 0x3083;
CurrentThemeString = myLanguage[language][80]; CurrentThemeString = myLanguage[language][80];
break; break;
case 3: // Monochrome theme case 3: // Monochrome theme
PrimaryColor = TFT_WHITE; PrimaryColor = TFT_WHITE;
PrimaryColorSmooth = TFT_BLACK; PrimaryColorSmooth = TFT_BLACK;
SecondaryColor = TFT_SKYBLUE; SecondaryColor = 0x7BCF;
SecondaryColorSmooth = 0x10E4; SecondaryColorSmooth = 0x1082;
FrequencyColor = TFT_WHITE; FrequencyColor = TFT_WHITE;
FrameColor = 0x2965; FrameColor = 0x2965;
GreyoutColor = 0x4A69; GreyoutColor = 0x4A69;
@@ -4448,8 +4448,8 @@ void doTheme() { // Use this to put your own colors in: http://www.barth-dev.de
case 4: // Volcano theme case 4: // Volcano theme
PrimaryColor = TFT_ORANGE; PrimaryColor = TFT_ORANGE;
PrimaryColorSmooth = 0x2965; PrimaryColorSmooth = 0x2965;
SecondaryColor = TFT_SKYBLUE; SecondaryColor = 0x6A86;
SecondaryColorSmooth = 0x10E4; SecondaryColorSmooth = 0x3123;
FrequencyColor = TFT_ORANGE; FrequencyColor = TFT_ORANGE;
FrameColor = 0x2965; FrameColor = 0x2965;
GreyoutColor = 0x5140; GreyoutColor = 0x5140;
@@ -4466,17 +4466,17 @@ void doTheme() { // Use this to put your own colors in: http://www.barth-dev.de
RDSColorSmooth = TFT_WHITE; RDSColorSmooth = TFT_WHITE;
BarSignificantColor = TFT_RED; BarSignificantColor = TFT_RED;
BarInsignificantColor = TFT_ORANGE; BarInsignificantColor = TFT_ORANGE;
BWAutoColor = 0x07F7; BWAutoColor = 0xF980;
BWAutoColorSmooth = 0x0144; BWAutoColorSmooth = 0x3080;
BatteryValueColor = 0x07F7; BatteryValueColor = 0xF980;
BatteryValueColorSmooth = 0x0144; BatteryValueColorSmooth = 0x3080;
CurrentThemeString = myLanguage[language][82]; CurrentThemeString = myLanguage[language][82];
break; break;
case 5: // Dendro theme case 5: // Dendro theme
PrimaryColor = TFT_GREEN; PrimaryColor = TFT_GREEN;
PrimaryColorSmooth = 0x0200; PrimaryColorSmooth = 0x0200;
SecondaryColor = TFT_SKYBLUE; SecondaryColor = 0x748E;
SecondaryColorSmooth = 0x10E4; SecondaryColorSmooth = 0x3206;
FrequencyColor = TFT_GREEN; FrequencyColor = TFT_GREEN;
FrameColor = 0x0200; FrameColor = 0x0200;
GreyoutColor = 0x4A69; GreyoutColor = 0x4A69;
@@ -4493,15 +4493,17 @@ void doTheme() { // Use this to put your own colors in: http://www.barth-dev.de
RDSColorSmooth = 0x0200; RDSColorSmooth = 0x0200;
BarSignificantColor = TFT_RED; BarSignificantColor = TFT_RED;
BarInsignificantColor = TFT_GREEN; BarInsignificantColor = TFT_GREEN;
BWAutoColor = 0x07F7; BWAutoColor = 0x07F6;
BWAutoColorSmooth = 0x0144; BWAutoColorSmooth = 0x0184;
BatteryValueColor = 0x07F6;
BatteryValueColorSmooth = 0x0184;
CurrentThemeString = myLanguage[language][83]; CurrentThemeString = myLanguage[language][83];
break; break;
case 6: // Sakura theme case 6: // Sakura theme
PrimaryColor = 0xF3D5; PrimaryColor = 0xF3D5;
PrimaryColorSmooth = 0x3008; PrimaryColorSmooth = 0x3008;
SecondaryColor = TFT_SKYBLUE; SecondaryColor = 0x9B90;
SecondaryColorSmooth = 0x10E4; SecondaryColorSmooth = 0x3946;
FrequencyColor = 0xF3D5; FrequencyColor = 0xF3D5;
FrameColor = 0x3845; FrameColor = 0x3845;
GreyoutColor = 0x38C5; GreyoutColor = 0x38C5;
@@ -4527,7 +4529,7 @@ void doTheme() { // Use this to put your own colors in: http://www.barth-dev.de
case 7: // Whiteout theme case 7: // Whiteout theme
PrimaryColor = TFT_BLACK; PrimaryColor = TFT_BLACK;
PrimaryColorSmooth = TFT_WHITE; PrimaryColorSmooth = TFT_WHITE;
SecondaryColor = TFT_BLACK; SecondaryColor = 0x9492;
SecondaryColorSmooth = TFT_WHITE; SecondaryColorSmooth = TFT_WHITE;
FrequencyColor = 0x18C3; FrequencyColor = 0x18C3;
FrameColor = 0x630C; FrameColor = 0x630C;
@@ -4554,8 +4556,8 @@ 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 = TFT_SKYBLUE; SecondaryColor = 0x9B8D;
SecondaryColorSmooth = 0x10E4; SecondaryColorSmooth = 0x5207;
FrequencyColor = 0xF980; FrequencyColor = 0xF980;
FrameColor = 0x38A1; FrameColor = 0x38A1;
GreyoutColor = 0x6247; GreyoutColor = 0x6247;
@@ -4581,8 +4583,8 @@ 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 = TFT_SKYBLUE; SecondaryColor = 0x73F4;
SecondaryColorSmooth = 0x10E4; SecondaryColorSmooth = 0x31A8;
FrequencyColor = 0x01FF; FrequencyColor = 0x01FF;
FrameColor = 0x0010; FrameColor = 0x0010;
GreyoutColor = 0x420C; GreyoutColor = 0x420C;