From e1673f6c22ff3d64174a525f15e26d105aa7807e Mon Sep 17 00:00:00 2001
From: Mathieu Maret <mathieu.maret@gmail.com>
Date: Thu, 7 Apr 2016 12:05:37 +0200
Subject: [PATCH] Display configured IP value in setup page

---
 WifiControlSensor/WebServer.ino         | 10 +++++-----
 WifiControlSensor/WifiControlSensor.ino |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/WifiControlSensor/WebServer.ino b/WifiControlSensor/WebServer.ino
index 9db8dfe..d28d5d0 100644
--- a/WifiControlSensor/WebServer.ino
+++ b/WifiControlSensor/WebServer.ino
@@ -65,11 +65,11 @@ void WebHandleSetup() {
               "<fieldset>"
               "<legend>IP Configuration</legend>"
               "<div><input type=\"radio\" name=\"ip_config\" value=\"0\" checked>DHCP <input type=\"radio\" name=\"ip_config\" value=\"1\">Static</div>"
-              "<div><label for=\"ip\">Ip :</label><br/><input type=\"text\" name=\"ip\" value=\"" + String(ip) + "\" /> </div>"
-              "<div><label for=\"gw\">Gateway :</label><br/><input type=\"text\" name=\"gw\" value=\"" + String(gw) + "\" /> </div>"
-              "<div><label for=\"mask\">Netmask :</label><br/><input type=\"text\" name=\"mask\" value=\"" + String(mask) + "\" /> </div>"
-              "<div><label for=\"mask\">DNS :</label><br/><input type=\"text\" name=\"dns\" value=\"" + String(dns) + "\" /> </div>"
-              "<div><label for=\"mask\">DNS2 :</label><br/><input type=\"text\" name=\"dns2\" value=\"" + String(dns2) + "\" /> </div>"
+              "<div><label for=\"ip\">Ip :</label><br/><input type=\"text\" name=\"ip\" value=\"" + (ip == 0 ? "192.168.0.123": IPAddress(ip).toString()) + "\" /> </div>"
+              "<div><label for=\"gw\">Gateway :</label><br/><input type=\"text\" name=\"gw\" value=\"" + (gw == 0 ? "192.168.0.250": IPAddress(gw).toString()) + "\" /> </div>"
+              "<div><label for=\"mask\">Netmask :</label><br/><input type=\"text\" name=\"mask\" value=\"" + (mask == 0 ? "255.255.255.0": IPAddress(mask).toString()) + "\" /> </div>"
+              "<div><label for=\"mask\">DNS :</label><br/><input type=\"text\" name=\"dns\" value=\"" + (dns == 0 ? "192.168.0.250": IPAddress(dns).toString()) + "\" /> </div>"
+              "<div><label for=\"mask\">DNS2 :</label><br/><input type=\"text\" name=\"dns2\" value=\"" + (dns2 == 0 ? "": IPAddress(dns2).toString()) + "\" /> </div>"
               "</fieldset>"
               "<fieldset>"
               "<legend>MQTT:</legend>"
diff --git a/WifiControlSensor/WifiControlSensor.ino b/WifiControlSensor/WifiControlSensor.ino
index 51abd09..63c192e 100644
--- a/WifiControlSensor/WifiControlSensor.ino
+++ b/WifiControlSensor/WifiControlSensor.ino
@@ -103,7 +103,7 @@ void WifiSetup(int bootmode, int forceSetup, char *confSsid, char *confPassword,
   } else {
     SKETCH_DEBUG_PRINTLN("Connecting to Wifi...");
     if(ip_config == 1){
-      SKETCH_DEBUG_PRINTLN("Configure using statis ip");
+      SKETCH_DEBUG_PRINTLN("Use static ip configuration");
       WiFi.config(IPAddress(ip), IPAddress(gw), IPAddress(mask), IPAddress(dns), IPAddress(dns2));
     }
     WiFi.begin(confSsid, confPassword);