GUI optimalisation

TEF6686_ESP32.ino

@@ -932,6 +932,7 @@ void setup() {
     Wire.endTransmission();
   }
 
+  Stereostatusold = radio.getStereoStatus();
   BuildDisplay();
   SelectBand();
   if (tunemode == TUNE_MEM) DoMemoryPosTune();

src/comms.cpp

@@ -732,7 +732,7 @@ void XDRGTKRoutine() {
 
           case '\0':
             radio.setMute();
-            if (!screenmute && !afscreen) tft.drawBitmap((advancedRDS ? 215 : 253), (advancedRDS ? 47: 142), Speaker, 21, 20, PrimaryColor);
+            if (!screenmute && !afscreen) tft.drawBitmap((advancedRDS ? 215 : 253), (advancedRDS ? 47 : 142), Speaker, 21, 20, PrimaryColor);
             if (!screenmute) {
               tft.drawRoundRect(10, 30, 300, 170, 5, ActiveColor);
               tft.fillRoundRect(12, 32, 296, 166, 5, BackgroundColor);
@@ -761,7 +761,7 @@ void XDRGTKRoutine() {
             XDRScan = false;
             if (VolSet != 0) {
               radio.setUnMute();
-              if (!screenmute && !afscreen) tft.drawBitmap((advancedRDS ? 215 : 253), (advancedRDS ? 47: 142), Speaker, 21, 20, GreyoutColor);
+              if (!screenmute && !afscreen) tft.drawBitmap((advancedRDS ? 215 : 253), (advancedRDS ? 47 : 142), Speaker, 21, 20, GreyoutColor);
               radio.setVolume(((VolSet * 10) - 40) / 10);
             }
             break;
@@ -799,12 +799,12 @@ void XDRGTKRoutine() {
         VolSet = atoi(buff + 1);
         if (VolSet == 0) {
           radio.setMute();
-          if (!screenmute && !afscreen) tft.drawBitmap((advancedRDS ? 215 : 253), (advancedRDS ? 47: 142), Speaker, 21, 20, PrimaryColor);
+          if (!screenmute && !afscreen) tft.drawBitmap((advancedRDS ? 215 : 253), (advancedRDS ? 47 : 142), Speaker, 21, 20, PrimaryColor);
           XDRMute = true;
           SQ = true;
         } else {
           radio.setUnMute();
-          if (!screenmute && !afscreen) tft.drawBitmap((advancedRDS ? 215 : 253), (advancedRDS ? 47: 142), Speaker, 21, 20, GreyoutColor);
+          if (!screenmute && !afscreen) tft.drawBitmap((advancedRDS ? 215 : 253), (advancedRDS ? 47 : 142), Speaker, 21, 20, GreyoutColor);
           radio.setVolume((VolSet - 40) / 10);
           XDRMute = false;
         }
@@ -831,7 +831,7 @@ void XDRGTKRoutine() {
         store = true;
         XDRMute = false;
         radio.setUnMute();
-        if (!screenmute && !afscreen) tft.drawBitmap((advancedRDS ? 215 : 253), (advancedRDS ? 47: 142), Speaker, 21, 20, GreyoutColor);
+        if (!screenmute && !afscreen) tft.drawBitmap((advancedRDS ? 215 : 253), (advancedRDS ? 47 : 142), Speaker, 21, 20, GreyoutColor);
         VolSet = EEPROM.readByte(EE_BYTE_VOLSET);
         LowLevelSet = EEPROM.readByte(EE_BYTE_LOWLEVELSET);
         softmuteam = EEPROM.readByte(EE_BYTE_SOFTMUTEAM);
@@ -903,9 +903,9 @@ void passwordcrypt() {
 
 void tryWiFi() {
   if (!setupmode && wifi) {
-    tft.drawRoundRect(1, 60, 319, 140, 5, ActiveColor);
+    tft.drawRoundRect(1, 20, 319, 180, 5, ActiveColor);
-    tft.fillRoundRect(3, 62, 315, 136, 5, BackgroundColor);
+    tft.fillRoundRect(3, 22, 315, 176, 5, BackgroundColor);
-    tftPrint(0, myLanguage[language][55], 155, 88, ActiveColor, ActiveColorSmooth, 28);
+    Infoboxprint(myLanguage[language][55]);
   }
   if (wifi) {
     if (wc.autoConnect()) {

src/comms.h

@@ -153,4 +153,5 @@ extern void NTPupdate();
 extern void handleRoot();
 extern void handleDownloadCSV();
 extern void handleLogo();
+extern void Infoboxprint(const char* input);
 #endif

src/language.h

@@ -3663,7 +3663,7 @@ static const char* const myLanguage[21][300] PROGMEM = {
     "Викл.", // 30
     "У", // 31
     "НАТ. MODE ДЛЯ ЗБЕР. Й ВИХ.", // 32
-    "НАСТИСНІТЬ BAND ДЛЯ ЗАКРИТТЯ", // 33 
+    "НАСТИСНІТЬ BAND ДЛЯ ЗАКРИТТЯ", // 33
     "СКАНУВАННЯ...", // 34
     "Тюнер не виявлено", // 35
     "Підсилення AM-антени", // 36
@@ -6349,4 +6349,4 @@ static const char* const myLanguage[21][300] PROGMEM = {
   }
 
 };
-#endif
+#endif

src/rds.cpp

@@ -814,7 +814,11 @@ void showCT() {
   rds_clock = String(timeStr);
 
   // Format the date as DD-MM-YY
-  strftime(dateStr, sizeof(dateStr), "%d-%m-%y", localtime(&t));
+  if (clockampm) {
+    strftime(dateStr, sizeof(dateStr), "%m-%d-%y", localtime(&t));
+  } else {
+    strftime(dateStr, sizeof(dateStr), "%d-%m-%y", localtime(&t));
+  }
   rds_date = String(dateStr);
 
   // Check if the clock or RDS CT status has changed
@@ -829,16 +833,16 @@ void showCT() {
 
       // Display the updated time and date
       tftReplace(0, rds_clockold, rds_clock, 134, 1, RDSColor, RDSColorSmooth, BackgroundColor, 16);
-      tftReplace(0, rds_dateold, rds_date, 134, 16, RDSColor, RDSColorSmooth, BackgroundColor, 16);
+      tftReplace(0, rds_dateold, rds_date, 134, 15, RDSColor, RDSColorSmooth, BackgroundColor, 16);
     } else { // Handle dropout scenarios
       if (rtcset) { // Display dropout message if RTC was set
         tftReplace(0, rds_clockold, rds_clock, 134, 1, RDSDropoutColor, RDSDropoutColorSmooth, BackgroundColor, 16);
-        tftReplace(0, rds_dateold, rds_date, 134, 16, RDSDropoutColor, RDSDropoutColorSmooth, BackgroundColor, 16);
+        tftReplace(0, rds_dateold, rds_date, 134, 15, RDSDropoutColor, RDSDropoutColorSmooth, BackgroundColor, 16);
       } else { // Clear and reprint the clock and date
         tftPrint(0, rds_clockold, 134, 1, BackgroundColor, BackgroundColor, 16);
         tftPrint(0, rds_clock, 134, 1, BackgroundColor, BackgroundColor, 16);
-        tftPrint(0, rds_dateold, 134, 16, BackgroundColor, BackgroundColor, 16);
+        tftPrint(0, rds_dateold, 134, 15, BackgroundColor, BackgroundColor, 16);
-        tftPrint(0, rds_date, 134, 16, BackgroundColor, BackgroundColor, 16);
+        tftPrint(0, rds_date, 134, 15, BackgroundColor, BackgroundColor, 16);
       }
     }
   }