From af3c093cdc0e9730445e218605a3788f924a9f40 Mon Sep 17 00:00:00 2001
From: Gregg <gregg.berman@me.com>
Date: Fri, 4 Sep 2020 22:19:14 -0500
Subject: [PATCH] updated configure()

---
 src/Configure.cpp | 38 ++++++++++++++++++++++++++++++++++----
 src/Configure.h   |  1 +
 src/HomeSpan.cpp  |  2 +-
 3 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/src/Configure.cpp b/src/Configure.cpp
index 9174431..afdff99 100644
--- a/src/Configure.cpp
+++ b/src/Configure.cpp
@@ -18,10 +18,15 @@ void Configure::processRequest(WiFiClient &client, char *body, char *formData){
                
     LOG1("In Post Configure...\n");
 
+    getFormValue(formData,"network",wifiData.ssid,MAX_SSID);
+    getFormValue(formData,"pwd",wifiData.pwd,MAX_PWD);
+    getFormValue(formData,"code",setupCode,8);
     
+    timer=millis();
+    WiFi.begin(wifiData.ssid,wifiData.pwd);
 
-    responseBody+="<meta http-equiv = \"refresh\" content = \"2; url = /wifi-status\" />"
-                  "<p>Initiating WiFi Connection...</p>";
+    responseBody+="<meta http-equiv = \"refresh\" content = \"5; url = /wifi-status\" />"
+                  "<p>Initiating WiFi connection to:</p><p>" + String(wifiData.ssid) + "</p>";
   
   } else
 
@@ -29,8 +34,12 @@ void Configure::processRequest(WiFiClient &client, char *body, char *formData){
 
     LOG1("In Get WiFi Status...\n");
 
-    responseHead+="Refresh: 5\r\n";     
-    responseBody+="<p>Trying to Connect (" + String(millis()/1000) + "sec)...</p>";
+    if(WiFi.status()!=WL_CONNECTED){
+      responseHead+="Refresh: 5\r\n";     
+      responseBody+="<p>Re-trying (" + String((millis()-timer)/1000) + "sec) connection to:</p><p>" + String(wifiData.ssid) + "</p>";
+    } else {
+      responseBody+="<p>SUCCESS! Connected to:</p><p>" + String(wifiData.ssid) + "</p>";      
+    }
   
   } else {                                                                // LOGIN PAGE
 
@@ -86,6 +95,27 @@ void Configure::processRequest(WiFiClient &client, char *body, char *formData){
 //////////////////////////////////////
 
 int Configure::getFormValue(char *formData, char *tag, char *value, int maxSize){
+
+  char *s=strstr(formData,tag);     // find start of tag
+  
+  if(!s)                            // if not found, return -1
+    return(-1);
+
+  char *v=index(s,'=');             // find '='
+
+  if(!v)                            // if not found, return -1 (this should not happen)
+    return(-1);
+
+  v++;                              // point to begining of value 
+  int len=0;                        // track length of value
+  
+  while(*v!='\0' && *v!='&' && len<maxSize){      // copy the value until null, '&', or maxSize is reached
+    len++;
+    *value++=*v++;
+  }
+
+  *value='\0';                      // add terminating null
+  return(len);
   
 }
 
diff --git a/src/Configure.h b/src/Configure.h
index 88ee8f4..282bc1b 100644
--- a/src/Configure.h
+++ b/src/Configure.h
@@ -12,6 +12,7 @@ struct Configure {
   } wifiData;
 
   char setupCode[9];
+  unsigned long timer;          // time of trying to connect to WiFi
 
   void processRequest(WiFiClient &client, char *body, char *formData);
   int getFormValue(char *formData, char *tag, char *value, int maxSize);
diff --git a/src/HomeSpan.cpp b/src/HomeSpan.cpp
index c6f40f9..18e21c3 100644
--- a/src/HomeSpan.cpp
+++ b/src/HomeSpan.cpp
@@ -346,7 +346,7 @@ void Span::configure(char *apName){
   IPAddress apIP(192, 168, 4, 1);
 
   WiFi.mode(WIFI_AP);
-  WiFi.softAP(apName,"homespan");
+  WiFi.softAP(apName,"homespan",1,false,1);
   dnsServer.start(DNS_PORT, "*", apIP);
   apServer.begin();