Updated Demo for changes in the API

updated the gui.ino to reflect the changes in the API:
* reformated/reindented, minor cleanups
* instantation of ESPUI in the users application
* automatic swichtover to station mode if given network is not found

examples/gui/gui.ino

@@ -11,23 +11,34 @@ DNSServer dnsServer;
 #include <ESP8266WiFi.h>
 #endif
 
+// true for verbose, false for quiet
+ESPUIClass ESPUI( Verbosity::VerboseJSON );
+
 const char* ssid = "ESPUI";
-const char *password = "";
+const char* password = "espui";
+const char* hostname = "EspuiTest";
 
 long oldTime = 0;
 bool switchi = false;
 
-void numberCall(Control sender, int type) { Serial.println(sender.value); }
+void numberCall( Control sender, int type ) {
+  Serial.println( sender.value );
+}
 
-void textCall(Control sender, int type) { Serial.println(sender.value); }
+void textCall( Control sender, int type ) {
+  Serial.println( sender.value );
+}
 
-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;
@@ -40,6 +51,7 @@ void buttonExample(Control sender, int type) {
       Serial.println( "Status: Start" );
       ESPUI.print( 0, "Status: Start" );
       break;
+
     case B_UP:
       Serial.println( "Status: Stop" );
       ESPUI.print( 0, "Status: Stop" );
@@ -51,34 +63,44 @@ void padExample(Control sender, int 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;
   }
+
   Serial.print( " " );
   Serial.println( sender.id );
 }
@@ -88,10 +110,12 @@ void switchExample(Control sender, int value) {
     case S_ACTIVE:
       Serial.print( "Active:" );
       break;
+
     case S_INACTIVE:
       Serial.print( "Inactive" );
       break;
   }
+
   Serial.print( " " );
   Serial.println( sender.id );
 }
@@ -101,46 +125,64 @@ void otherSwitchExample(Control sender, int value) {
     case S_ACTIVE:
       Serial.print( "Active:" );
       break;
+
     case S_INACTIVE:
       Serial.print( "Inactive" );
       break;
   }
+
   Serial.print( " " );
   Serial.println( sender.id );
 }
 
 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( hostname );
 #else
-    WiFi.hostname(ssid);
+  WiFi.hostname( hostname );
 #endif
-  */
 
-  WiFi.softAP(ssid);
-  // WiFi.softAP(ssid, password);
-  Serial.println("");
-  Serial.print("IP address: ");
-  Serial.println(WiFi.softAPIP());
-
-  // change the beginning to this if you want to join an existing network
-  /*
-     Serial.begin(115200);
+  // try to connect to existing network
   WiFi.begin( ssid, password );
-     Serial.println("");
-     // Wait for connection
-     while (WiFi.status() != WL_CONNECTED) {
+  Serial.print( "\n\nTry to connect to existing network" );
+
+  {
+    uint8_t timeout = 5;
+
+    // Wait for connection, 2.5s timeout
+    do {
       delay( 500 );
       Serial.print( "." );
+      timeout--;
+    } while ( timeout && WiFi.status() != WL_CONNECTED );
+
+    // not connected -> create hotspot
+    if ( WiFi.status() != WL_CONNECTED ) {
+      Serial.print( "\n\nCreating hotspot" );
+
+      WiFi.mode( WIFI_AP );
+      WiFi.softAPConfig( apIP, apIP, IPAddress( 255, 255, 255, 0 ) );
+      WiFi.softAP( ssid );
+
+      timeout = 5;
+
+      do {
+        delay( 500 );
+        Serial.print( "." );
+        timeout--;
+      } while ( timeout );
     }
-     Serial.println("");
+  }
+
+  dnsServer.start( DNS_PORT, "*", apIP );
+
+  Serial.println( "\n\nWiFi parameters:" );
+  Serial.print( "Mode: " );
+  Serial.println( WiFi.getMode() == WIFI_AP ? "Station" : "Client" );
   Serial.print( "IP address: " );
-     Serial.println(WiFi.localIP());
-   */
+  Serial.println( WiFi.getMode() == WIFI_AP ? WiFi.softAPIP() : WiFi.localIP() );
 
   ESPUI.label( "Status:", COLOR_TURQUOISE, "Stop" );
   ESPUI.label( "Millis:", COLOR_EMERALD, "0" );
@@ -156,19 +198,17 @@ void setup(void) {
   ESPUI.number( "Numbertest", &numberCall, COLOR_ALIZARIN, 5, 0, 10 );
 
   /*
-     .begin loads and serves all files from PROGMEM directly.
-     If you want to serve the files from SPIFFS use ESPUI.beginSPIFFS
-     (.prepareFileSystem has to be run in an empty sketch before)
+   * .begin loads and serves all files from PROGMEM directly.
+   * If you want to serve the files from SPIFFS use ESPUI.beginSPIFFS
+   * (.prepareFileSystem has to be run in an empty sketch before)
    */
 
-  dnsServer.start(DNS_PORT, "*", apIP);
-
   /*
    * Optionally you can use HTTP BasicAuth. Keep in mind that this is NOT a
-   SECURE way of limiting access.
+   * SECURE way of limiting access.
    * Anyone who is able to sniff traffic will be able to intercept your password
-   since it is transmitted in cleartext ESPUI.begin("ESPUI Control", "myuser",
-   "mypassword");
+   * since it is transmitted in cleartext. Just add a string as username and password,
+   * for example begin("ESPUI Control", "username", "password")
    */
   ESPUI.begin( "ESPUI Control" );
 }