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

Fix ETH in 4.0

Browse Source
This commit is contained in:
me-no-dev
2020-04-07 01:26:36 +03:00
parent 176077b133
commit 9afee31462
3 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libraries/SD/src/sd_diskio.cpp
View File

@ -14,7 +14,6 @@
#include "sd_diskio.h" #include "sd_diskio.h"
#include "esp_system.h" #include "esp_system.h"
extern "C" { extern "C" {
#include "ffconf.h"
#include "ff.h" #include "ff.h"
#include "diskio.h" #include "diskio.h"
#ifdef ESP_IDF_VERSION_MAJOR #ifdef ESP_IDF_VERSION_MAJOR

9
libraries/WiFi/src/ETH.cpp
View File

@ -125,9 +125,13 @@ static void _eth_phy_power_enable(bool enable)
ETHClass::ETHClass() ETHClass::ETHClass()
:initialized(false) :initialized(false)
,staticIP(false) ,staticIP(false)
#if ESP_IDF_VERSION_MAJOR > 3
,eth_handle(NULL) ,eth_handle(NULL)
#endif
,started(false) ,started(false)
#if ESP_IDF_VERSION_MAJOR > 3
,eth_link(ETH_LINK_DOWN) ,eth_link(ETH_LINK_DOWN)
#endif
{ {
} }
@ -348,13 +352,8 @@ IPAddress ETHClass::gatewayIP()
IPAddress ETHClass::dnsIP(uint8_t dns_no) IPAddress ETHClass::dnsIP(uint8_t dns_no)
{ {
#ifdef ESP_IDF_VERSION_MAJOR
const ip_addr_t * dns_ip = dns_getserver(dns_no); const ip_addr_t * dns_ip = dns_getserver(dns_no);
return IPAddress(dns_ip->u_addr.ip4.addr); 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() IPAddress ETHClass::broadcastIP()

6
libraries/WiFi/src/ETH.h
View File

@ -45,7 +45,7 @@
#define ETH_PHY_MDIO 18 #define ETH_PHY_MDIO 18
#endif #endif
#ifndef ESP_IDF_VERSION_MAJOR #if ESP_IDF_VERSION_MAJOR < 4
#ifndef ETH_CLK_MODE #ifndef ETH_CLK_MODE
#define ETH_CLK_MODE ETH_CLOCK_GPIO0_IN #define ETH_CLK_MODE ETH_CLOCK_GPIO0_IN
#endif #endif
@ -57,7 +57,7 @@ class ETHClass {
private: private:
bool initialized; bool initialized;
bool staticIP; bool staticIP;
#ifdef ESP_IDF_VERSION_MAJOR #if ESP_IDF_VERSION_MAJOR > 3
esp_eth_handle_t eth_handle; esp_eth_handle_t eth_handle;
protected: protected:
@ -72,7 +72,7 @@ class ETHClass {
ETHClass(); 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); 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 #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); 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);