Skip to content

Add display time format option hh:mm #135

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 17, 2021
Merged

Add display time format option hh:mm #135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a0ea77e
Add display time format option hh:mm
afreisinger Aug 17, 2021
d1f4671
By default hh:mm:ss is displayed
afreisinger Aug 17, 2021
c9371f2
Fix formatting
marcelstoer Aug 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 13 additions & 4 deletions esp8266-weather-station-color.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -365,12 +365,21 @@ void drawTime() {

gfx.setFont(ArialRoundedMTBold_36);

if (IS_STYLE_12HR) {
if (IS_STYLE_12HR) { //12:00
int hour = (timeinfo->tm_hour + 11) % 12 + 1; // take care of noon and midnight
sprintf(time_str, "%2d:%02d:%02d\n", hour, timeinfo->tm_min, timeinfo->tm_sec);
} else {
sprintf(time_str, "%02d:%02d:%02d\n", timeinfo->tm_hour, timeinfo->tm_min, timeinfo->tm_sec);
if (IS_STYLE_HHMM) {
sprintf(time_str, "%2d:%02d\n", hour, timeinfo->tm_min); //hh:mm
} else {
sprintf(time_str, "%2d:%02d:%02d\n", hour, timeinfo->tm_min, timeinfo->tm_sec); //hh:mm:ss
}
} else { //24:00
if (IS_STYLE_HHMM) {
sprintf(time_str, "%02d:%02d\n", timeinfo->tm_hour, timeinfo->tm_min); //hh:mm
} else {
sprintf(time_str, "%02d:%02d:%02d\n", timeinfo->tm_hour, timeinfo->tm_min, timeinfo->tm_sec); //hh:mm:ss
}
}

gfx.drawString(120, 20, time_str);

gfx.setTextAlignment(TEXT_ALIGN_LEFT);
Expand Down
3 changes: 3 additions & 0 deletions settings.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,9 @@ bool IS_METRIC = true;
// Change for 12 Hour/ 24 hour style clock
bool IS_STYLE_12HR = false;

// Change for HH:MM/ HH:MM:SS format clock
bool IS_STYLE_HHMM = false; // true => HH:MM

// change for different NTP (time servers)
#define NTP_SERVERS "pool.ntp.org"
// #define NTP_SERVERS "us.pool.ntp.org", "time.nist.gov", "pool.ntp.org"
Expand Down