Option to build without NTP support

code/espurna/config/all.h

@@ -1,9 +1,9 @@
 #include "version.h"
 #include "arduino.h"
-#include "prototypes.h"
 #include "hardware.h"
 #include "general.h"
 #include "sensors.h"
+#include "prototypes.h"
 
 /*
     If you want to modify the stock configuration but you don't want to touch

code/espurna/config/arduino.h

@@ -56,6 +56,7 @@
 //#define INFLUXDB_SUPPORT       0
 //#define MDNS_SUPPORT           0
 //#define NOFUSS_SUPPORT         1
+//#define NTP_SUPPORT            0
 //#define RF_SUPPORT             1
 //#define SPIFFS_SUPPORT         1
 //#define TERMINAL_SUPPORT       0

code/espurna/config/general.h

@@ -285,7 +285,9 @@ PROGMEM const char* const custom_reset_string[] = {
 // MDNS
 // -----------------------------------------------------------------------------
 
+#ifndef MDNS_SUPPORT
 #define MDNS_SUPPORT            1           // Enable MDNS by default
+#endif
 
 // -----------------------------------------------------------------------------
 // SPIFFS
@@ -455,6 +457,10 @@ PROGMEM const char* const custom_reset_string[] = {
 // NTP
 // -----------------------------------------------------------------------------
 
+#ifndef NTP_SUPPORT
+#define NTP_SUPPORT             1               // Build with NTP support by default
+#endif
+
 #define NTP_SERVER              "pool.ntp.org"  // Default NTP server
 #define NTP_TIME_OFFSET         1               // Default timezone offset (GMT+1)
 #define NTP_DAY_LIGHT           true            // Enable daylight time saving by default

code/espurna/config/prototypes.h

@@ -1,5 +1,4 @@
 #include <Arduino.h>
-#include <functional>
 #include <NtpClientLib.h>
 #include <ESPAsyncWebServer.h>
 #include <AsyncMqttClient.h>

code/espurna/espurna.ino

@@ -42,7 +42,10 @@ void heartbeat() {
     unsigned long uptime_seconds = uptime_overflows * (UPTIME_OVERFLOW / 1000) + (last_uptime / 1000);
     unsigned int free_heap = ESP.getFreeHeap();
 
-    DEBUG_MSG_P(PSTR("[MAIN] Time: %s\n"), (char *) ntpDateTime().c_str());
+    #if NTP_SUPPORT
+        DEBUG_MSG_P(PSTR("[MAIN] Time: %s\n"), (char *) ntpDateTime().c_str());
+    #endif
+    
     if (!mqttConnected()) {
         DEBUG_MSG_P(PSTR("[MAIN] Uptime: %ld seconds\n"), uptime_seconds);
         DEBUG_MSG_P(PSTR("[MAIN] Free heap: %d bytes\n"), free_heap);
@@ -123,9 +126,9 @@ void hardwareSetup() {
 
     #if DEBUG_SERIAL_SUPPORT
         DEBUG_PORT.begin(SERIAL_BAUDRATE);
-        if (customReset() == CUSTOM_RESET_HARDWARE) {
+        #if DEBUG_ESP_WIFI
             DEBUG_PORT.setDebugOutput(true);
-        }
+        #endif
     #elif defined(SERIAL_BAUDRATE)
         Serial.begin(SERIAL_BAUDRATE);
     #endif
@@ -242,12 +245,14 @@ void setup() {
     wifiSetup();
     otaSetup();
     mqttSetup();
-    ntpSetup();
 
     #ifdef ITEAD_SONOFF_RFBRIDGE
         rfbSetup();
     #endif
 
+    #if NTP_SUPPORT
+        ntpSetup();
+    #endif
     #if I2C_SUPPORT
         i2cSetup();
     #endif
@@ -296,12 +301,14 @@ void loop() {
     wifiLoop();
     otaLoop();
     mqttLoop();
-    ntpLoop();
 
     #ifdef ITEAD_SONOFF_RFBRIDGE
         rfbLoop();
     #endif
 
+    #if NTP_SUPPORT
+        ntpLoop();
+    #endif
     #if TERMINAL_SUPPORT
         settingsLoop();
     #endif

code/espurna/mqtt.ino

@@ -91,7 +91,9 @@ void _mqttFlush() {
         mqtt_message_t element = _mqtt_queue[i];
         root[element.topic] = element.message;
     }
-    if (ntpConnected()) root[MQTT_TOPIC_TIME] = ntpDateTime();
+    #if NTP_SUPPORT
+        if (ntpConnected()) root[MQTT_TOPIC_TIME] = ntpDateTime();
+    #endif
     root[MQTT_TOPIC_HOSTNAME] = getSetting("hostname");
     root[MQTT_TOPIC_IP] = getIP();
 

code/espurna/ntp.ino

@@ -6,6 +6,8 @@ Copyright (C) 2016-2017 by Xose Pérez <xose dot perez at gmail dot com>
 
 */
 
+#if NTP_SUPPORT
+
 #include <TimeLib.h>
 #include <NtpClientLib.h>
 #include <WiFiClient.h>
@@ -66,3 +68,5 @@ void ntpSetup() {
 void ntpLoop() {
     now();
 }
+
+#endif // NTP_SUPPORT

code/espurna/web.ino

@@ -18,12 +18,12 @@ Copyright (C) 2016-2017 by Xose Pérez <xose dot perez at gmail dot com>
 
 #if WEB_EMBEDDED
 #include "static/index.html.gz.h"
-#endif
+#endif // WEB_EMBEDDED
 
 #if ASYNC_TCP_SSL_ENABLED & WEB_SSL_ENABLED
 #include "static/server.cer.h"
 #include "static/server.key.h"
-#endif
+#endif // ASYNC_TCP_SSL_ENABLED & WEB_SSL_ENABLED
 
 // -----------------------------------------------------------------------------
 
@@ -302,7 +302,9 @@ void _wsParse(uint32_t client_id, uint8_t * payload, size_t length) {
                 setSetting(key, value);
                 save = changed = true;
                 if (key.startsWith("mqtt")) changedMQTT = true;
-                if (key.startsWith("ntp")) changedNTP = true;
+                #if NTP_SUPPORT
+                    if (key.startsWith("ntp")) changedNTP = true;
+                #endif
             }
 
         }
@@ -369,9 +371,9 @@ void _wsParse(uint32_t client_id, uint8_t * payload, size_t length) {
             }
 
             // Check if we should reconfigure NTP connection
-            if (changedNTP) {
-                ntpConnect();
-            }
+            #if NTP_SUPPORT
+                if (changedNTP) ntpConnect();
+            #endif
 
         }
 
@@ -420,12 +422,15 @@ void _wsStart(uint32_t client_id) {
         root["network"] = getNetwork();
         root["deviceip"] = getIP();
 
-        root["ntpStatus"] = ntpConnected();
-        root["ntpServer1"] = getSetting("ntpServer1", NTP_SERVER);
-        root["ntpServer2"] = getSetting("ntpServer2");
-        root["ntpServer3"] = getSetting("ntpServer3");
-        root["ntpOffset"] = getSetting("ntpOffset", NTP_TIME_OFFSET).toInt();
-        root["ntpDST"] = getSetting("ntpDST", NTP_DAY_LIGHT).toInt() == 1;
+        #if NTP_SUPPORT
+            root["ntpVisible"] = 1;
+            root["ntpStatus"] = ntpConnected();
+            root["ntpServer1"] = getSetting("ntpServer1", NTP_SERVER);
+            root["ntpServer2"] = getSetting("ntpServer2");
+            root["ntpServer3"] = getSetting("ntpServer3");
+            root["ntpOffset"] = getSetting("ntpOffset", NTP_TIME_OFFSET).toInt();
+            root["ntpDST"] = getSetting("ntpDST", NTP_DAY_LIGHT).toInt() == 1;
+        #endif
 
         root["mqttStatus"] = mqttConnected();
         root["mqttServer"] = getSetting("mqttServer", MQTT_SERVER);

code/espurna/wifi.ino

@@ -236,9 +236,11 @@ void wifiSetup() {
         #endif
 
         // NTP connection reset
-        if (code == MESSAGE_CONNECTED) {
-            ntpConnect();
-        }
+        #if NTP_SUPPORT
+            if (code == MESSAGE_CONNECTED) {
+                ntpConnect();
+            }
+        #endif
 
         // Manage POW
         #if HLW8012_SUPPORT

code/html/index.html

@@ -99,7 +99,7 @@
                             <a href="#" class="pure-menu-link" data="panel-mqtt">MQTT</a>
                         </li>
 
-                        <li class="pure-menu-item">
+                        <li class="pure-menu-item module module-ntp">
                             <a href="#" class="pure-menu-link" data="panel-ntp">NTP</a>
                         </li>