kuba/TEF6686_ESP32
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

Fixed problem with clock in 12-hour display

Browse Source
This commit is contained in:
Sjef Verhoeven PE5PVB
2025-01-10 11:07:20 +01:00
parent de5bdffe27
commit 74284f67de
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/rds.cpp
+5 -3
View File
@@ -806,8 +806,6 @@ void showCT() {
// Format the time based on region // Format the time based on region
if (radio.rds.region == 1) { // USA region: 12-hour AM/PM format if (radio.rds.region == 1) { // USA region: 12-hour AM/PM format
strftime(str, sizeof(str), "%I:%M", localtime(&t));
// Determine AM/PM and adjust hour format // Determine AM/PM and adjust hour format
int hour = localtime(&t)->tm_hour; int hour = localtime(&t)->tm_hour;
String ampm = (hour >= 12) ? "PM" : "AM"; String ampm = (hour >= 12) ? "PM" : "AM";
@@ -817,7 +815,11 @@ void showCT() {
hour -= 12; // Convert PM hours hour -= 12; // Convert PM hours
} }
rds_clock = String(hour) + ":" + String(localtime(&t)->tm_min) + " " + ampm; // Format the time string with leading zeros for minutes
char formattedTime[10];
sprintf(formattedTime, "%d:%02d %s", hour, localtime(&t)->tm_min, ampm.c_str());
rds_clock = String(formattedTime);
} else { // Other regions: 24-hour format } else { // Other regions: 24-hour format
strftime(str, sizeof(str), "%H:%M", localtime(&t)); strftime(str, sizeof(str), "%H:%M", localtime(&t));
rds_clock = String(str); rds_clock = String(str);