From a9507c98b5204492e539a1bc71361315554c94b6 Mon Sep 17 00:00:00 2001
From: tablatronix <alverson@mbpro.local>
Date: Tue, 16 Mar 2021 08:53:17 -0500
Subject: [PATCH] test fixes for v3 esp32 S2

---
 WiFiManager.cpp | 13 +++++++------
 WiFiManager.h   |  2 +-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/WiFiManager.cpp b/WiFiManager.cpp
index 7b64b40..874baca 100644
--- a/WiFiManager.cpp
+++ b/WiFiManager.cpp
@@ -2088,7 +2088,8 @@ String WiFiManager::getInfoData(String id){
     p = FPSTR(HTTP_INFO_temp);
     p.replace(FPSTR(T_1),(String)temperatureRead());
     p.replace(FPSTR(T_2),(String)((temperatureRead()+32)*1.8));
-    p.replace(FPSTR(T_3),(String)hallRead());
+    // p.replace(FPSTR(T_3),(String)hallRead());
+    p.replace(FPSTR(T_3),"NA");
   }
   #endif
   return p;
@@ -3464,7 +3465,7 @@ String WiFiManager::WiFi_psk(bool persistent) const {
 }
 
 #ifdef ESP32
-void WiFiManager::WiFiEvent(WiFiEvent_t event,system_event_info_t info){
+void WiFiManager::WiFiEvent(WiFiEvent_t event,arduino_event_info_t info){
     if(!_hasBegun){
       #ifdef WM_DEBUG_LEVEL
         // DEBUG_WM(DEBUG_VERBOSE,"[ERROR] WiFiEvent, not ready");
@@ -3477,15 +3478,15 @@ void WiFiManager::WiFiEvent(WiFiEvent_t event,system_event_info_t info){
     #ifdef WM_DEBUG_LEVEL
     // DEBUG_WM(DEBUG_VERBOSE,"[EVENT]",event);
     #endif
-    if(event == SYSTEM_EVENT_STA_DISCONNECTED){
+    if(event == ARDUINO_EVENT_WIFI_STA_DISCONNECTED){
     #ifdef WM_DEBUG_LEVEL
-      DEBUG_WM(DEBUG_VERBOSE,F("[EVENT] WIFI_REASON: "),info.disconnected.reason);
+      DEBUG_WM(DEBUG_VERBOSE,F("[EVENT] WIFI_REASON: "),info.wifi_sta_disconnected.reason);
       #endif
-      if(info.disconnected.reason == WIFI_REASON_AUTH_EXPIRE || info.disconnected.reason == WIFI_REASON_AUTH_FAIL){
+      if(info.wifi_sta_disconnected.reason == WIFI_REASON_AUTH_EXPIRE || info.wifi_sta_disconnected.reason == WIFI_REASON_AUTH_FAIL){
         _lastconxresulttmp = 7; // hack in wrong password internally, sdk emit WIFI_REASON_AUTH_EXPIRE on some routers on auth_fail
       } else _lastconxresulttmp = WiFi.status();
       #ifdef WM_DEBUG_LEVEL
-      if(info.disconnected.reason == WIFI_REASON_NO_AP_FOUND) DEBUG_WM(DEBUG_VERBOSE,F("[EVENT] WIFI_REASON: NO_AP_FOUND"));
+      if(info.wifi_sta_disconnected.reason == WIFI_REASON_NO_AP_FOUND) DEBUG_WM(DEBUG_VERBOSE,F("[EVENT] WIFI_REASON: NO_AP_FOUND"));
       #endif
       #ifdef esp32autoreconnect
       #ifdef WM_DEBUG_LEVEL
diff --git a/WiFiManager.h b/WiFiManager.h
index 9729fab..b10a9e8 100644
--- a/WiFiManager.h
+++ b/WiFiManager.h
@@ -564,7 +564,7 @@ class WiFiManager
     bool          WiFiSetCountry();
 
     #ifdef ESP32
-    void   WiFiEvent(WiFiEvent_t event, system_event_info_t info);
+    void   WiFiEvent(WiFiEvent_t event, arduino_event_info_t info);
     #endif
 
     // output helpers