Show NTP status on web interface (#126)

xoseperez · Apr 24, 2017 · 3a87297 · 3a87297
1 parent ac179da
commit 3a87297
Show file tree

Hide file tree

Showing 6 changed files with 67 additions and 51 deletions.
diff --git a/code/espurna/data/index.html.gz b/code/espurna/data/index.html.gz
diff --git a/code/espurna/ntp.ino b/code/espurna/ntp.ino
@@ -19,6 +19,10 @@ void ntpConnect() {
  NTP.setInterval(NTP_UPDATE_INTERVAL);
 }
 
+bool ntpConnected() {
+ return (timeStatus() == timeSet);
+}
+
 void ntpSetup() {
 
  NTP.onNTPSyncEvent([](NTPSyncEvent_t error) {
@@ -28,8 +32,10 @@ void ntpSetup() {
  } else if (error == invalidAddress) {
  DEBUG_MSG_P(PSTR("[NTP] Error: Invalid NTP server address\n"));
  }
+ wsSend("{\"ntpStatus\": false}");
  } else {
  DEBUG_MSG_P(PSTR("[NTP] Time: %s\n"), (char *) NTP.getTimeDateString(NTP.getLastNTPSync()).c_str());
+ wsSend("{\"ntpStatus\": true}");
  }
  });
 

diff --git a/code/espurna/static/index.html.gz.h b/code/espurna/static/index.html.gz.h
diff --git a/code/espurna/web.ino b/code/espurna/web.ino
@@ -398,6 +398,8 @@ void _wsStart(uint32_t client_id) {
  root["network"] = getNetwork();
  root["deviceip"] = getIP();
 
+ root["ntpStatus"] = ntpConnected();
+
  root["mqttStatus"] = mqttConnected();
  root["mqttServer"] = getSetting("mqttServer", MQTT_SERVER);
  root["mqttPort"] = getSetting("mqttPort", MQTT_PORT);

diff --git a/code/html/custom.js b/code/html/custom.js
@@ -427,6 +427,9 @@ function processData(data) {
  if (key == "mqttStatus") {
  data.mqttStatus = data.mqttStatus ? "CONNECTED" : "NOT CONNECTED";
  }
+ if (key == "ntpStatus") {
+ data.ntpStatus = data.ntpStatus ? "SYNC'D" : "NOT SYNC'D";
+ }
  if (key == "tmpUnits") {
  $("span#tmpUnit").html(data[key] == 1 ? "ºF" : "ºC");
  }

diff --git a/code/html/index.html b/code/html/index.html
@@ -178,6 +178,11 @@ <h2>Current configuration</h2>
  <input class="pure-u-1 pure-u-sm-3-4" type="text" name="mqttStatus" readonly />
  </div>
 
+ <div class="pure-g">
+ <label class="pure-u-1 pure-u-sm-1-4" for="ntp">NTP Status</label>
+ <input class="pure-u-1 pure-u-sm-3-4" type="text" name="ntpStatus" readonly />
+ </div>
+
  <div class="pure-g module module-analog">
  <label class="pure-u-1 pure-u-sm-1-4" for="analogValue">Analog</label>
  <input class="pure-u-1 pure-u-sm-3-4" type="text" name="analogValue" readonly />