[WiFi] Cleanup code, split ESP32/ESP8266 specific

src/src/CustomBuild/ESPEasyLimits.h

@@ -34,12 +34,8 @@
   #endif
 
   #ifndef MAX_GPIO
-    #if ESP_IDF_VERSION_MAJOR > 3       // IDF 4+
       #include <hal/gpio_types.h>
       #define MAX_GPIO (GPIO_NUM_MAX - 1)
-    #else // ESP32 Before IDF 4.0
-      #define MAX_GPIO  39
-    #endif
   #endif
 
 #endif

src/src/DataTypes/EthernetParameters.cpp

@@ -40,15 +40,13 @@ bool isValid(EthPhyType_t phyType) {
 #if CONFIG_ETH_USE_ESP32_EMAC
     case EthPhyType_t::LAN8720:
     case EthPhyType_t::TLK110:
-# if ESP_IDF_VERSION_MAJOR > 3
     case EthPhyType_t::RTL8201:
 #if ETH_TYPE_JL1101_SUPPORTED
     case EthPhyType_t::JL1101:
 #endif
     case EthPhyType_t::DP83848:
     case EthPhyType_t::KSZ8041:
     case EthPhyType_t::KSZ8081:
-# endif // if ESP_IDF_VERSION_MAJOR > 3
       return true;
 #endif // if CONFIG_ETH_USE_ESP32_EMAC
 
@@ -94,15 +92,13 @@ eth_phy_type_t to_ESP_phy_type(EthPhyType_t phyType)
 # if CONFIG_ETH_USE_ESP32_EMAC
     case EthPhyType_t::LAN8720:  return ETH_PHY_LAN8720;
     case EthPhyType_t::TLK110:   return ETH_PHY_TLK110;
-#  if ESP_IDF_VERSION_MAJOR > 3
     case EthPhyType_t::RTL8201:  return ETH_PHY_RTL8201;
 #   if ETH_TYPE_JL1101_SUPPORTED
     case EthPhyType_t::JL1101:   return ETH_PHY_JL1101;
 #   endif
     case EthPhyType_t::DP83848:  return ETH_PHY_DP83848;
     case EthPhyType_t::KSZ8041:  return ETH_PHY_KSZ8041;
     case EthPhyType_t::KSZ8081:  return ETH_PHY_KSZ8081;
-#  endif // if ESP_IDF_VERSION_MAJOR > 3
 # endif // if CONFIG_ETH_USE_ESP32_EMAC
 
 # if ESP_IDF_VERSION_MAJOR >= 5
@@ -130,15 +126,13 @@ const __FlashStringHelper* toString(EthPhyType_t phyType) {
 #if CONFIG_ETH_USE_ESP32_EMAC
     case EthPhyType_t::LAN8720:  return F("LAN8710/LAN8720");
     case EthPhyType_t::TLK110:   return F("TLK110");
-# if ESP_IDF_VERSION_MAJOR > 3
     case EthPhyType_t::RTL8201:  return F("RTL8201");
 #if ETH_TYPE_JL1101_SUPPORTED
     case EthPhyType_t::JL1101:   return F("JL1101");
 #endif
     case EthPhyType_t::DP83848:  return F("DP83848");
     case EthPhyType_t::KSZ8041:  return F("KSZ8041");
     case EthPhyType_t::KSZ8081:  return F("KSZ8081");
-# endif // if ESP_IDF_VERSION_MAJOR > 3
 #endif // if CONFIG_ETH_USE_ESP32_EMAC
 
 #if ESP_IDF_VERSION_MAJOR >= 5

src/src/DataTypes/EthernetParameters.h

@@ -24,8 +24,6 @@ enum class EthPhyType_t : uint8_t {
 #if CONFIG_ETH_USE_ESP32_EMAC
   LAN8720 = 0,
   TLK110  = 1,
-#if ESP_IDF_VERSION_MAJOR > 3
-
   RTL8201 = 2,
 #if ETH_TYPE_JL1101_SUPPORTED
   JL1101 = 3, 
@@ -34,7 +32,6 @@ enum class EthPhyType_t : uint8_t {
   KSZ8041 = 5, 
   KSZ8081 = 6,
 #endif
-#endif
 #if ESP_IDF_VERSION_MAJOR >= 5
 #if CONFIG_ETH_SPI_ETHERNET_DM9051
   DM9051 = 10, 

src/src/ESPEasyCore/ESPEasyEth.cpp

@@ -17,11 +17,7 @@
 
 #include <ETH.h>
 #include <lwip/dns.h>
-#if ESP_IDF_VERSION_MAJOR > 3
- #include <esp_eth_phy.h>
-#else
- #include <eth_phy/phy.h>
-#endif
+#include <esp_eth_phy.h>
 
 #include <WiFi.h>
 
@@ -114,11 +110,7 @@ MAC_address ETHMacAddress() {
   if(!EthEventData.ethInitSuccess) {
     addLog(LOG_LEVEL_ERROR, F("Call NetworkMacAddress() only on connected Ethernet!"));
   } else {
-    #if ESP_IDF_VERSION_MAJOR > 3
     ETH.macAddress(mac.mac);
-    #else
-    esp_eth_get_mac(mac.mac);
-    #endif
   }
   return mac;
 }

src/src/ESPEasyCore/ESPEasyEthEvent.cpp

@@ -15,8 +15,6 @@
 
 #  include <WiFi.h>
 
-
-#  if ESP_IDF_VERSION_MAJOR > 3
 void EthEvent(WiFiEvent_t event, arduino_event_info_t info) {
   switch (event) {
     case ARDUINO_EVENT_ETH_START:
@@ -42,11 +40,7 @@ void EthEvent(WiFiEvent_t event, arduino_event_info_t info) {
     case ARDUINO_EVENT_ETH_STOP:
 //      addLog(LOG_LEVEL_INFO, F("ETH event: Stopped"));
       break;
-    #   if ESP_IDF_VERSION_MAJOR > 3
     case ARDUINO_EVENT_ETH_GOT_IP6:
-    #   else // if ESP_IDF_VERSION_MAJOR > 3
-    case ARDUINO_EVENT_GOT_IP6:
-    #   endif // if ESP_IDF_VERSION_MAJOR > 3
     #if FEATURE_USE_IPV6
     {
       ip_event_got_ip6_t * event = static_cast<ip_event_got_ip6_t*>(&info.got_ip6);
@@ -65,8 +59,6 @@ void EthEvent(WiFiEvent_t event, arduino_event_info_t info) {
   }
 }
 
-#  endif // if ESP_IDF_VERSION_MAJOR > 3
-
 # endif // if FEATURE_ETHERNET
 
 #endif // ifdef ESP32

src/src/ESPEasyCore/ESPEasyEthEvent.h

@@ -10,13 +10,11 @@
 // ********************************************************************************
 #ifdef ESP32
 #if FEATURE_ETHERNET
-#if ESP_IDF_VERSION_MAJOR > 3
 #include <WiFi.h>
 #include <WiFiType.h>
 void EthEvent(WiFiEvent_t event, arduino_event_info_t info);
 #endif
 #endif
-#endif
 
 
 #endif // ESPEASY_ETH_EVENT_H