feedc0de/arduino-esp32
1
0
Fork 0
forked from espressif/arduino-esp32
Code Pull Requests Activity

Fixed to get compiling again with newest esp-idf

Browse Source
This commit is contained in:
0xFEEDC0DE64
2021-01-07 18:44:25 +01:00
parent dcf9895955
commit f41438597d
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cores/esp32/IPAddress.h
View File

@ -91,6 +91,6 @@ public:
friend class DNSClient; friend class DNSClient;
}; };
const IPAddress INADDR_NONE(0, 0, 0, 0); //const IPAddress INADDR_NONE(0, 0, 0, 0);
#endif #endif

2
libraries/ESPmDNS/src/ESPmDNS.h
View File

@ -84,7 +84,7 @@ public:
void enableArduino(uint16_t port=3232, bool auth=false); void enableArduino(uint16_t port=3232, bool auth=false);
void disableArduino(); void disableArduino();
void enableWorkstation(wifi_interface_t interface=ESP_IF_WIFI_STA); void enableWorkstation(wifi_interface_t interface=WIFI_IF_STA);
void disableWorkstation(); void disableWorkstation();
IPAddress queryHost(char *host, uint32_t timeout=2000); IPAddress queryHost(char *host, uint32_t timeout=2000);

16
libraries/WiFi/src/WiFiSTA.cpp
View File

@ -168,7 +168,7 @@ wl_status_t WiFiSTAClass::begin(const char* ssid, const char *passphrase, int32_
wifi_sta_config(&conf, ssid, passphrase, bssid, channel); 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!"); log_e("get current config failed!");
return WL_CONNECT_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; 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!"); log_e("set config failed!");
return WL_CONNECT_FAILED; return WL_CONNECT_FAILED;
} }
} else if(status() == WL_CONNECTED){ } else if(status() == WL_CONNECTED){
return WL_CONNECTED; return WL_CONNECTED;
} else { } 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!"); log_e("set config failed!");
return WL_CONNECT_FAILED; return WL_CONNECT_FAILED;
} }
@ -225,7 +225,7 @@ wl_status_t WiFiSTAClass::begin()
} }
wifi_config_t current_conf; 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"); log_e("config failed");
return WL_CONNECT_FAILED; return WL_CONNECT_FAILED;
} }
@ -272,7 +272,7 @@ bool WiFiSTAClass::disconnect(bool wifioff, bool eraseap)
if(WiFi.getMode() & WIFI_MODE_STA){ if(WiFi.getMode() & WIFI_MODE_STA){
if(eraseap){ 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!"); log_e("clear config failed!");
} }
} }
@ -398,7 +398,7 @@ IPAddress WiFiSTAClass::localIP()
uint8_t* WiFiSTAClass::macAddress(uint8_t* mac) uint8_t* WiFiSTAClass::macAddress(uint8_t* mac)
{ {
if(WiFiGenericClass::getMode() != WIFI_MODE_NULL){ if(WiFiGenericClass::getMode() != WIFI_MODE_NULL){
esp_wifi_get_mac(ESP_IF_WIFI_STA, mac); esp_wifi_get_mac(WIFI_IF_STA, mac);
} }
else{ else{
esp_read_mac(mac, ESP_MAC_WIFI_STA); esp_read_mac(mac, ESP_MAC_WIFI_STA);
@ -418,7 +418,7 @@ String WiFiSTAClass::macAddress(void)
esp_read_mac(mac, ESP_MAC_WIFI_STA); esp_read_mac(mac, ESP_MAC_WIFI_STA);
} }
else{ 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]); sprintf(macStr, "%02X:%02X:%02X:%02X:%02X:%02X", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
return String(macStr); return String(macStr);
@ -549,7 +549,7 @@ String WiFiSTAClass::psk() const
return String(); return String();
} }
wifi_config_t conf; 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)); return String(reinterpret_cast<char*>(conf.sta.password));
} }