From baf8adfb02781060622472ad7534a5ad6c020279 Mon Sep 17 00:00:00 2001 From: Yurii Date: Thu, 6 Jun 2024 16:37:57 +0300 Subject: [PATCH] fix: validation GPIO and reset wifi for arduino-esp32 core 3.x.x fixed --- lib/NetworkUtils/NetworkMgr.h | 6 +++--- src/defines.h | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/NetworkUtils/NetworkMgr.h b/lib/NetworkUtils/NetworkMgr.h index 0415216..2369005 100644 --- a/lib/NetworkUtils/NetworkMgr.h +++ b/lib/NetworkUtils/NetworkMgr.h @@ -182,9 +182,9 @@ namespace NetworkUtils { wifi_station_dhcpc_set_maxtry(5); #endif - - #ifdef ARDUINO_ARCH_ESP32 - // Nothing. Because memory leaks when turn off WiFi on ESP32, bug? + + #if defined(ARDUINO_ARCH_ESP32) && ESP_ARDUINO_VERSION_MAJOR < 3 + // Nothing. Because memory leaks when turn off WiFi on ESP32 SDK < 3.0.0 return true; #else return WiFi.mode(WIFI_OFF); diff --git a/src/defines.h b/src/defines.h index 0271e89..74908cb 100644 --- a/src/defines.h +++ b/src/defines.h @@ -123,7 +123,9 @@ #define PROGMEM #endif -#ifndef GPIO_IS_VALID_GPIO +#ifdef ARDUINO_ARCH_ESP32 + #include +#elif !defined(GPIO_IS_VALID_GPIO) #define GPIO_IS_VALID_GPIO(gpioNum) (gpioNum >= 0 && gpioNum <= 16) #endif