From 2af1c62bd11c4aa6c6443f7d808ca81bb2da0b0d Mon Sep 17 00:00:00 2001
From: Shawn A <spam@rumental.com>
Date: Wed, 24 Jan 2018 08:27:56 -0600
Subject: [PATCH] redo esp32 disconnect

---
 WiFiManager.cpp                                        | 8 ++++----
 WiFiManager.h                                          | 1 +
 examples/OnDemandConfigPortal/OnDemandConfigPortal.ino | 5 +++++
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/WiFiManager.cpp b/WiFiManager.cpp
index 033d7a7..584c131 100644
--- a/WiFiManager.cpp
+++ b/WiFiManager.cpp
@@ -1421,10 +1421,10 @@ bool WiFiManager::WiFi_Disconnect() {
     #elif defined(ESP31B) || defined(ESP32)
       DEBUG_WM(F("wifi station disconnect"));
       // @todo why does disconnect call these, might be needed
-      // WiFi.getMode(); // wifiLowLevelInit()
-      // esp_wifi_start();
-      // return esp_wifi_disconnect() == ESP_OK; // @todo BUG not declared in scope
-      return WiFi.disconnect();
+      // WiFi.getMode(); // @todo wifiLowLevelInit(), probably not needed, for save config only
+      // esp_wifi_start(); // @todo can only disconnect if enabled perhaps, prevent failure, or correct for previous call ?
+      return esp_wifi_disconnect() == ESP_OK;
+      // return WiFi.disconnect();
     #endif
 }
 
diff --git a/WiFiManager.h b/WiFiManager.h
index 29e8cda..45a0e37 100644
--- a/WiFiManager.h
+++ b/WiFiManager.h
@@ -19,6 +19,7 @@
 #elif defined(ESP31B) || defined(ESP32)
   #include <WiFi.h>
   #include <WebServer.h>
+  #include <esp_wifi.h>  
 #else
 #endif
 
diff --git a/examples/OnDemandConfigPortal/OnDemandConfigPortal.ino b/examples/OnDemandConfigPortal/OnDemandConfigPortal.ino
index 1cb8205..617b0f0 100644
--- a/examples/OnDemandConfigPortal/OnDemandConfigPortal.ino
+++ b/examples/OnDemandConfigPortal/OnDemandConfigPortal.ino
@@ -14,6 +14,7 @@
 // ESP-01 users please note: the only pins available (0 and 2), are shared 
 // with the bootloader, so always set them HIGH at power-up
 #define TRIGGER_PIN 0
+const char* modes[] = { "NULL", "STA", "AP", "STA+AP" };
 
 
 void setup() {
@@ -21,6 +22,10 @@ void setup() {
   Serial.begin(115200);
   Serial.println("\n Starting");
 
+  Serial.setDebugOutput(true);  
+  Serial.println(modes[WiFi.getMode()]);
+  WiFi.printDiag(Serial);
+
   pinMode(TRIGGER_PIN, INPUT);
 }