diff --git a/TEF6686_ESP32.ino b/TEF6686_ESP32.ino index 2a240a9..26b58f5 100644 --- a/TEF6686_ESP32.ino +++ b/TEF6686_ESP32.ino @@ -10,7 +10,6 @@ #include "src/TEF6686.h" #include "src/constants.h" #include "src/language.h" -//#include "src/colors.h" #define GFXFF 1 #define FONT24 &Aura2ProRegular24pt7b @@ -32,7 +31,7 @@ #ifdef ARS #define VERSION "v2.00ARS" -#include "TFT_Colors.h" +#include "ARS_Colors.h" TFT_eSPI tft = TFT_eSPI(320, 240); #else #define VERSION "v2.00" @@ -5203,16 +5202,16 @@ void SetTunerPatch() { void doTheme() { // Use this to put your own colors in: http://www.barth-dev.de/online/rgb565-color-picker/ switch (CurrentTheme) { case 0: // Default PE5PVB theme - PrimaryColor = 0xFFE0; - SecondaryColor = 0x867D; - FrequencyColor = 0xFFE0; - FrameColor = 0x001F; + PrimaryColor = TFT_YELLOW; + SecondaryColor = TFT_SKYBLUE; + FrequencyColor = TFT_YELLOW; + FrameColor = TFT_BLUE; GreyoutColor = 0x38E7; - BackgroundColor = 0x0000; - ActiveColor = 0xFFFF; + BackgroundColor = TFT_BLACK; + ActiveColor = TFT_WHITE; OptimizerColor = 1; StereoColor = TFT_RED; - RDSColor = 0x867D; + RDSColor = TFT_SKYBLUE; CurrentThemeString = myLanguage[language][78]; break; case 1: // Cyan theme diff --git a/src/TFT_Colors.h b/src/ARS_Colors.h similarity index 98% rename from src/TFT_Colors.h rename to src/ARS_Colors.h index 0122aaa..b74fc97 100644 --- a/src/TFT_Colors.h +++ b/src/ARS_Colors.h @@ -1,8 +1,8 @@ -#define TFT_BLACK 0x0000 /* 0, 0, 0 */ -#define TFT_DARKGREY 0x7BEF /* 128, 128, 128 */ -#define TFT_BLUE 0xF800 /* 255, 0, 0 */ -#define TFT_GREEN 0x07E0 /* 0, 255, 0 */ -#define TFT_RED 0x001F /* 0, 0, 255 */ -#define TFT_YELLOW 0x07FF /* 0, 255, 255 */ -#define TFT_WHITE 0xFFFF /* 255, 255, 255 */ -#define TFT_SKYBLUE 0x867D /* 235, 206, 135 */ +#define TFT_BLACK 0x0000 /* 0, 0, 0 */ +#define TFT_DARKGREY 0x7BEF /* 128, 128, 128 */ +#define TFT_BLUE 0xF800 /* 255, 0, 0 */ +#define TFT_GREEN 0x07E0 /* 0, 255, 0 */ +#define TFT_RED 0x001F /* 0, 0, 255 */ +#define TFT_YELLOW 0x07FF /* 0, 255, 255 */ +#define TFT_WHITE 0xFFFF /* 255, 255, 255 */ +#define TFT_SKYBLUE 0x867D /* 235, 206, 135 */ diff --git a/src/language.h b/src/language.h index b2c891e..ef158b4 100644 --- a/src/language.h +++ b/src/language.h @@ -91,7 +91,7 @@ static const char myLanguage[9][91][85] = { "No AF available", // 87 "No EON available", // 88 "No RT+ available", // 89 - "FM min stepsize" // 90 + "FM default stepsize" // 90 }, { "Nederlands", // Dutch @@ -184,7 +184,7 @@ static const char myLanguage[9][91][85] = { "AF niet beschikbaar", // 87 "EON niet beschikbaar", // 88 "RT+ niet beschikbaar", // 89 - "FM min stepsize" // 90 + "FM stapgrootte" // 90 }, // { "Polski", // Polish