From 55d7ccbd7ab5e67e156c04ec9872a5a358759a20 Mon Sep 17 00:00:00 2001
From: tablatronix <alverson@mbpro.local>
Date: Thu, 9 Sep 2021 10:18:40 -0500
Subject: [PATCH] Add better handling of arduino ver checking

---
 WiFiManager.cpp |  2 +-
 WiFiManager.h   | 39 ++++++++++++++++++++++++---------------
 2 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/WiFiManager.cpp b/WiFiManager.cpp
index c8c8f69..f7c34d0 100644
--- a/WiFiManager.cpp
+++ b/WiFiManager.cpp
@@ -3499,7 +3499,7 @@ String WiFiManager::WiFi_psk(bool persistent) const {
 }
 
 #ifdef ESP32
-  #ifdef ESP_ARDUINO_VERSION
+  #ifdef WM_ARDUINOEVENTS
   void WiFiManager::WiFiEvent(WiFiEvent_t event,arduino_event_info_t info){
   #else
   void WiFiManager::WiFiEvent(WiFiEvent_t event,system_event_info_t info){
diff --git a/WiFiManager.h b/WiFiManager.h
index 895f293..e30a576 100644
--- a/WiFiManager.h
+++ b/WiFiManager.h
@@ -62,18 +62,18 @@
 
 #elif defined(ESP32)
 
-    #define STRING2(x) #x
-    #define STRING(x) STRING2(x)    
-    #ifdef ESP_IDF_VERSION
-    #pragma message "ESP_IDF_VERSION_MAJOR = " STRING(ESP_IDF_VERSION_MAJOR)
-    #pragma message "ESP_IDF_VERSION_MINOR = " STRING(ESP_IDF_VERSION_MINOR)
-    #pragma message "ESP_IDF_VERSION_PATCH = " STRING(ESP_IDF_VERSION_PATCH)
-    #endif
-    #ifdef ESP_ARDUINO_VERSION
-    #pragma message "ESP_ARDUINO_VERSION_MAJOR = " STRING(ESP_ARDUINO_VERSION_MAJOR)
-    #pragma message "ESP_ARDUINO_VERSION_MINOR = " STRING(ESP_ARDUINO_VERSION_MINOR)
-    #pragma message "ESP_ARDUINO_VERSION_PATCH = " STRING(ESP_ARDUINO_VERSION_PATCH)
-    #endif
+    // #define STRING2(x) #x
+    // #define STRING(x) STRING2(x)    
+    // #ifdef ESP_IDF_VERSION
+    // #pragma message "ESP_IDF_VERSION_MAJOR = " STRING(ESP_IDF_VERSION_MAJOR)
+    // #pragma message "ESP_IDF_VERSION_MINOR = " STRING(ESP_IDF_VERSION_MINOR)
+    // #pragma message "ESP_IDF_VERSION_PATCH = " STRING(ESP_IDF_VERSION_PATCH)
+    // #endif
+    // #ifdef ESP_ARDUINO_VERSION
+    // #pragma message "ESP_ARDUINO_VERSION_MAJOR = " STRING(ESP_ARDUINO_VERSION_MAJOR)
+    // #pragma message "ESP_ARDUINO_VERSION_MINOR = " STRING(ESP_ARDUINO_VERSION_MINOR)
+    // #pragma message "ESP_ARDUINO_VERSION_PATCH = " STRING(ESP_ARDUINO_VERSION_PATCH)
+    // #endif
 
     #include <WiFi.h>
     #include <esp_wifi.h>  
@@ -584,10 +584,19 @@ class WiFiManager
     bool          WiFiSetCountry();
 
     #ifdef ESP32
-    #ifdef ESP_ARDUINO_VERSION
-    void   WiFiEvent(WiFiEvent_t event, arduino_event_info_t info);
+
+    // check for arduino or system event system, handle esp32 arduino v2 and IDF
+    #if defined(ESP_ARDUINO_VERSION) && defined(ESP_ARDUINO_VERSION_VAL)
+    #define WM_ARDUINOVERCHECK ESP_ARDUINO_VERSION >= ESP_ARDUINO_VERSION_VAL(2, 0, 0)
+    #ifdef WM_ARDUINOVERCHECK
+    #define WM_ARDUINOEVENTS
+    #endif
+    #endif
+
+    #ifdef WM_ARDUINOEVENTS
+        void   WiFiEvent(WiFiEvent_t event, arduino_event_info_t info);
     #else
-    void   WiFiEvent(WiFiEvent_t event, system_event_info_t info);
+        void   WiFiEvent(WiFiEvent_t event, system_event_info_t info);
     #endif
     #endif