diff --git a/src/gui.cpp b/src/gui.cpp index 3b69ecc..fb290cb 100644 --- a/src/gui.cpp +++ b/src/gui.cpp @@ -442,7 +442,7 @@ void BuildMenu() { tftPrint(0, myLanguage[language][182], 160, ITEM6 + 6, ActiveColor, ActiveColorSmooth, 16); tftPrint(0, myLanguage[language][183], 160, ITEM7 + 6, ActiveColor, ActiveColorSmooth, 16); tftPrint(0, myLanguage[language][70], 160, ITEM8 + 6, ActiveColor, ActiveColorSmooth, 16); - tftPrint(0, String(myLanguage[language][209]) + " " + String(VERSION), 160, ITEM10 + 6, SecondaryColor, SecondaryColorSmooth, 16); + tftPrint(0, String(myLanguage[language][84]) + " " + String(VERSION), 160, ITEM10 + 6, SecondaryColor, SecondaryColorSmooth, 16); break; case MAINSETTINGS: @@ -459,12 +459,12 @@ void BuildMenu() { if (touchrotating) tftPrint(1, myLanguage[language][42], 310, ITEM2 + 6, PrimaryColor, PrimaryColorSmooth, 16); else tftPrint(1, myLanguage[language][30], 310, ITEM2 + 6, PrimaryColor, PrimaryColorSmooth, 16); if (tot != 0) tftPrint(1, String(tot), 270, ITEM3 + 6, PrimaryColor, PrimaryColorSmooth, 16); - if (tot != 0) tftPrint(1, myLanguage[language][205], 310, ITEM3 + 6, PrimaryColor, PrimaryColorSmooth, 16); else tftPrint(1, myLanguage[language][30], 310, ITEM3 + 6, PrimaryColor, PrimaryColorSmooth, 16); + if (tot != 0) tftPrint(1, myLanguage[language][80], 310, ITEM3 + 6, PrimaryColor, PrimaryColorSmooth, 16); else tftPrint(1, myLanguage[language][30], 310, ITEM3 + 6, PrimaryColor, PrimaryColorSmooth, 16); if (usesquelch) tftPrint(1, myLanguage[language][42], 310, ITEM4 + 6, PrimaryColor, PrimaryColorSmooth, 16); else tftPrint(1, myLanguage[language][30], 310, ITEM4 + 6, PrimaryColor, PrimaryColorSmooth, 16); if (dynamicspi) { tftPrint(1, "MHz", 310, ITEM5 + 6, ActiveColor, ActiveColorSmooth, 16); - tftPrint(-1, myLanguage[language][206], 8, ITEM5 + 6, ActiveColor, ActiveColorSmooth, 16); + tftPrint(-1, myLanguage[language][81], 8, ITEM5 + 6, ActiveColor, ActiveColorSmooth, 16); if (spispeed == SPI_SPEED_DEFAULT) tftPrint(1, String(myLanguage[language][78]) + " " + String(SPI_FREQUENCY / 1000000, DEC), 270, ITEM5 + 6, PrimaryColor, PrimaryColorSmooth, 16); else tftPrint(1, String(spispeed * 10, DEC), 270, ITEM5 + 6, PrimaryColor, PrimaryColorSmooth, 16); } @@ -503,7 +503,7 @@ void BuildMenu() { tftPrint(-1, myLanguage[language][98], 8, ITEM7 + 6, ActiveColor, ActiveColorSmooth, 16); tftPrint(-1, myLanguage[language][78], 8, ITEM8 + 6, ActiveColor, ActiveColorSmooth, 16); tftPrint(-1, myLanguage[language][77], 8, ITEM9 + 6, ActiveColor, ActiveColorSmooth, 16); - tftPrint(-1, myLanguage[language][210], 8, ITEM10 + 6, ActiveColor, ActiveColorSmooth, 16); + tftPrint(-1, myLanguage[language][85], 8, ITEM10 + 6, ActiveColor, ActiveColorSmooth, 16); tftPrint(1, myLanguage[language][0], 310, ITEM1 + 6, PrimaryColor, PrimaryColorSmooth, 16); tftPrint(1, "%", 310, ITEM2 + 6, ActiveColor, ActiveColorSmooth, 16); @@ -577,7 +577,7 @@ void BuildMenu() { tftPrint(-1, myLanguage[language][65], 8, ITEM7 + 6, ActiveColor, ActiveColorSmooth, 16); tftPrint(-1, myLanguage[language][90], 8, ITEM8 + 6, ActiveColor, ActiveColorSmooth, 16); tftPrint(-1, myLanguage[language][100], 8, ITEM9 + 6, ActiveColor, ActiveColorSmooth, 16); - tftPrint(-1, myLanguage[language][207], 8, ITEM10 + 6, ActiveColor, ActiveColorSmooth, 16); + tftPrint(-1, myLanguage[language][82], 8, ITEM10 + 6, ActiveColor, ActiveColorSmooth, 16); tftPrint(1, "MHz", 310, ITEM1 + 6, ActiveColor, ActiveColorSmooth, 16); tftPrint(1, String(ConverterSet, DEC), 270, ITEM1 + 6, PrimaryColor, PrimaryColorSmooth, 16); @@ -604,7 +604,7 @@ void BuildMenu() { case FM_BAND_ALL: tftPrint(1, myLanguage[language][105] + String(",") + myLanguage[language][106], 310, ITEM9 + 6, PrimaryColor, PrimaryColorSmooth, 16); break; case FM_BAND_OIRT: tftPrint(1, myLanguage[language][106], 310, ITEM9 + 6, PrimaryColor, PrimaryColorSmooth, 16); break; case FM_BAND_FM: tftPrint(1, myLanguage[language][105], 310, ITEM9 + 6, PrimaryColor, PrimaryColorSmooth, 16); break; - case FM_BAND_NONE: tftPrint(1, myLanguage[language][208], 310, ITEM9 + 6, PrimaryColor, PrimaryColorSmooth, 16); break; + case FM_BAND_NONE: tftPrint(1, myLanguage[language][83], 310, ITEM9 + 6, PrimaryColor, PrimaryColorSmooth, 16); break; } tftPrint(1, String(fmscansens), 310, ITEM10 + 6, PrimaryColor, PrimaryColorSmooth, 16); break; @@ -619,7 +619,7 @@ void BuildMenu() { tftPrint(-1, myLanguage[language][187], 8, ITEM7 + 6, ActiveColor, ActiveColorSmooth, 16); tftPrint(-1, myLanguage[language][198], 8, ITEM8 + 6, ActiveColor, ActiveColorSmooth, 16); tftPrint(-1, myLanguage[language][169], 8, ITEM9 + 6, ActiveColor, ActiveColorSmooth, 16); - tftPrint(-1, myLanguage[language][207], 8, ITEM10 + 6, ActiveColor, ActiveColorSmooth, 16); + tftPrint(-1, myLanguage[language][82], 8, ITEM10 + 6, ActiveColor, ActiveColorSmooth, 16); if (softmuteam) tftPrint(1, myLanguage[language][42], 310, ITEM1 + 6, PrimaryColor, PrimaryColorSmooth, 16); else tftPrint(1, myLanguage[language][30], 310, ITEM1 + 6, PrimaryColor, PrimaryColorSmooth, 16); if (amnb != 0) tftPrint(1, "%", 310, ITEM2 + 6, ActiveColor, ActiveColorSmooth, 16); else tftPrint(1, myLanguage[language][30], 310, ITEM2 + 6, ActiveColor, ActiveColorSmooth, 16); @@ -637,7 +637,7 @@ void BuildMenu() { case AM_BAND_LW: tftPrint(1, myLanguage[language][102], 310, ITEM4 + 6, PrimaryColor, PrimaryColorSmooth, 16); break; case AM_BAND_MW: tftPrint(1, myLanguage[language][103], 310, ITEM4 + 6, PrimaryColor, PrimaryColorSmooth, 16); break; case AM_BAND_SW: tftPrint(1, myLanguage[language][104], 310, ITEM4 + 6, PrimaryColor, PrimaryColorSmooth, 16); break; - case AM_BAND_NONE: tftPrint(1, myLanguage[language][208], 310, ITEM4 + 6, PrimaryColor, PrimaryColorSmooth, 16); break; + case AM_BAND_NONE: tftPrint(1, myLanguage[language][83], 310, ITEM4 + 6, PrimaryColor, PrimaryColorSmooth, 16); break; } if (showSWMIBand) tftPrint(1, myLanguage[language][42], 310, ITEM5 + 6, PrimaryColor, PrimaryColorSmooth, 16); else tftPrint(1, myLanguage[language][30], 310, ITEM5 + 6, PrimaryColor, PrimaryColorSmooth, 16); @@ -980,7 +980,7 @@ void MenuUp() { break; case ITEM3: - if (tot != 0) tftPrint(-1, myLanguage[language][205], 170, 118, BackgroundColor, BackgroundColor, 28); + if (tot != 0) tftPrint(-1, myLanguage[language][80], 170, 118, BackgroundColor, BackgroundColor, 28); if (tot != 0) tftPrint(1, String(tot), 155, 118, BackgroundColor, BackgroundColor, 28); else tftPrint(0, myLanguage[language][30], 155, 118, BackgroundColor, BackgroundColor, 28); switch (tot) { case 0: tot = 15; break; @@ -989,7 +989,7 @@ void MenuUp() { case 60: tot = 90; break; default: tot = 0; break; } - if (tot != 0) tftPrint(-1, myLanguage[language][205], 170, 118, ActiveColor, ActiveColorSmooth, 28); + if (tot != 0) tftPrint(-1, myLanguage[language][80], 170, 118, ActiveColor, ActiveColorSmooth, 28); if (tot != 0) tftPrint(1, String(tot), 155, 118, PrimaryColor, PrimaryColorSmooth, 28); else tftPrint(0, myLanguage[language][30], 155, 118, PrimaryColor, PrimaryColorSmooth, 28); break; @@ -1356,7 +1356,7 @@ void MenuUp() { case FM_BAND_ALL: tftPrint(0, myLanguage[language][105] + String(",") + myLanguage[language][106], 155, 118, BackgroundColor, BackgroundColor, 28); break; case FM_BAND_OIRT: tftPrint(0, myLanguage[language][106], 155, 118, BackgroundColor, BackgroundColor, 28); break; case FM_BAND_FM: tftPrint(0, myLanguage[language][105], 155, 118, BackgroundColor, BackgroundColor, 28); break; - case FM_BAND_NONE: tftPrint(0, myLanguage[language][208], 155, 118, BackgroundColor, BackgroundColor, 28); break; + case FM_BAND_NONE: tftPrint(0, myLanguage[language][83], 155, 118, BackgroundColor, BackgroundColor, 28); break; } bandFM++; @@ -1366,7 +1366,7 @@ void MenuUp() { case FM_BAND_ALL: tftPrint(0, myLanguage[language][105] + String(",") + myLanguage[language][106], 155, 118, PrimaryColor, PrimaryColorSmooth, 28); break; case FM_BAND_OIRT: tftPrint(0, myLanguage[language][106], 155, 118, PrimaryColor, PrimaryColorSmooth, 28); break; case FM_BAND_FM: tftPrint(0, myLanguage[language][105], 155, 118, PrimaryColor, PrimaryColorSmooth, 28); break; - case FM_BAND_NONE: tftPrint(0, myLanguage[language][208], 155, 118, PrimaryColor, PrimaryColorSmooth, 28); break; + case FM_BAND_NONE: tftPrint(0, myLanguage[language][83], 155, 118, PrimaryColor, PrimaryColorSmooth, 28); break; } break; @@ -1417,7 +1417,7 @@ void MenuUp() { case AM_BAND_LW: tftPrint(0, myLanguage[language][102], 155, 118, BackgroundColor, BackgroundColor, 28); break; case AM_BAND_MW: tftPrint(0, myLanguage[language][103], 155, 118, BackgroundColor, BackgroundColor, 28); break; case AM_BAND_SW: tftPrint(0, myLanguage[language][104], 155, 118, BackgroundColor, BackgroundColor, 28); break; - case AM_BAND_NONE: tftPrint(0, myLanguage[language][208], 155, 118, BackgroundColor, BackgroundColor, 28); break; + case AM_BAND_NONE: tftPrint(0, myLanguage[language][83], 155, 118, BackgroundColor, BackgroundColor, 28); break; } bandAM++; @@ -1431,7 +1431,7 @@ void MenuUp() { case AM_BAND_LW: tftPrint(0, myLanguage[language][102], 155, 118, PrimaryColor, PrimaryColorSmooth, 28); break; case AM_BAND_MW: tftPrint(0, myLanguage[language][103], 155, 118, PrimaryColor, PrimaryColorSmooth, 28); break; case AM_BAND_SW: tftPrint(0, myLanguage[language][104], 155, 118, PrimaryColor, PrimaryColorSmooth, 28); break; - case AM_BAND_NONE: tftPrint(0, myLanguage[language][208], 155, 118, PrimaryColor, PrimaryColorSmooth, 28); break; + case AM_BAND_NONE: tftPrint(0, myLanguage[language][83], 155, 118, PrimaryColor, PrimaryColorSmooth, 28); break; } break; @@ -1571,7 +1571,7 @@ void MenuDown() { break; case ITEM3: - if (tot != 0) tftPrint(-1, myLanguage[language][205], 170, 118, BackgroundColor, BackgroundColor, 28); + if (tot != 0) tftPrint(-1, myLanguage[language][80], 170, 118, BackgroundColor, BackgroundColor, 28); if (tot != 0) tftPrint(1, String(tot), 155, 118, BackgroundColor, BackgroundColor, 28); else tftPrint(0, myLanguage[language][30], 155, 118, BackgroundColor, BackgroundColor, 28); switch (tot) { case 15: tot = 0; break; @@ -1580,7 +1580,7 @@ void MenuDown() { case 90: tot = 60; break; default: tot = 90; break; } - if (tot != 0) tftPrint(-1, myLanguage[language][205], 170, 118, ActiveColor, ActiveColorSmooth, 28); + if (tot != 0) tftPrint(-1, myLanguage[language][80], 170, 118, ActiveColor, ActiveColorSmooth, 28); if (tot != 0) tftPrint(1, String(tot), 155, 118, PrimaryColor, PrimaryColorSmooth, 28); else tftPrint(0, myLanguage[language][30], 155, 118, PrimaryColor, PrimaryColorSmooth, 28); break; @@ -1947,7 +1947,7 @@ void MenuDown() { case FM_BAND_ALL: tftPrint(0, myLanguage[language][105] + String(",") + myLanguage[language][106], 155, 118, BackgroundColor, BackgroundColor, 28); break; case FM_BAND_OIRT: tftPrint(0, myLanguage[language][106], 155, 118, BackgroundColor, BackgroundColor, 28); break; case FM_BAND_FM: tftPrint(0, myLanguage[language][105], 155, 118, BackgroundColor, BackgroundColor, 28); break; - case FM_BAND_NONE: tftPrint(0, myLanguage[language][208], 155, 118, BackgroundColor, BackgroundColor, 28); break; + case FM_BAND_NONE: tftPrint(0, myLanguage[language][83], 155, 118, BackgroundColor, BackgroundColor, 28); break; } bandFM--; @@ -1957,7 +1957,7 @@ void MenuDown() { case FM_BAND_ALL: tftPrint(0, myLanguage[language][105] + String(",") + myLanguage[language][106], 155, 118, PrimaryColor, PrimaryColorSmooth, 28); break; case FM_BAND_OIRT: tftPrint(0, myLanguage[language][106], 155, 118, PrimaryColor, PrimaryColorSmooth, 28); break; case FM_BAND_FM: tftPrint(0, myLanguage[language][105], 155, 118, PrimaryColor, PrimaryColorSmooth, 28); break; - case FM_BAND_NONE: tftPrint(0, myLanguage[language][208], 155, 118, PrimaryColor, PrimaryColorSmooth, 28); break; + case FM_BAND_NONE: tftPrint(0, myLanguage[language][83], 155, 118, PrimaryColor, PrimaryColorSmooth, 28); break; } break; @@ -2008,7 +2008,7 @@ void MenuDown() { case AM_BAND_LW: tftPrint(0, myLanguage[language][102], 155, 118, BackgroundColor, BackgroundColor, 28); break; case AM_BAND_MW: tftPrint(0, myLanguage[language][103], 155, 118, BackgroundColor, BackgroundColor, 28); break; case AM_BAND_SW: tftPrint(0, myLanguage[language][104], 155, 118, BackgroundColor, BackgroundColor, 28); break; - case AM_BAND_NONE: tftPrint(0, myLanguage[language][208], 155, 118, BackgroundColor, BackgroundColor, 28); break; + case AM_BAND_NONE: tftPrint(0, myLanguage[language][83], 155, 118, BackgroundColor, BackgroundColor, 28); break; } bandAM--; @@ -2022,7 +2022,7 @@ void MenuDown() { case AM_BAND_LW: tftPrint(0, myLanguage[language][102], 155, 118, PrimaryColor, PrimaryColorSmooth, 28); break; case AM_BAND_MW: tftPrint(0, myLanguage[language][103], 155, 118, PrimaryColor, PrimaryColorSmooth, 28); break; case AM_BAND_SW: tftPrint(0, myLanguage[language][104], 155, 118, PrimaryColor, PrimaryColorSmooth, 28); break; - case AM_BAND_NONE: tftPrint(0, myLanguage[language][208], 155, 118, PrimaryColor, PrimaryColorSmooth, 28); break; + case AM_BAND_NONE: tftPrint(0, myLanguage[language][83], 155, 118, PrimaryColor, PrimaryColorSmooth, 28); break; } break; @@ -2224,7 +2224,7 @@ void DoMenu() { case ITEM3: Infoboxprint(myLanguage[language][75]); - if (tot != 0) tftPrint(-1, myLanguage[language][205], 170, 118, ActiveColor, ActiveColorSmooth, 28); + if (tot != 0) tftPrint(-1, myLanguage[language][80], 170, 118, ActiveColor, ActiveColorSmooth, 28); if (tot != 0) tftPrint(1, String(tot), 155, 118, PrimaryColor, PrimaryColorSmooth, 28); else tftPrint(0, myLanguage[language][30], 155, 118, PrimaryColor, PrimaryColorSmooth, 28); break; @@ -2234,7 +2234,7 @@ void DoMenu() { break; case ITEM5: - Infoboxprint(myLanguage[language][206]); + Infoboxprint(myLanguage[language][81]); tftPrint(-1, "MHz", 170, 118, ActiveColor, ActiveColorSmooth, 28); if (spispeed == SPI_SPEED_DEFAULT) tftPrint(1, String(myLanguage[language][78]) + " " + String(SPI_FREQUENCY / 1000000, DEC), 155, 118, PrimaryColor, PrimaryColorSmooth, 28); else tftPrint(1, String(spispeed * 10 , DEC), 155, 118, PrimaryColor, PrimaryColorSmooth, 28); break; @@ -2346,7 +2346,7 @@ void DoMenu() { break; case ITEM10: - Infoboxprint(myLanguage[language][210]); + Infoboxprint(myLanguage[language][85]); tftPrint(0, FreqFont[freqfont], 155, 118, PrimaryColor, PrimaryColorSmooth, 28); break; } @@ -2473,12 +2473,12 @@ void DoMenu() { case FM_BAND_ALL: tftPrint(0, myLanguage[language][105] + String(",") + myLanguage[language][106], 155, 118, PrimaryColor, PrimaryColorSmooth, 28); break; case FM_BAND_OIRT: tftPrint(0, myLanguage[language][106], 155, 118, PrimaryColor, PrimaryColorSmooth, 28); break; case FM_BAND_FM: tftPrint(0, myLanguage[language][105], 155, 118, PrimaryColor, PrimaryColorSmooth, 28); break; - case FM_BAND_NONE: tftPrint(0, myLanguage[language][208], 155, 118, PrimaryColor, PrimaryColorSmooth, 28); break; + case FM_BAND_NONE: tftPrint(0, myLanguage[language][83], 155, 118, PrimaryColor, PrimaryColorSmooth, 28); break; } break; case ITEM10: - Infoboxprint(myLanguage[language][207]); + Infoboxprint(myLanguage[language][82]); tftPrint (1, String(fmscansens), 155, 118, PrimaryColor, PrimaryColorSmooth, 28); break; } @@ -2513,7 +2513,7 @@ void DoMenu() { case AM_BAND_LW: tftPrint(0, myLanguage[language][102], 155, 118, PrimaryColor, PrimaryColorSmooth, 28); break; case AM_BAND_MW: tftPrint(0, myLanguage[language][103], 155, 118, PrimaryColor, PrimaryColorSmooth, 28); break; case AM_BAND_SW: tftPrint(0, myLanguage[language][104], 155, 118, PrimaryColor, PrimaryColorSmooth, 28); break; - case AM_BAND_NONE: tftPrint(0, myLanguage[language][208], 155, 118, PrimaryColor, PrimaryColorSmooth, 28); break; + case AM_BAND_NONE: tftPrint(0, myLanguage[language][83], 155, 118, PrimaryColor, PrimaryColorSmooth, 28); break; } break; @@ -2546,7 +2546,7 @@ void DoMenu() { break; case ITEM10: - Infoboxprint(myLanguage[language][207]); + Infoboxprint(myLanguage[language][82]); tftPrint (1, String(amscansens), 155, 118, PrimaryColor, PrimaryColorSmooth, 28); break; } diff --git a/src/language.h b/src/language.h index c211773..dc9af0b 100644 --- a/src/language.h +++ b/src/language.h @@ -85,13 +85,13 @@ static const char* const myLanguage[18][211] = { "Screen off", // 76 "Theme", // 77 "Skin", // 78 - "", // 79 - "", // 80 - "", // 81 - "", // 82 - "", // 83 - "", // 84 - "", // 85 + "Detected applications", // 79 + "Min.", // 80 + "Dynamic SPI speed", // 81 + "Scan sensitivity", // 82 + "NONE", // 83 + "Software version", // 84 + "Frequency font", // 85 "NOT POSSIBLE", // 86 "No AF available", // 87 "No EON available", // 88 @@ -209,14 +209,7 @@ static const char* const myLanguage[18][211] = { "Small", // 200 "Large", // 201 "All", // 202 - "Fast PS", // 203 - "Detected applications", // 204 - "Min.", // 205 - "Dynamic SPI speed", // 206 - "Scan sensitivity", // 207 - "NONE", // 208 - "Software version", // 209 - "Frequency font" // 210 + "Fast PS" // 203 }, { "Nederlands", // Dutch @@ -298,13 +291,13 @@ static const char* const myLanguage[18][211] = { "Scherm uit", // 76 "Thema", // 77 "Uiterlijk", // 78 *** - "", // 79 *** - "", // 80 *** - "", // 81 *** - "", // 82 *** - "", // 83 *** - "", // 84 *** - "", // 85 *** + "Gedetecteerde applicaties", // 79 + "Min.", // 80 *** + "Dynamische\nSPI snelheid", // 81 + "Zoek gevoeligheid", // 82 + "Geen", // 83 + "Software versie", // 84 + "Frequentie font", // 85 "NIET MOGELIJK", // 86 "Geen AF data", // 87 "Geen EON data", // 88 @@ -422,14 +415,7 @@ static const char* const myLanguage[18][211] = { "Laag", // 200 "Middel", // 201 "Alles", // 202 - "Snelle PS", // 203 - "Gedetecteerde applicaties", // 204 - "Min.", // 205 *** - "Dynamische\nSPI snelheid", // 206 - "Zoek gevoeligheid", // 207 - "Geen", // 208 - "Software versie", // 209 - "Frequentie font" // 210 + "Snelle PS" // 203 }, { "Polski", // Polish @@ -511,13 +497,13 @@ static const char* const myLanguage[18][211] = { "Wyłącz ekran", // 76 "Motyw", // 77 "Skin", // 78 *** - "", // 79 *** - "", // 80 *** - "", // 81 *** - "", // 82 *** - "", // 83 *** - "", // 84 *** - "", // 85 *** + "Wykryte aplikacje", // 79 + "Min.", // 80 *** + "Dynam. prędkość SPI", // 81 + "Czułość skanowania", // 82 + "BRAK", // 83 + "Wersja oprogramowania", // 84 + "Czcionka częstotliwości", // 85 "NIEMOŻLIWE", // 86 "AF niedostępny", // 87 "EON niedostępny", // 88 @@ -635,14 +621,7 @@ static const char* const myLanguage[18][211] = { "Małe", // 200 "Duże", // 201 "Wszystkie", // 202 - "Szybki PS", // 203 - "Wykryte aplikacje", // 204 - "Min.", // 205 *** - "Dynam. prędkość SPI", // 206 - "Czułość skanowania", // 207 - "BRAK", // 208 - "Wersja oprogramowania", // 209 - "Czcionka częstotliwości" // 210 *** + "Szybki PS" // 203 }, { "Hrvatski", // Croatian @@ -724,13 +703,13 @@ static const char* const myLanguage[18][211] = { "Zaslon isključiti", // 76 "Tema dizajna", // 77 "Skin", // 78 *** - "", // 79 *** - "", // 80 *** - "", // 81 *** - "", // 82 *** - "", // 83 *** - "", // 84 *** - "", // 85 *** + "Otkrivene aplikacije", // 79 + "Min.", // 80 *** + "Dynamic SPI speed", // 81 *** + "Scan sensitivity", // 82 + "NONE", // 83 represents: AM/FM bands unavailable(please delete this note after translation) + "Software version", // 84 + "Frequency font" // 85 *** "NIJE MOGUĆE", // 86 "AF nedostupan", // 87 "EON nedostupan", // 88 @@ -848,14 +827,7 @@ static const char* const myLanguage[18][211] = { "Malo", // 200 "Veliko", // 201 "Sve", // 202 - "Brzi PS", // 203 - "Otkrivene aplikacije", // 204 - "Min.", // 205 *** - "Dynamic SPI speed", // 206 *** - "Scan sensitivity", // 207 - "NONE", // 208 represents: AM/FM bands unavailable(please delete this note after translation) - "Software version", // 209 - "Frequency font" // 210 *** + "Brzi PS" // 203 }, { "Ελληνικά", // Greek @@ -937,13 +909,13 @@ static const char* const myLanguage[18][211] = { "Οθόνη σβηστή", // 76 "Θέμα", // 77 "Skin", // 78 *** - "", // 79 - "", // 80 - "", // 81 - "", // 82 - "", // 83 - "", // 84 - "", // 85 + "Εντοπισμένες εφαρμογές", // 79 + "Λεπτά", // 80 + "Δυναμική ταχύτητα\nSPI", // 81 + "Ευαισθησία\nανίχνευσης", // 82 + "KAMIA", // 83 + "Έκδοση λογισμικού", // 84 + "Γραμματοσειρά\nσυχνότητας", // 85 *** "ΜΗ ΔΥΝΑΤΟ", // 86 "Μη διαθέσιμο AF", // 87 "Μη διαθέσιμο EON", // 88 @@ -1061,14 +1033,7 @@ static const char* const myLanguage[18][211] = { "Μικρό", // 200 "Μεγάλο", // 201 "Όλα", // 202 - "Γρήγορο PS", // 203 - "Εντοπισμένες εφαρμογές", // 204 - "Λεπτά", // 205 - "Δυναμική ταχύτητα\nSPI", // 206 - "Ευαισθησία\nανίχνευσης", // 207 - "KAMIA", // 208 - "Έκδοση λογισμικού", // 209 - "Frequency font" // 210 *** + "Γρήγορο PS" // 203 }, { "Română", // Romanian @@ -1150,13 +1115,13 @@ static const char* const myLanguage[18][211] = { "Ecran oprit", // 76 "Teme", // 77 "Skin", // 78 *** - "", // 79 *** - "", // 80 *** - "", // 81 *** - "", // 82 *** - "", // 83 *** - "", // 84 *** - "", // 85 *** + "Identificare aplicații", // 79 + "Min.", // 80 *** + "Dynamic SPI speed", // 81 *** + "Scan sensitivity", // 82 + "NONE", // 83 represents: AM/FM bands unavailable(please delete this note after translation) + "Software version", // 84 + "Frequency font", // 85 *** "Nu este posibil", // 86 "Fără AF disponibil", // 87 "Fără EON disponibil", // 88 @@ -1274,14 +1239,7 @@ static const char* const myLanguage[18][211] = { "Mic", // 200 "Mare", // 201 "Toate", // 202 - "PS rapid", // 203 - "Identificare aplicații", // 204 - "Min.", // 205 *** - "Dynamic SPI speed", // 206 *** - "Scan sensitivity", // 207 - "NONE", // 208 represents: AM/FM bands unavailable(please delete this note after translation) - "Software version", // 209 - "Frequency font" // 210 *** + "PS rapid" // 203 }, { "Deutsch", // German @@ -1363,13 +1321,13 @@ static const char* const myLanguage[18][211] = { "Bildschirm aus", // 76 "Thema", // 77 "Skin", // 78 *** - "", // 79 - "", // 80 - "", // 81 - "", // 82 - "", // 83 - "", // 84 - "", // 85 + "Erkannte Applikationen", // 79 + "Min.", // 80 + "Dynamische \nSPI-Geschwindigkeit", // 81 + "Scanempfindlichkeit", // 82 + "KEINE", // 83 + "Softwareversion", // 84 + "Frequenz-Schriftart", // 85 *** "NICHT MÖGLICH", // 86 "Keine AF verfügbar", // 87 "Kein EON verfügbar", // 88 @@ -1487,14 +1445,7 @@ static const char* const myLanguage[18][211] = { "Wenig", // 200 "Viel", // 201 "Maximal", // 202 - "Schnelles PS", // 203 - "Erkannte Applikationen", // 204 - "Min.", // 205 - "Dynamische \nSPI-Geschwindigkeit", // 206 - "Scanempfindlichkeit", // 207 - "KEINE", // 208 - "Softwareversion", // 209 - "Frequenz-Schriftart" // 210 *** + "Schnelles PS" // 203 }, { "Český", // Czech @@ -1576,13 +1527,13 @@ static const char* const myLanguage[18][211] = { "Vypnutí obrazovky", // 76 "Vzhled", // 77 "Skin", // 78 *** - "", // 79 *** - "", // 80 *** - "", // 81 *** - "", // 82 *** - "", // 83 *** - "", // 84 *** - "", // 85 *** + "Detekované aplikace", // 79 + "Min.", // 80 *** + "Dynamic SPI speed", // 81 *** + "Scan sensitivity", // 82 + "NONE", // 83 represents: AM/FM bands unavailable(please delete this note after translation) + "Software version", // 84 + "Frequency font", // 85 *** "ODPOJTE USB", // 86 "AF nedostupné", // 87 "EON nedostupný", // 88 @@ -1700,14 +1651,7 @@ static const char* const myLanguage[18][211] = { "Malý", // 200 "Velký", // 201 "Vše", // 202 - "Rychlé načtení PS", // 203 - "Detekované aplikace", // 204 - "Min.", // 205 *** - "Dynamic SPI speed", // 206 *** - "Scan sensitivity", // 207 - "NONE", // 208 represents: AM/FM bands unavailable(please delete this note after translation) - "Software version", // 209 - "Frequency font" // 210 *** + "Rychlé načtení PS" // 203 }, { "Slovenský", // Slovak @@ -1789,13 +1733,13 @@ static const char* const myLanguage[18][211] = { "Vypnutie obrazovky", // 76 "Vzhľad", // 77 "Skin", // 78 *** - "", // 79 *** - "", // 80 *** - "", // 81 *** - "", // 82 *** - "", // 83 *** - "", // 84 *** - "", // 85 *** + "Detegované aplikácie", // 79 + "Min.", // 80 *** + "Dynamic SPI speed", // 81 *** + "Scan sensitivity", // 82 + "NONE", // 83 represents: AM/FM bands unavailable(please delete this note after translation) + "Software version", // 84 + "Frequency font", // 85 *** "ODPOJTE USB", // 86 "AF nedostupné", // 87 "EON nedostupný", // 88 @@ -1913,14 +1857,7 @@ static const char* const myLanguage[18][211] = { "Malý", // 200 "Veľký", // 201 "Všetko", // 202 - "Rýchle načítanie PS", // 203 - "Detegované aplikácie", // 204 - "Min.", // 205 *** - "Dynamic SPI speed", // 206 *** - "Scan sensitivity", // 207 - "NONE", // 208 represents: AM/FM bands unavailable(please delete this note after translation) - "Software version", // 209 - "Frequency font" // 210 *** + "Rýchle načítanie PS" // 203 }, { "Français", // French @@ -2002,13 +1939,13 @@ static const char* const myLanguage[18][211] = { "Affichage éteint", // 76 "Thème", // 77 "Skin", // 78 *** - "", // 79 - "", // 80 - "", // 81 - "", // 82 - "", // 83 - "", // 84 - "", // 85 + "Applications détectées", // 79 + "Min.", // 80 + "Vitesse SPI\ndynamique", // 81 + "Sensibilité\ndu scanne ", // 82 + "AUCUNE", // 83 + "Version de logiciel", // 84 + "Police de fréquence", // 85 *** "IMPOSSIBLE", // 86 "AF indisponible", // 87 "EON indisponible", // 88 @@ -2126,14 +2063,7 @@ static const char* const myLanguage[18][211] = { "Petites", // 200 "Grosses", // 201 "Toutes", // 202 - "PS rapide", // 203 - "Applications détectées", // 204 - "Min.", // 205 - "Vitesse SPI\ndynamique", // 206 - "Sensibilité\ndu scanne ", // 207 - "AUCUNE", // 208 - "Version de logiciel", // 209 - "Frequency font" // 210 *** + "PS rapide" // 203 }, { "Български", // Bulgarian @@ -2215,13 +2145,13 @@ static const char* const myLanguage[18][211] = { "Изключен дисплей", // 76 "Тема", // 77 "Skin", // 78 *** - "", // 79 - "", // 80 *** - "", // 81 - "", // 82 - "", // 83 - "", // 84 - "", // 85 + "Detected applications", // 79 *** + "Мин.", // 80 + "Dynamic SPI speed", // 81 *** + "Scan sensitivity", // 82 + "NONE", // 83 represents: AM/FM bands unavailable(please delete this note after translation) + "Software version", // 84 + "Frequency font", // 85 *** "НЕ Е ВЪЗМОЖНО", // 86 "AF опцията не е налична", // 87 "EON опцията не е налична", // 88 @@ -2339,14 +2269,7 @@ static const char* const myLanguage[18][211] = { "Small", // 200 *** "Large", // 201 *** "Всички", // 202 - "Fast PS", // 203 *** - "Detected applications", // 204 *** - "Мин.", // 205 - "Dynamic SPI speed", // 206 *** - "Scan sensitivity", // 207 - "NONE", // 208 represents: AM/FM bands unavailable(please delete this note after translation) - "Software version", // 209 - "Frequency font" // 210 *** + "Fast PS" // 203 *** }, { "Русский", // Russian @@ -2428,13 +2351,13 @@ static const char* const myLanguage[18][211] = { "Погасить экран", // 76 "Тема", // 77 "Skin", // 78 *** - "", // 79 - "", // 80 - "", // 81 - "", // 82 - "", // 83 - "", // 84 - "", // 85 + "Обнаруженные приложения", // 79 + "мин.", // 80 + "Частота шины дисплея SPI", // 81 *** + "Чувствительность сканирования", // 82 + "Не использовать AM", // 83 + "Версия прошивки - ", // 84 + "Шрифт отображения частоты", // 85 *** "НЕВОЗМОЖНО", // 86 "Нет данных", // 87 "Нет данных", // 88 @@ -2552,14 +2475,7 @@ static const char* const myLanguage[18][211] = { "Мало", // 200 "Больше", // 201 "Все", // 202 - "Быстрый PS", // 203 - "Обнаруженные приложения", // 204 - "мин.", // 205 - "Частота шины дисплея SPI", // 206 *** - "Чувствительность сканирования", // 207 - "Не использовать AM", // 208 - "Версия прошивки - ", // 209 - "Шрифт отображения частоты" // 210 *** + "Быстрый PS" // 203 }, { "Українська", // Ukranian @@ -2641,13 +2557,13 @@ static const char* const myLanguage[18][211] = { "Екран вимкнено", // 76 "Тема", // 77 "Skin", // 78 *** - "", // 79 - "", // 80 - "", // 81 - "", // 82 - "", // 83 - "", // 84 - "", // 85 + "Виявлені програми", // 79 + "мін.", // 80 + "Швидкість шини дисплея (SPI)", // 81 *** + "Чутливість сканування", // 82 + "NONE", // 83 represents: AM/FM bands unavailable(please delete this note after translation) + "Версія ПО", // 84 + "Frequency font", // 85 *** "НЕ МОЖЛИВО", // 86 "Немає доступних AF", // 87 "Немає доступного EON", // 88 @@ -2765,14 +2681,7 @@ static const char* const myLanguage[18][211] = { "Мало", // 200 "Багато", // 201 "Усе", // 202 - "Швидкий PS", // 203 - "Виявлені програми", // 204 - "мін.", // 205 - "Швидкість шини дисплея (SPI)", // 206 *** - "Чутливість сканування", // 207 - "NONE", // 208 represents: AM/FM bands unavailable(please delete this note after translation) - "Версія ПО", // 209 - "Frequency font" // 210 *** + "Швидкий PS" // 203 }, { "Italiano", // Italian @@ -2854,13 +2763,13 @@ static const char* const myLanguage[18][211] = { "Schermo spento", // 76 "Motivo schermo", // 77 "Skin", // 78 *** - "", // 79 - "", // 80 - "", // 81 - "", // 82 - "", // 83 *** - "", // 84 *** - "", // 85 + "Applicazioni rilevate", // 79 *** + "Min.", // 80 *** + "Velocità SPI Dinamico", // 81 *** + "Sensibilità scansione", // 82 + "NONE", // 83 represents: AM/FM bands unavailable(please delete this note after translation) + "Software version", // 84 + "Frequency font", // 85 *** "IMPOSSIBILE", // 86 "AF non disponibile", // 87 "EON non disponibile", // 88 @@ -2978,14 +2887,7 @@ static const char* const myLanguage[18][211] = { "Piccolo", // 200 *** "Grande", // 201 *** "Tutto", // 202 *** - "PS veloce", // 203 *** - "Applicazioni rilevate", // 204 *** - "Min.", // 205 *** - "Velocità SPI Dinamico", // 206 *** - "Sensibilità scansione", // 207 - "NONE", // 208 represents: AM/FM bands unavailable(please delete this note after translation) - "Software version", // 209 - "Frequency font" // 210 *** + "PS veloce" // 203 *** }, { "Simplified Chinese", // Simplified Chinese @@ -3067,13 +2969,13 @@ static const char* const myLanguage[18][211] = { "关闭屏幕", // 76 "主题&颜色", // 77 "Skin", // 78 *** - "", // 79 - "", // 80 - "", // 81 - "", // 82 - "", // 83 - "", // 84 - "", // 85 + "Detected applications", // 79 *** + "分钟", // 80 + "调整SPI通讯速率", // 81 + "搜索灵敏度", // 82 + "不可用", // 83 + "Software version", // 84 + "Frequency font", // 85 *** "不可用", // 86 "AF 不可用", // 87 "EON 不可用", // 88 @@ -3191,14 +3093,7 @@ static const char* const myLanguage[18][211] = { "少量", // 200 "大量", // 201 "全部", // 202 - "快速 PS", // 203 - "Detected applications", // 204 *** - "分钟", // 205 - "调整SPI通讯速率", // 206 - "搜索灵敏度", // 207 - "不可用", // 208 - "Software version", // 209 - "Frequency font" // 210 *** + "快速 PS" // 203 }, { "Norsk", // Norwegian @@ -3280,13 +3175,13 @@ static const char* const myLanguage[18][211] = { "Skjerm av", // 76 "Tema", // 77 "Skin", // 78 *** - "", // 79 *** - "", // 80 *** - "", // 81 *** - "", // 82 *** - "", // 83 *** - "", // 84 *** - "", // 85 *** + "Oppdaget applikasjoner", // 79 + "Min.", // 80 *** + "Dynamisk SPI hastighet", // 81 + "Skannefølsomhet", // 82 + "INGEN", // 83 + "Programvareversjon", // 84 + "Frequency font", // 85 *** "IKKE MULIG", // 86 "Ingen AF", // 87 "Ingen EON", // 88 @@ -3404,14 +3299,7 @@ static const char* const myLanguage[18][211] = { "Lite", // 200 "Mye", // 201 "Alt", // 202 - "Rask PS", // 203 - "Oppdaget applikasjoner", // 204 - "Min.", // 205 *** - "Dynamisk SPI hastighet", // 206 - "Skannefølsomhet", // 207 - "INGEN", // 208 - "Programvareversjon", // 209 - "Frequency font" // 210 *** + "Rask PS" // 203 }, { "Español", // Spanish @@ -3493,13 +3381,13 @@ static const char* const myLanguage[18][211] = { "Apagar pantalla", // 76 "Tema", // 77 "Skin", // 78 *** - "", // 79 - "", // 80 - "", // 81 - "", // 82 - "", // 83 - "", // 84 - "", // 85 + "Aplicaciones detectadas", // 79 + "Min.", // 80 + "Velocidad de SPI", // 81 + "Sensibilidad\ndel escaneo", // 82 + "NINGUNA", // 83 + "Versión del software", // 84 + "Fundición de frecuencia", // 85 *** "NO ES POSIBLE", // 86 "No AF disponible", // 87 "No EON disponible", // 88 @@ -3617,14 +3505,7 @@ static const char* const myLanguage[18][211] = { "Pequeño", // 200 "Grande", // 201 "Todo", // 202 - "PS rápido", // 203 - "Aplicaciones detectadas", // 204 - "Min.", // 205 - "Velocidad de SPI", // 206 - "Sensibilidad\ndel escaneo", // 207 - "NINGUNA", // 208 - "Versión del software", // 209 - "Frequency font" // 210 *** + "PS rápido" // 203 }, { "Português", // Portuguese @@ -3706,13 +3587,13 @@ static const char* const myLanguage[18][211] = { "Desligar a tela", // 76 "Tema", // 77 "Skin", // 78 *** - "", // 79 - "", // 80 - "", // 81 - "", // 82 - "", // 83 - "", // 84 - "", // 85 + "Aplicativos detectados", // 79 + "Min.", // 80 + "Velocidade dinâmica\nde SPI", // 81 + "Sensibilidade\nda varredura", // 82 + "NENHUM", // 83 + "Versão do software", // 84 + "Fonte de frequência", // 85 *** "NÃO POSSÍVEL", // 86 "AF não disponível", // 87 "EON não disponível", // 88 @@ -3830,14 +3711,7 @@ static const char* const myLanguage[18][211] = { "Pequeno", // 200 "Grande", // 201 "Tudo", // 202 - "PS rápido", // 203 - "Aplicativos detectados", // 204 - "Min.", // 205 - "Velocidade dinâmica\nde SPI", // 206 - "Sensibilidade\nda varredura", // 207 - "NENHUM", // 208 - "Versão do software", // 209 - "Frequency font" // 210 *** + "PS rápido" // 203 } }; #endif diff --git a/src/rds.cpp b/src/rds.cpp index 73ac446..cb6c17f 100644 --- a/src/rds.cpp +++ b/src/rds.cpp @@ -90,10 +90,10 @@ void ShowAdvancedRDS() { } String eonstring; - if (radio.eon_counter > 0) for (byte i = 0; i < radio.eon_counter; i++) eonstring += String(radio.eon[i].picode) + (radio.eon[i].ps.length() > 0 ? String(": " + String(radio.eon[i].ps)) : "") + (radio.eon[i].mappedfreq > 0 ? String(" " + String(radio.eon[i].mappedfreq / 100) + "." + String((radio.eon[i].mappedfreq % 100) / 10)) : "") + (radio.eon[i].mappedfreq2 > 0 ? String(" / " + String(radio.eon[i].mappedfreq2 / 100) + "." + String((radio.eon[i].mappedfreq2 % 100) / 10)) : "") + (radio.eon[i].mappedfreq3 > 0 ? String(" / " + String(radio.eon[i].mappedfreq3 / 100) + "." + String((radio.eon[i].mappedfreq3 % 100) / 10)) : "") + (i == radio.eon_counter - 1 ? " " : " | "); else eonstring = myLanguage[language][88]; + if (radio.rds.hasEON) for (byte i = 0; i < radio.eon_counter; i++) eonstring += String(radio.eon[i].picode) + (radio.eon[i].ps.length() > 0 ? String(": " + String(radio.eon[i].ps)) : "") + (radio.eon[i].mappedfreq > 0 ? String(" " + String(radio.eon[i].mappedfreq / 100) + "." + String((radio.eon[i].mappedfreq % 100) / 10)) : "") + (radio.eon[i].mappedfreq2 > 0 ? String(" / " + String(radio.eon[i].mappedfreq2 / 100) + "." + String((radio.eon[i].mappedfreq2 % 100) / 10)) : "") + (radio.eon[i].mappedfreq3 > 0 ? String(" / " + String(radio.eon[i].mappedfreq3 / 100) + "." + String((radio.eon[i].mappedfreq3 % 100) / 10)) : "") + (i == radio.eon_counter - 1 ? " " : " | "); else eonstring = myLanguage[language][88]; if (haseonold != radio.rds.hasEON) { if (!screenmute) { - if (radio.eon_counter > 0) tftPrint(-1, "EON", 153, 51, PrimaryColor, PrimaryColorSmooth, 16); else tftPrint(-1, "EON", 153, 51, GreyoutColor, BackgroundColor, 16); + if (radio.rds.hasEON) tftPrint(-1, "EON", 153, 51, PrimaryColor, PrimaryColorSmooth, 16); else tftPrint(-1, "EON", 153, 51, GreyoutColor, BackgroundColor, 16); } haseonold = radio.rds.hasEON; } @@ -678,7 +678,7 @@ void ShowAFEON() { } } - if (radio.eon_counter > 0 && afpagenr > 1) { + if (radio.rds.hasEON && afpagenr > 1) { if (!haseonold) { tftPrint(-1, myLanguage[language][88], 6, 48, BackgroundColor, BackgroundColor, 16); tftPrint(-1, "PI", 4, 32, ActiveColor, ActiveColorSmooth, 16); @@ -804,10 +804,10 @@ void ShowAFEON() { xPos --; rttickerhold = millis(); } - if (xPos < -tft.textWidth(String(myLanguage[language][93]) + " - " + String(myLanguage[language][204]) + ": " + AIDString) + (charWidth * 14)) xPos = 0; + if (xPos < -tft.textWidth(String(myLanguage[language][93]) + " - " + String(myLanguage[language][79]) + ": " + AIDString) + (charWidth * 14)) xPos = 0; RadiotextSprite.fillSprite(BackgroundColor); RadiotextSprite.setTextColor(ActiveColor, ActiveColorSmooth, false); - RadiotextSprite.drawString(String(myLanguage[language][93]) + " - " + String(myLanguage[language][204]) + ": " + AIDString, xPos, 2); + RadiotextSprite.drawString(String(myLanguage[language][93]) + " - " + String(myLanguage[language][79]) + ": " + AIDString, xPos, 2); RadiotextSprite.pushSprite(5, 220); } }