From 870e8a06a27c02074ccee4b0fec8b6a452ac3eb3 Mon Sep 17 00:00:00 2001
From: Lukas Bachschwell <lukas@lbsfilm.at>
Date: Mon, 26 Nov 2018 17:02:08 +0100
Subject: [PATCH] Closes #25 Adding captive Portal to example

---
 .gitignore           |   3 +
 examples/gui/gui.ino | 141 +++++++++++++++++++++++--------------------
 2 files changed, 78 insertions(+), 66 deletions(-)

diff --git a/.gitignore b/.gitignore
index fa842ad..87b3c5f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,3 +33,6 @@ Temporary Items
 # Backup files produced by some editors
 *~
 *.bak
+
+
+.vscode/
diff --git a/examples/gui/gui.ino b/examples/gui/gui.ino
index 5146d06..e927abc 100644
--- a/examples/gui/gui.ino
+++ b/examples/gui/gui.ino
@@ -1,9 +1,14 @@
+#include <DNSServer.h>
 #include <ESPUI.h>
 
+const byte DNS_PORT = 53;
+IPAddress apIP(192, 168, 1, 1);
+DNSServer dnsServer;
+
 #if defined(ESP32)
-  #include <WiFi.h>
+#include <WiFi.h>
 #else
-  #include <ESP8266WiFi.h>
+#include <ESP8266WiFi.h>
 #endif
 
 const char *ssid = "ESPUI";
@@ -12,65 +17,63 @@ const char *password = "";
 long oldTime = 0;
 bool switchi = false;
 
-void slider(Control sender, int type) {
-  Serial.println(sender.value);
-}
+void slider(Control sender, int type) { Serial.println(sender.value); }
 
 void buttonCallback(Control sender, int type) {
   switch (type) {
-  case B_DOWN:
-    Serial.println("Button DOWN");
-    break;
-  case B_UP:
-    Serial.println("Button UP");
-    break;
+    case B_DOWN:
+      Serial.println("Button DOWN");
+      break;
+    case B_UP:
+      Serial.println("Button UP");
+      break;
   }
 }
 
 void buttonExample(Control sender, int type) {
   switch (type) {
-  case B_DOWN:
-    Serial.println("Status: Start");
-    ESPUI.print(0, "Status: Start");
-    break;
-  case B_UP:
-    Serial.println("Status: Stop");
-    ESPUI.print(0, "Status: Stop");
-    break;
+    case B_DOWN:
+      Serial.println("Status: Start");
+      ESPUI.print(0, "Status: Start");
+      break;
+    case B_UP:
+      Serial.println("Status: Stop");
+      ESPUI.print(0, "Status: Stop");
+      break;
   }
 }
 void padExample(Control sender, int value) {
   switch (value) {
-  case P_LEFT_DOWN:
-    Serial.print("left down");
-    break;
-  case P_LEFT_UP:
-    Serial.print("left up");
-    break;
-  case P_RIGHT_DOWN:
-    Serial.print("right down");
-    break;
-  case P_RIGHT_UP:
-    Serial.print("right up");
-    break;
-  case P_FOR_DOWN:
-    Serial.print("for down");
-    break;
-  case P_FOR_UP:
-    Serial.print("for up");
-    break;
-  case P_BACK_DOWN:
-    Serial.print("back down");
-    break;
-  case P_BACK_UP:
-    Serial.print("back up");
-    break;
-  case P_CENTER_DOWN:
-    Serial.print("center down");
-    break;
-  case P_CENTER_UP:
-    Serial.print("center up");
-    break;
+    case P_LEFT_DOWN:
+      Serial.print("left down");
+      break;
+    case P_LEFT_UP:
+      Serial.print("left up");
+      break;
+    case P_RIGHT_DOWN:
+      Serial.print("right down");
+      break;
+    case P_RIGHT_UP:
+      Serial.print("right up");
+      break;
+    case P_FOR_DOWN:
+      Serial.print("for down");
+      break;
+    case P_FOR_UP:
+      Serial.print("for up");
+      break;
+    case P_BACK_DOWN:
+      Serial.print("back down");
+      break;
+    case P_BACK_UP:
+      Serial.print("back up");
+      break;
+    case P_CENTER_DOWN:
+      Serial.print("center down");
+      break;
+    case P_CENTER_UP:
+      Serial.print("center up");
+      break;
   }
   Serial.print(" ");
   Serial.println(sender.id);
@@ -78,12 +81,12 @@ void padExample(Control sender, int value) {
 
 void switchExample(Control sender, int value) {
   switch (value) {
-  case S_ACTIVE:
-    Serial.print("Active:");
-    break;
-  case S_INACTIVE:
-    Serial.print("Inactive");
-    break;
+    case S_ACTIVE:
+      Serial.print("Active:");
+      break;
+    case S_INACTIVE:
+      Serial.print("Inactive");
+      break;
   }
   Serial.print(" ");
   Serial.println(sender.id);
@@ -91,12 +94,12 @@ void switchExample(Control sender, int value) {
 
 void otherSwitchExample(Control sender, int value) {
   switch (value) {
-  case S_ACTIVE:
-    Serial.print("Active:");
-    break;
-  case S_INACTIVE:
-    Serial.print("Inactive");
-    break;
+    case S_ACTIVE:
+      Serial.print("Active:");
+      break;
+    case S_INACTIVE:
+      Serial.print("Inactive");
+      break;
   }
   Serial.print(" ");
   Serial.println(sender.id);
@@ -105,12 +108,14 @@ void otherSwitchExample(Control sender, int value) {
 void setup(void) {
   Serial.begin(115200);
   WiFi.mode(WIFI_AP);
-
+  WiFi.softAPConfig(apIP, apIP, IPAddress(255, 255, 255, 0));
+  /*
   #if defined(ESP32)
-  WiFi.setHostname(ssid);
+    WiFi.setHostname(ssid);
   #else
-  WiFi.hostname(ssid);
+    WiFi.hostname(ssid);
   #endif
+  */
 
   WiFi.softAP(ssid);
   // WiFi.softAP(ssid, password);
@@ -146,16 +151,20 @@ void setup(void) {
 
   /*
      .begin loads and serves all files from PROGMEM directly.
-     If you want to serve the files from SPIFFS use .beginSPIFFS (.prepareFileSystem has to be run in an empty sketch before)
+     If you want to serve the files from SPIFFS use .beginSPIFFS
+     (.prepareFileSystem has to be run in an empty sketch before)
    */
+  dnsServer.start(DNS_PORT, "*", apIP);
   ESPUI.begin("ESPUI Control");
 }
 
 void loop(void) {
+  dnsServer.processNextRequest();
+
   if (millis() - oldTime > 5000) {
     ESPUI.print("Millis:", String(millis()));
     switchi = !switchi;
     ESPUI.updateSwitcher("Switch one", switchi);
     oldTime = millis();
   }
-}
+}
\ No newline at end of file