Merge branch 'main' into New_Model_DP_666

TEF6686_ESP32.ino

@@ -1128,7 +1128,7 @@ void loop() {
     if (screensaver_IRQ)
     {
       screensaver_IRQ = OFF;
-      if (!screensavertriggered && !advancedRDS && !menu) {
+      if (!screensavertriggered && !menu) {
         WakeToSleep(true);
       }
     }
@@ -1635,9 +1635,6 @@ void BANDBUTTONPress() {
       }
     } else {
       if (!usesquelch) radio.setUnMute();
-      if (afscreen) {
-        BuildAdvancedRDS();
-      } else {
       unsigned long counterold = millis();
       unsigned long counter = millis();
       if (!menu) {
@@ -1648,8 +1645,9 @@ void BANDBUTTONPress() {
             WakeToSleep(REVERSE);
             return;
           }
-
+          if (afscreen) {
-            if (advancedRDS) {
+            BuildAdvancedRDS();
+          } else if (advancedRDS) {
             BuildDisplay();
             ScreensaverTimerReopen();
           } else {
@@ -1658,7 +1656,9 @@ void BANDBUTTONPress() {
               StoreFrequency();
               SelectBand();
               if (XDRGTKUSB || XDRGTKTCP) {
-                  if (band == BAND_FM) DataPrint("M0\nT" + String(frequency * 10) + "\n"); else if (band == BAND_OIRT) DataPrint("M0\nT" + String(frequency_OIRT * 10) + "\n"); else DataPrint("M1\nT" + String(frequency_AM) + "\n");
+                if (band == BAND_FM) DataPrint("M0\nT" + String(frequency * 10) + "\n");
+                else if (band == BAND_OIRT) DataPrint("M0\nT" + String(frequency_OIRT * 10) + "\n");
+                else DataPrint("M1\nT" + String(frequency_AM) + "\n");
               }
             } else {
               scanmodeold = tunemode;
@@ -1674,7 +1674,8 @@ void BANDBUTTONPress() {
           }
 
           if (band < BAND_GAP) {
-              if (advancedRDS && !seek) BuildAFScreen(); else BuildAdvancedRDS();
+            if (advancedRDS && !seek) BuildAFScreen();
+            else BuildAdvancedRDS();
           } else {
             WakeToSleep(true);
           }
@@ -1682,7 +1683,6 @@ void BANDBUTTONPress() {
       }
     }
   }
-  }
   while (digitalRead(BANDBUTTON) == LOW) delay(50);
   delay(100);
 }
@@ -3986,7 +3986,13 @@ void MuteScreen(bool setting) {
     setupmode = true;
     tft.writecommand(0x11);
     analogWrite(CONTRASTPIN, ContrastSet * 2 + 27);
+    if (band < BAND_GAP) {
+      if (afscreen) BuildAFScreen(); 
+      else if (advancedRDS) BuildAdvancedRDS();
+      else BuildDisplay();
+    } else {
       BuildDisplay();
+    }
     setupmode = false;
   } else if (setting && !screenmute) {
     screenmute = true;

src/gui.cpp

@@ -1412,7 +1412,6 @@ void BuildAdvancedRDS() {
   afpage = false;
   afpagenr = 1;
   advancedRDS = true;
-  ScreensaverTimerSet(OFF);
 
   tft.fillScreen(BackgroundColor);
   tft.drawRect(0, 0, 320, 240, FrameColor);
@@ -1859,13 +1858,13 @@ void MenuUp() {
 
             OneBigLineSprite.setTextDatum(TL_DATUM);
             OneBigLineSprite.setTextColor(ActiveColor, ActiveColorSmooth, false);
-            OneBigLineSprite.drawString("MHz", 155, 0);
+            OneBigLineSprite.drawString("MHz", 175, 0);
             OneBigLineSprite.setTextDatum(TR_DATUM);
             OneBigLineSprite.setTextColor(PrimaryColor, PrimaryColorSmooth, false);
             if (spispeed == 7) {
-              OneBigLineSprite.drawString(myLanguage[language][86], 140, 0);
+              OneBigLineSprite.drawString(myLanguage[language][86], 160, 0);
             } else {
-              OneBigLineSprite.drawString((spispeed == SPI_SPEED_DEFAULT ? String(myLanguage[language][204]) + " " + String(SPI_FREQUENCY / 1000000, DEC) : String(spispeed * 10, DEC)), 140, 0);
+              OneBigLineSprite.drawString((spispeed == SPI_SPEED_DEFAULT ? String(myLanguage[language][204]) + " " + String(SPI_FREQUENCY / 1000000, DEC) : String(spispeed * 10, DEC)), 160, 0);
             }
             OneBigLineSprite.pushSprite(24, 118);
 
@@ -2682,13 +2681,13 @@ void MenuDown() {
             if (spispeed > SPI_SPEED_COUNT - 1) spispeed = SPI_SPEED_COUNT - 1;
             OneBigLineSprite.setTextDatum(TL_DATUM);
             OneBigLineSprite.setTextColor(ActiveColor, ActiveColorSmooth, false);
-            OneBigLineSprite.drawString("MHz", 155, 0);
+            OneBigLineSprite.drawString("MHz", 175, 0);
             OneBigLineSprite.setTextDatum(TR_DATUM);
             OneBigLineSprite.setTextColor(PrimaryColor, PrimaryColorSmooth, false);
             if (spispeed == 7) {
-              OneBigLineSprite.drawString(myLanguage[language][86], 140, 0);
+              OneBigLineSprite.drawString(myLanguage[language][86], 160, 0);
             } else {
-              OneBigLineSprite.drawString((spispeed == SPI_SPEED_DEFAULT ? String(myLanguage[language][204]) + " " + String(SPI_FREQUENCY / 1000000, DEC) : String(spispeed * 10, DEC)), 140, 0);
+              OneBigLineSprite.drawString((spispeed == SPI_SPEED_DEFAULT ? String(myLanguage[language][204]) + " " + String(SPI_FREQUENCY / 1000000, DEC) : String(spispeed * 10, DEC)), 160, 0);
             }
             OneBigLineSprite.pushSprite(24, 118);
 
@@ -3571,13 +3570,13 @@ void DoMenu() {
 
             OneBigLineSprite.setTextDatum(TL_DATUM);
             OneBigLineSprite.setTextColor(ActiveColor, ActiveColorSmooth, false);
-            OneBigLineSprite.drawString("MHz", 155, 0);
+            OneBigLineSprite.drawString("MHz", 175, 0);
             OneBigLineSprite.setTextDatum(TR_DATUM);
             OneBigLineSprite.setTextColor(PrimaryColor, PrimaryColorSmooth, false);
             if (spispeed == 7) {
-              OneBigLineSprite.drawString(myLanguage[language][86], 140, 0);
+              OneBigLineSprite.drawString(myLanguage[language][86], 160, 0);
             } else {
-              OneBigLineSprite.drawString((spispeed == SPI_SPEED_DEFAULT ? String(myLanguage[language][204]) + " " + String(SPI_FREQUENCY / 1000000, DEC) : String(spispeed * 10, DEC)), 140, 0);
+              OneBigLineSprite.drawString((spispeed == SPI_SPEED_DEFAULT ? String(myLanguage[language][204]) + " " + String(SPI_FREQUENCY / 1000000, DEC) : String(spispeed * 10, DEC)), 160, 0);
             }
             OneBigLineSprite.pushSprite(24, 118);
             break;

src/language.h

@@ -996,7 +996,7 @@ static const char* const myLanguage[18][224] PROGMEM = {
     "KAMIA", // 83
     "Έκδοση λογισμικού", // 84
     "Γραμματοσειρά\nσυχνότητας", // 85
-    "Auto", // 86
+    "Αυτόματο", // 86
     "Μη διαθέσιμο AF", // 87
     "Μη διαθέσιμο EON", // 88
     "Μη διαθέσιμο RT+", // 89

src/rds.cpp

@@ -82,7 +82,7 @@ void ShowAdvancedRDS() {
     hasafold = radio.rds.hasAF;
   }
 
-  if (millis() - afticker >= 15) {
+  if (millis() - afticker >= 5) {
     if (radio.rds.hasAF) {
       if (afstring.length() != afstringlengthold) {
         afstringWidth = afstring.length() * charwidth;
@@ -119,7 +119,7 @@ void ShowAdvancedRDS() {
     haseonold = radio.rds.hasEON;
   }
 
-  if (millis() - eonticker >= 15) {
+  if (millis() - eonticker >= 5) {
 
     if (radio.rds.hasEON) {
       if (eonstring.length() != eonstringlengthold) {
@@ -157,7 +157,7 @@ void ShowAdvancedRDS() {
     hasrtplusold = radio.rds.hasRDSplus;
   }
 
-  if (millis() - rtplusticker >= 15) {
+  if (millis() - rtplusticker >= 5) {
     if (radio.rds.hasRDSplus) {
       if (rtplusstring.length() != rtplusstringlengthold) {
         rtplusstringWidth = rtplusstring.length() * charwidth;
@@ -753,7 +753,7 @@ void showRadioText() {
         RadiotextSprite.drawString(radio.rds.stationText + " " + radio.rds.stationText32, xPos, 2);
         RadiotextSprite.pushSprite(36, 220);
       } else {
-        if (millis() - rtticker >= 15) {
+        if (millis() - rtticker >= (advancedRDS ? 5 : 15)) {
           if (xPos == 0) {
             if (millis() - rttickerhold >= 1000) {
               xPos --;