Merge branch 'NTP' into master

src/mesh/http/WiFiAPClient.cpp

@@ -10,6 +10,8 @@
 #include <DNSServer.h>
 #include <ESPmDNS.h>
 #include <WiFi.h>
+#include <WiFiUdp.h>
+#include <NTPClient.h>
 
 using namespace concurrency;
 
@@ -18,6 +20,10 @@ static void WiFiEvent(WiFiEvent_t event);
 // DNS Server for the Captive Portal
 DNSServer dnsServer;
 
+// NTP
+WiFiUDP ntpUDP;
+NTPClient timeClient(ntpUDP, "0.pool.ntp.org");
+
 uint8_t wifiDisconnectReason = 0;
 
 // Stores our hostname
@@ -46,10 +52,11 @@ static WifiSleepObserver wifiSleepObserver;
 
 static int32_t reconnectWiFi()
 {
+    const char *wifiName = radioConfig.preferences.wifi_ssid;
+    const char *wifiPsw = radioConfig.preferences.wifi_password;
+
     if (radioConfig.has_preferences && needReconnect) {
 
-        const char *wifiName = radioConfig.preferences.wifi_ssid;
-        const char *wifiPsw = radioConfig.preferences.wifi_password;
 
         if (!*wifiPsw) // Treat empty password as no password
             wifiPsw = NULL;
@@ -60,9 +67,21 @@ static int32_t reconnectWiFi()
             DEBUG_MSG("... Reconnecting to WiFi access point\n");
             WiFi.mode(WIFI_MODE_STA);
             WiFi.begin(wifiName, wifiPsw);
+
+            // Starting timeClient;
+
+
         }
     }
 
+    if (*wifiName) {
+        DEBUG_MSG("Updating NTP time\n");
+        timeClient.update();
+
+        Serial.println(timeClient.getFormattedTime());
+        Serial.println(timeClient.getEpochTime());
+    }
+
     return 30 * 1000; // every 30 seconds
 }
 
@@ -128,6 +147,9 @@ static void onNetworkConnected()
             MDNS.addService("https", "tcp", 443);
         }
 
+        DEBUG_MSG("Starting NTP time client\n");
+        timeClient.begin();
+
         initWebServer();
         initApiServer();