ElixirForge/WiFiManager
1
0
Fork 0
mirror of https://github.com/alexhopeoconnor/WiFiManager.git synced 2026-10-04 02:48:13 +10:00
Code Releases Activity

Add better handling of arduino ver checking

Browse Source
This commit is contained in:
tablatronix
2021-09-09 10:18:40 -05:00
parent f199906e9d
commit 55d7ccbd7a
2 changed files with 25 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
WiFiManager.cpp
+1 -1
View File
@@ -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){
WiFiManager.h
+24 -15
View File
@@ -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