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

Added seconds to logbook

Browse Source
This commit is contained in:
Sjef Verhoeven PE5PVB
2025-01-14 12:44:06 +01:00
parent e42d2e92dc
commit c1db352f67
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
TEF6686_ESP32.ino
View File

@@ -5689,7 +5689,7 @@ String getCurrentDateTime() {
char buf[20];
if (clockampm) {
// USA format: MM/DD/YYYY, HH:MM AM/PM
// USA format: MM/DD/YYYY, HH:MM:SS AM/PM
strftime(buf, sizeof(buf), "%m/%d/%Y", &timeInfo); // Format as MM/DD/YYYY
// Format time in 12-hour format with AM/PM
@@ -5698,14 +5698,14 @@ String getCurrentDateTime() {
if (hour == 0) hour = 12; // Convert 0 hour to 12 AM
else if (hour > 12) hour -= 12; // Convert to 12-hour format for PM
String timeWithAMPM = String(hour) + ":" + (timeInfo.tm_min < 10 ? "0" : "") + String(timeInfo.tm_min) + " " + ampm;
String timeWithAMPM = String(hour) + ":" + (timeInfo.tm_min < 10 ? "0" : "") + String(timeInfo.tm_min) + ":" + (timeInfo.tm_sec < 10 ? "0" : "") + String(timeInfo.tm_sec) + " " + ampm;
// Return the final formatted date and time for the USA region
return String(buf) + "," + timeWithAMPM;
} else {
// European format: DD-MM-YYYY, HH:MM
// European format: DD-MM-YYYY, HH:MM:SS
strftime(buf, sizeof(buf), "%d-%m-%Y", &timeInfo); // Format as DD-MM-YYYY
String timeEuropean = String(timeInfo.tm_hour) + ":" + (timeInfo.tm_min < 10 ? "0" : "") + String(timeInfo.tm_min); // Format time with leading zero if needed
String timeEuropean = String(timeInfo.tm_hour) + ":" + (timeInfo.tm_min < 10 ? "0" : "") + String(timeInfo.tm_min) + ":" + (timeInfo.tm_sec < 10 ? "0" : "") + String(timeInfo.tm_sec); // Format time with leading zero if needed
return String(buf) + "," + timeEuropean;
}
}