GUI optimalisation
This commit is contained in:
@@ -932,6 +932,7 @@ void setup() {
|
||||
Wire.endTransmission();
|
||||
}
|
||||
|
||||
Stereostatusold = radio.getStereoStatus();
|
||||
BuildDisplay();
|
||||
SelectBand();
|
||||
if (tunemode == TUNE_MEM) DoMemoryPosTune();
|
||||
|
||||
+3
-3
@@ -903,9 +903,9 @@ void passwordcrypt() {
|
||||
|
||||
void tryWiFi() {
|
||||
if (!setupmode && wifi) {
|
||||
tft.drawRoundRect(1, 60, 319, 140, 5, ActiveColor);
|
||||
tft.fillRoundRect(3, 62, 315, 136, 5, BackgroundColor);
|
||||
tftPrint(0, myLanguage[language][55], 155, 88, ActiveColor, ActiveColorSmooth, 28);
|
||||
tft.drawRoundRect(1, 20, 319, 180, 5, ActiveColor);
|
||||
tft.fillRoundRect(3, 22, 315, 176, 5, BackgroundColor);
|
||||
Infoboxprint(myLanguage[language][55]);
|
||||
}
|
||||
if (wifi) {
|
||||
if (wc.autoConnect()) {
|
||||
|
||||
@@ -153,4 +153,5 @@ extern void NTPupdate();
|
||||
extern void handleRoot();
|
||||
extern void handleDownloadCSV();
|
||||
extern void handleLogo();
|
||||
extern void Infoboxprint(const char* input);
|
||||
#endif
|
||||
+8
-4
@@ -814,7 +814,11 @@ void showCT() {
|
||||
rds_clock = String(timeStr);
|
||||
|
||||
// Format the date as DD-MM-YY
|
||||
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_date, 134, 16, BackgroundColor, BackgroundColor, 16);
|
||||
tftPrint(0, rds_dateold, 134, 15, BackgroundColor, BackgroundColor, 16);
|
||||
tftPrint(0, rds_date, 134, 15, BackgroundColor, BackgroundColor, 16);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user