Add Day of Week

lbussy · Feb 20, 2021 · 5adbd23 · 5adbd23
1 parent 66809c2
commit 5adbd23
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 7 deletions.
diff --git a/src/config.h b/src/config.h
@@ -65,7 +65,7 @@ SOFTWARE. */
 // Use SPIFFS Editor
 //
 #ifndef SPIFFSEDIT
-// #define SPIFFSEDIT
+#define SPIFFSEDIT
 #endif
 //
 //////////////////////////////////////////////////////////////////////////

diff --git a/src/ntp.cpp b/src/ntp.cpp
@@ -25,14 +25,18 @@ SOFTWARE. */
 
 #include "ntp.h"
 
+static const int __attribute__((unused)) SECS_1_1_2019 = 1546300800; //1546300800 =  01/01/2019 @ 12:00am (UTC)
+static const char __attribute__((unused)) * DAY_OF_WEEK[] = {"Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"};
+static const char __attribute__((unused)) * DAY_OF_WEEK_SHORT[] = {"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"};
+
 void setClock()
 {
     Ticker blinker;
     Log.notice(F("Entering blocking loop to get NTP time."));
     blinker.attach_ms(NTPBLINK, ntpBlinker);
     unsigned long startSecs = millis() / 1000;
     int cycle = 0;
-    while (time(nullptr) < EPOCH_1_1_2019)
+    while (time(nullptr) < SECS_1_1_2019)
     {
         configTime(THISTZ, TIMESERVER);
         if ((millis() / 1000) - startSecs > 9)
@@ -126,6 +130,16 @@ int getWday()
     return wday;
 }
 
+String getDayofWeek()
+{
+    return DAY_OF_WEEK[getWday()];
+}
+
+String getShortDayofWeek()
+{
+    return DAY_OF_WEEK_SHORT[getWday()];
+}
+
 int getHour()
 {
     // tm_hour = hours since midnight (0-23)

diff --git a/src/ntp.h b/src/ntp.h
@@ -36,21 +36,18 @@ SOFTWARE. */
 #include <Ticker.h>
 #include <ArduinoLog.h>
 
-
 void setClock();
 String getDTS();
 int getYear();   // tm_year
 int getMonth();  // tm_mon
 int getDate();   // tm_mday
 int getWday();   // tm_wday
+String getDayofWeek();
+String getShortDayofWeek();
 int getHour();   // tm_hour
 int getMinute(); // tm_min
 int getSecond(); // tm_sec
 int getYDay();   // tm_yday
 void ntpBlinker();
 
-static const int __attribute__((unused)) EPOCH_1_1_2019 = 1546300800; //1546300800 =  01/01/2019 @ 12:00am (UTC)
-static const char __attribute__((unused)) * DAYS_OF_WEEK[] = {"Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"};
-static const char __attribute__((unused)) * DAYS_OF_WEEK_3[] = {"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"};
-
 #endif // _NTP_H