From f41438597dfcb5eb5e1f7f27dae689e542b3b7cb Mon Sep 17 00:00:00 2001
From: 0xFEEDC0DE64 <daniel@brunner.ninja>
Date: Thu, 7 Jan 2021 18:44:25 +0100
Subject: [PATCH] Fixed to get compiling again with newest esp-idf

---
 cores/esp32/IPAddress.h         |  2 +-
 libraries/ESPmDNS/src/ESPmDNS.h |  2 +-
 libraries/WiFi/src/WiFiSTA.cpp  | 16 ++++++++--------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/cores/esp32/IPAddress.h b/cores/esp32/IPAddress.h
index aa1d10ce..1498ad4a 100644
--- a/cores/esp32/IPAddress.h
+++ b/cores/esp32/IPAddress.h
@@ -91,6 +91,6 @@ public:
     friend class DNSClient;
 };
 
-const IPAddress INADDR_NONE(0, 0, 0, 0);
+//const IPAddress INADDR_NONE(0, 0, 0, 0);
 
 #endif
diff --git a/libraries/ESPmDNS/src/ESPmDNS.h b/libraries/ESPmDNS/src/ESPmDNS.h
index 8f56ea42..b4823d59 100644
--- a/libraries/ESPmDNS/src/ESPmDNS.h
+++ b/libraries/ESPmDNS/src/ESPmDNS.h
@@ -84,7 +84,7 @@ public:
   void enableArduino(uint16_t port=3232, bool auth=false);
   void disableArduino();
 
-  void enableWorkstation(wifi_interface_t interface=ESP_IF_WIFI_STA);
+  void enableWorkstation(wifi_interface_t interface=WIFI_IF_STA);
   void disableWorkstation();
 
   IPAddress queryHost(char *host, uint32_t timeout=2000);
diff --git a/libraries/WiFi/src/WiFiSTA.cpp b/libraries/WiFi/src/WiFiSTA.cpp
index bb9746b0..a23d645a 100644
--- a/libraries/WiFi/src/WiFiSTA.cpp
+++ b/libraries/WiFi/src/WiFiSTA.cpp
@@ -168,7 +168,7 @@ wl_status_t WiFiSTAClass::begin(const char* ssid, const char *passphrase, int32_
 
     wifi_sta_config(&conf, ssid, passphrase, bssid, channel);
 
-    if(esp_wifi_get_config(ESP_IF_WIFI_STA, &current_conf) != ESP_OK){
+    if(esp_wifi_get_config(WIFI_IF_STA, &current_conf) != ESP_OK){
         log_e("get current config failed!");
         return WL_CONNECT_FAILED;
     }
@@ -178,14 +178,14 @@ wl_status_t WiFiSTAClass::begin(const char* ssid, const char *passphrase, int32_
             return WL_CONNECT_FAILED;
         }
 
-        if(esp_wifi_set_config(ESP_IF_WIFI_STA, &conf) != ESP_OK){
+        if(esp_wifi_set_config(WIFI_IF_STA, &conf) != ESP_OK){
             log_e("set config failed!");
             return WL_CONNECT_FAILED;
         }
     } else if(status() == WL_CONNECTED){
         return WL_CONNECTED;
     } else {
-        if(esp_wifi_set_config(ESP_IF_WIFI_STA, &conf) != ESP_OK){
+        if(esp_wifi_set_config(WIFI_IF_STA, &conf) != ESP_OK){
             log_e("set config failed!");
             return WL_CONNECT_FAILED;
         }
@@ -225,7 +225,7 @@ wl_status_t WiFiSTAClass::begin()
     }
 
     wifi_config_t current_conf;
-    if(esp_wifi_get_config(ESP_IF_WIFI_STA, &current_conf) != ESP_OK || esp_wifi_set_config(ESP_IF_WIFI_STA, &current_conf) != ESP_OK) {
+    if(esp_wifi_get_config(WIFI_IF_STA, &current_conf) != ESP_OK || esp_wifi_set_config(WIFI_IF_STA, &current_conf) != ESP_OK) {
         log_e("config failed");
         return WL_CONNECT_FAILED;
     }
@@ -272,7 +272,7 @@ bool WiFiSTAClass::disconnect(bool wifioff, bool eraseap)
 
     if(WiFi.getMode() & WIFI_MODE_STA){
         if(eraseap){
-            if(esp_wifi_set_config(ESP_IF_WIFI_STA, &conf)){
+            if(esp_wifi_set_config(WIFI_IF_STA, &conf)){
                 log_e("clear config failed!");
             }
         }
@@ -398,7 +398,7 @@ IPAddress WiFiSTAClass::localIP()
 uint8_t* WiFiSTAClass::macAddress(uint8_t* mac)
 {
     if(WiFiGenericClass::getMode() != WIFI_MODE_NULL){
-        esp_wifi_get_mac(ESP_IF_WIFI_STA, mac);
+        esp_wifi_get_mac(WIFI_IF_STA, mac);
     }
     else{
         esp_read_mac(mac, ESP_MAC_WIFI_STA);
@@ -418,7 +418,7 @@ String WiFiSTAClass::macAddress(void)
         esp_read_mac(mac, ESP_MAC_WIFI_STA);
     }
     else{
-        esp_wifi_get_mac(ESP_IF_WIFI_STA, mac);
+        esp_wifi_get_mac(WIFI_IF_STA, mac);
     }
     sprintf(macStr, "%02X:%02X:%02X:%02X:%02X:%02X", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
     return String(macStr);
@@ -549,7 +549,7 @@ String WiFiSTAClass::psk() const
         return String();
     }
     wifi_config_t conf;
-    esp_wifi_get_config(ESP_IF_WIFI_STA, &conf);
+    esp_wifi_get_config(WIFI_IF_STA, &conf);
     return String(reinterpret_cast<char*>(conf.sta.password));
 }