diff --git a/src/constants.h b/src/constants.h index 3bc512a..d1ab402 100644 --- a/src/constants.h +++ b/src/constants.h @@ -122,13 +122,13 @@ //MAIN COLORS /* RGB 565 CODES */ #define Black 0x0000 /* 0, 0, 0 */ #define Blue 0x001F /* 0, 0, 31 */ -#define Cabbage 0x07F6 /* 0, 63, 22 */ +#define Cabbage 0x06D0 /* 0, 54, 16 */ #define Coral 0xFBEF /* 31, 31, 15 */ #define Crimson 0xF8C3 /* 31, 6, 3 */ #define Cyan 0x0F3F /* 1, 57, 31 */ #define Cherry 0xF00A /* 30, 0, 10 */ #define Grey 0x7BEF /* 15, 31, 15 */ -#define Darkgrey 0x39A7 /* 7, 13, 7 */ +#define Darkgrey 0x1082 /* 2, 4, 2 */ #define Deepsky 0x051F /* 0, 40, 31 */ #define Green 0x07E0 /* 0, 63, 0 */ #define Indigo 0x881F /* 17, 0, 31 */ diff --git a/src/gui.cpp b/src/gui.cpp index 6a85af5..2a241e9 100644 --- a/src/gui.cpp +++ b/src/gui.cpp @@ -235,7 +235,7 @@ void doTheme() { // Use this to put your own colors in: http://www.barth-dev.de case 7: // Whiteout theme PrimaryColor = Black; PrimaryColorSmooth = White; - SecondaryColor = Grey; + SecondaryColor = Darkgrey; SecondaryColorSmooth = White; FrameColor = Darkgrey; GreyoutColor = PureGrey; diff --git a/src/language.h b/src/language.h index a56f5ec..f6becec 100644 --- a/src/language.h +++ b/src/language.h @@ -1407,14 +1407,14 @@ static const char* const myLanguage[18][281] PROGMEM = { "Αρχικό κανάλι μνήμης", // 266 "Τελικό κανάλι μνήμης", // 267 "Αποθήκευση μόνο\nμε RDS", // 268 - "Εκκίνηση αυτόματης μνήμης", // 269 + "Εκκίνηση\nαυτόματης μνήμης", // 269 "Αυτόματη μνήμη", // 270 "ID λίστας σταθμών", // 271 "Βρέθηκαν", // 272 "Ματαίωση! Τα κανάλια\nμνήμης εξαντλήθηκαν", // 273 "Ματαίωση! Πιέση\nπλήκτρου χρήστη", // 274 "Η ανίχνευση ολοκληρώθηκε\nχωρίς σφάλματα", // 275 - "Εκκαθάριση καναλιών μνήμης", // 276 + "Εκκαθάριση\nκαναλιών μνήμης", // 276 "έγινε εκκαθάριση", // 277 "Αποφυγή διπλού PI", // 278 "Εύρος", // 279 @@ -4804,7 +4804,7 @@ static const char* const myLanguage[18][281] PROGMEM = { "Iniciar canal\nde memoria", // 266 "Detener canal\nde memoria", // 267 "Solo almacenar\ncon RDS", // 268 - "Iniciar memoria automática", // 269 + "Iniciar memoria\nautomática", // 269 "Memoria automática", // 270 "ID de la lista\nde estaciones", // 271 "Encontrado", // 272 @@ -5085,7 +5085,7 @@ static const char* const myLanguage[18][281] PROGMEM = { "Mostrar PS longo", // 263 "Iniciar frequência", // 264 "Parar frequência", // 265 - "Iniciar canal de memória", // 266 + "Iniciar canal\nde memória", // 266 "Parar canal de memória", // 267 "Somente armazenar\ncom RDS", // 268 "Iniciar memória automática", // 269 diff --git a/src/rds.cpp b/src/rds.cpp index f4ed69d..be6c00f 100644 --- a/src/rds.cpp +++ b/src/rds.cpp @@ -368,9 +368,9 @@ void readRds() { if (radio.rds.hasCT) { if (advancedRDS) { - tftPrint(1, rds_clock, 205, 109, RDSDropoutColor, RDSDropoutColorSmooth, 16); + tftPrint(1, rds_clock, 208, 109, RDSDropoutColor, RDSDropoutColorSmooth, 16); } else { - tftPrint(1, rds_clock, 205, 163, RDSDropoutColor, RDSDropoutColorSmooth, 16); + tftPrint(1, rds_clock, 208, 163, RDSDropoutColor, RDSDropoutColorSmooth, 16); } } dropout = true; @@ -425,9 +425,9 @@ void readRds() { if (radio.rds.hasCT) { if (advancedRDS) { - tftPrint(1, rds_clock, 205, 109, RDSColor, RDSColorSmooth, 16); + tftPrint(1, rds_clock, 208, 109, RDSColor, RDSColorSmooth, 16); } else { - tftPrint(1, rds_clock, 205, 163, RDSColor, RDSColorSmooth, 16); + tftPrint(1, rds_clock, 208, 163, RDSColor, RDSColorSmooth, 16); } } dropout = false; @@ -751,24 +751,24 @@ void showCT() { rtcset = true; rtc.setTime(0, radio.rds.minute, radio.rds.hour, radio.rds.day, radio.rds.month, radio.rds.year); if (advancedRDS) { - tftReplace(1, rds_clockold, rds_clock, 205, 109, RDSColor, RDSColorSmooth, BackgroundColor, 16); + tftReplace(1, rds_clockold, rds_clock, 208, 109, RDSColor, RDSColorSmooth, BackgroundColor, 16); } else { - tftReplace(1, rds_clockold, rds_clock, 205, 163, RDSColor, RDSColorSmooth, BackgroundColor, 16); + tftReplace(1, rds_clockold, rds_clock, 208, 163, RDSColor, RDSColorSmooth, BackgroundColor, 16); } } else { if (rtcset) { if (advancedRDS) { - tftReplace(1, rds_clockold, rds_clock, 205, 109, RDSDropoutColor, RDSDropoutColorSmooth, BackgroundColor, 16); + tftReplace(1, rds_clockold, rds_clock, 208, 109, RDSDropoutColor, RDSDropoutColorSmooth, BackgroundColor, 16); } else { - tftReplace(1, rds_clockold, rds_clock, 205, 163, RDSDropoutColor, RDSDropoutColorSmooth, BackgroundColor, 16); + tftReplace(1, rds_clockold, rds_clock, 208, 163, RDSDropoutColor, RDSDropoutColorSmooth, BackgroundColor, 16); } } else { if (advancedRDS) { - tftPrint(1, rds_clockold, 205, 109, BackgroundColor, BackgroundColor, 16); - tftPrint(1, rds_clock, 205, 109, BackgroundColor, BackgroundColor, 16); + tftPrint(1, rds_clockold, 208, 109, BackgroundColor, BackgroundColor, 16); + tftPrint(1, rds_clock, 208, 109, BackgroundColor, BackgroundColor, 16); } else { - tftPrint(1, rds_clockold, 205, 163, BackgroundColor, BackgroundColor, 16); - tftPrint(1, rds_clock, 205, 163, BackgroundColor, BackgroundColor, 16); + tftPrint(1, rds_clockold, 208, 163, BackgroundColor, BackgroundColor, 16); + tftPrint(1, rds_clock, 208, 163, BackgroundColor, BackgroundColor, 16); } } }