Skip to content

Commit 04c087a

Browse files
committed
Small corrections
1 parent fbea3dd commit 04c087a

File tree

1 file changed

+36
-17
lines changed

1 file changed

+36
-17
lines changed

NTP_Example.ino renamed to NTP_Example/NTP_Example.ino

Lines changed: 36 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
#include <WiFi.h>
4040
#endif
4141
#include <time.h>
42-
// #include <credentials.h>
42+
#include <credentials.h>
4343

4444
/*
4545
The credentials.h file at least has to contain:
@@ -76,7 +76,7 @@ void setup() {
7676
int counter = 0;
7777
while (WiFi.status() != WL_CONNECTED) {
7878
delay(200);
79-
if (++counter > 10) ESP.restart();
79+
if (++counter > 100) ESP.restart();
8080
Serial.print ( "." );
8181
}
8282
Serial.println("\n\nWiFi connected\n\n");
@@ -90,7 +90,7 @@ void setup() {
9090
Serial.println("Time not set");
9191
ESP.restart();
9292
}
93-
showTime(&timeinfo);
93+
showTime(timeinfo);
9494
lastNTPtime = time(&now);
9595
lastEntryTime = millis();
9696
}
@@ -99,7 +99,7 @@ void setup() {
9999
void loop() {
100100
// getTimeReducedTraffic(3600);
101101
getNTPtime(10);
102-
showTime(&timeinfo);
102+
showTime(timeinfo);
103103
delay(1000);
104104
}
105105

@@ -115,7 +115,7 @@ bool getNTPtime(int sec) {
115115
} while (((millis() - start) <= (1000 * sec)) && (timeinfo.tm_year < (2016 - 1900)));
116116
if (timeinfo.tm_year <= (2016 - 1900)) return false; // the NTP call was not successful
117117
Serial.print("now "); Serial.println(now);
118-
char time_output[30];
118+
char time_output[30];
119119
strftime(time_output, 30, "%a %d-%m-%y %T", localtime(&now));
120120
Serial.println(time_output);
121121
Serial.println();
@@ -124,11 +124,11 @@ bool getNTPtime(int sec) {
124124
}
125125

126126

127-
// This function is obsolete because the time() function only calls the NTP server every hour. So you can always use getNTPtime()
127+
// This function is obsolete because the time() function only calls the NTP server every hour. So you can always use getNTPtime()
128128
// It can be deleted and only stays here for the video
129129

130130
/*
131-
void getTimeReducedTraffic(int sec) {
131+
void getTimeReducedTraffic(int sec) {
132132
tm *ptm;
133133
if ((millis() - lastEntryTime) < (1000 * sec)) {
134134
now = lastNTPtime + (int)(millis() - lastEntryTime) / 1000;
@@ -140,22 +140,41 @@ void getTimeReducedTraffic(int sec) {
140140
}
141141
ptm = localtime(&now);
142142
timeinfo = *ptm;
143-
}
143+
}
144144
*/
145145

146-
void showTime(tm *localTime) {
147-
Serial.print(localTime->tm_mday);
146+
void showTime(tm localTime) {
147+
Serial.print(localTime.tm_mday);
148148
Serial.print('/');
149-
Serial.print(localTime->tm_mon + 1);
149+
Serial.print(localTime.tm_mon + 1);
150150
Serial.print('/');
151-
Serial.print(localTime->tm_year - 100);
151+
Serial.print(localTime.tm_year - 100);
152152
Serial.print('-');
153-
Serial.print(localTime->tm_hour);
153+
Serial.print(localTime.tm_hour);
154154
Serial.print(':');
155-
Serial.print(localTime->tm_min);
155+
Serial.print(localTime.tm_min);
156156
Serial.print(':');
157-
Serial.print(localTime->tm_sec);
157+
Serial.print(localTime.tm_sec);
158158
Serial.print(" Day of Week ");
159-
if (localTime->tm_mday = 0) localTime->tm_mday = 7;
160-
Serial.println(localTime->tm_wday);
159+
if (localTime.tm_wday == 0) Serial.println(7);
160+
else Serial.println(localTime.tm_wday);
161161
}
162+
163+
164+
/*
165+
// Shorter way of displaying the time
166+
void showTime(tm localTime) {
167+
Serial.printf(
168+
"%04d-%02d-%02d %02d:%02d:%02d, day %d, %s time\n",
169+
localTime.tm_year + 1900,
170+
localTime.tm_mon + 1,
171+
localTime.tm_mday,
172+
localTime.tm_hour,
173+
localTime.tm_min,
174+
localTime.tm_sec,
175+
(localTime.tm_wday > 0 ? localTime.tm_wday : 7 ),
176+
(localTime.tm_isdst == 1 ? "summer" : "standard")
177+
);
178+
}
179+
180+
*/

0 commit comments

Comments
 (0)