From 93d77859d9a13156570e96e6cd717729bf5f7552 Mon Sep 17 00:00:00 2001
From: me-no-dev <hristo@espressif.com>
Date: Tue, 7 Apr 2020 01:34:13 +0300
Subject: [PATCH] Add fixes

---
 libraries/SD/src/sd_diskio.cpp |  3 +--
 libraries/WiFi/src/ETH.cpp     | 15 +++++++--------
 libraries/WiFi/src/ETH.h       |  6 +++---
 libraries/WiFi/src/WiFiSTA.cpp |  5 -----
 4 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/libraries/SD/src/sd_diskio.cpp b/libraries/SD/src/sd_diskio.cpp
index 1d1922be4..b98b98d13 100644
--- a/libraries/SD/src/sd_diskio.cpp
+++ b/libraries/SD/src/sd_diskio.cpp
@@ -14,10 +14,9 @@
 #include "sd_diskio.h"
 #include "esp_system.h"
 extern "C" {
-    #include "ffconf.h"
     #include "ff.h"
     #include "diskio.h"
-#ifdef ESP_IDF_VERSION_MAJOR
+#if ESP_IDF_VERSION_MAJOR > 3
     #include "diskio_impl.h"
 #endif
     //#include "esp_vfs.h"
diff --git a/libraries/WiFi/src/ETH.cpp b/libraries/WiFi/src/ETH.cpp
index 0de771cd6..d1c3cc5a1 100644
--- a/libraries/WiFi/src/ETH.cpp
+++ b/libraries/WiFi/src/ETH.cpp
@@ -125,9 +125,13 @@ static void _eth_phy_power_enable(bool enable)
 ETHClass::ETHClass()
     :initialized(false)
     ,staticIP(false)
-    ,eth_handle(NULL)
-    ,started(false)
-    ,eth_link(ETH_LINK_DOWN)
+#if ESP_IDF_VERSION_MAJOR > 3
+     ,eth_handle(NULL)
+#endif
+     ,started(false)
+#if ESP_IDF_VERSION_MAJOR > 3
+     ,eth_link(ETH_LINK_DOWN)
+#endif
 {
 }
 
@@ -348,13 +352,8 @@ IPAddress ETHClass::gatewayIP()
 
 IPAddress ETHClass::dnsIP(uint8_t dns_no)
 {
-#ifdef ESP_IDF_VERSION_MAJOR
     const ip_addr_t * dns_ip = dns_getserver(dns_no);
     return IPAddress(dns_ip->u_addr.ip4.addr);
-#else
-    ip_addr_t dns_ip = dns_getserver(dns_no);
-    return IPAddress(dns_ip.u_addr.ip4.addr);
-#endif
 }
 
 IPAddress ETHClass::broadcastIP()
diff --git a/libraries/WiFi/src/ETH.h b/libraries/WiFi/src/ETH.h
index a0bd6cd52..9a9444010 100644
--- a/libraries/WiFi/src/ETH.h
+++ b/libraries/WiFi/src/ETH.h
@@ -45,7 +45,7 @@
 #define ETH_PHY_MDIO 18
 #endif
 
-#ifndef ESP_IDF_VERSION_MAJOR
+#if ESP_IDF_VERSION_MAJOR < 4
 #ifndef ETH_CLK_MODE
 #define ETH_CLK_MODE ETH_CLOCK_GPIO0_IN
 #endif
@@ -57,7 +57,7 @@ class ETHClass {
     private:
         bool initialized;
         bool staticIP;
-#ifdef ESP_IDF_VERSION_MAJOR
+#if ESP_IDF_VERSION_MAJOR > 3
         esp_eth_handle_t eth_handle;
 
     protected:
@@ -72,7 +72,7 @@ class ETHClass {
         ETHClass();
         ~ETHClass();
 
-#ifdef ESP_IDF_VERSION_MAJOR
+#if ESP_IDF_VERSION_MAJOR > 3
         bool begin(uint8_t phy_addr=ETH_PHY_ADDR, int power=ETH_PHY_POWER, int mdc=ETH_PHY_MDC, int mdio=ETH_PHY_MDIO, eth_phy_type_t type=ETH_PHY_TYPE);
 #else
         bool begin(uint8_t phy_addr=ETH_PHY_ADDR, int power=ETH_PHY_POWER, int mdc=ETH_PHY_MDC, int mdio=ETH_PHY_MDIO, eth_phy_type_t type=ETH_PHY_TYPE, eth_clock_mode_t clk_mode=ETH_CLK_MODE);
diff --git a/libraries/WiFi/src/WiFiSTA.cpp b/libraries/WiFi/src/WiFiSTA.cpp
index fdbadbc60..3269cabf1 100644
--- a/libraries/WiFi/src/WiFiSTA.cpp
+++ b/libraries/WiFi/src/WiFiSTA.cpp
@@ -488,13 +488,8 @@ IPAddress WiFiSTAClass::dnsIP(uint8_t dns_no)
     if(WiFiGenericClass::getMode() == WIFI_MODE_NULL){
         return IPAddress();
     }
-#ifdef ESP_IDF_VERSION_MAJOR
     const ip_addr_t * dns_ip = dns_getserver(dns_no);
     return IPAddress(dns_ip->u_addr.ip4.addr);
-#else
-    ip_addr_t dns_ip = dns_getserver(dns_no);
-    return IPAddress(dns_ip.u_addr.ip4.addr);
-#endif
 }
 
 /**
-- 
GitLab