fix for LAN8720 static IP

This commit is contained in:
technyon
2024-08-17 06:31:00 +02:00
parent 95a98dd83c
commit 83ddd91589
2 changed files with 36 additions and 15 deletions

View File

@@ -125,6 +125,10 @@ void EthernetDevice::initialize()
{
Log->println(F("Use RMII"));
_hardwareInitialized = ETH.begin(_type, _phy_addr, _mdc, _mdio, _power, _clock_mode);
if(!_ipConfiguration->dhcpEnabled())
{
_checkIpTs = (esp_timer_get_time() / 1000) + 2000;
}
}
#endif
@@ -137,7 +141,6 @@ void EthernetDevice::initialize()
ETH.config(_ipConfiguration->ipAddress(), _ipConfiguration->defaultGateway(), _ipConfiguration->subnet(), _ipConfiguration->dnsServer());
}
Network.onEvent([&](arduino_event_id_t event, arduino_event_info_t info)
{
switch (event) {
@@ -147,27 +150,21 @@ void EthernetDevice::initialize()
break;
case ARDUINO_EVENT_ETH_CONNECTED:
Log->println("ETH Connected");
if(!localIP().equals("0.0.0.0")) _connected = true;
if(!localIP().equals("0.0.0.0"))
{
_connected = true;
}
break;
case ARDUINO_EVENT_ETH_GOT_IP:
Log->printf("ETH Got IP: '%s'\n", esp_netif_get_desc(info.got_ip.esp_netif));
Log->println(ETH);
if(!_ipConfiguration->dhcpEnabled() && _ipConfiguration->ipAddress() != ETH.localIP())
// For RMII devices, this check is handled in the update() method.
if(_useSpi && !_ipConfiguration->dhcpEnabled() && _ipConfiguration->ipAddress() != ETH.localIP())
{
Log->printf("Static IP not used, retrying to set static IP");
ETH.config(_ipConfiguration->ipAddress(), _ipConfiguration->defaultGateway(), _ipConfiguration->subnet(), _ipConfiguration->dnsServer());
if(_useSpi)
{
ETH.begin(_type, _phy_addr, _cs, _irq, _rst, SPI);
}
#ifdef CONFIG_IDF_TARGET_ESP32
else
{
_hardwareInitialized = ETH.begin(_type, _phy_addr, _mdc, _mdio, _power, _clock_mode);
}
#endif
ETH.begin(_type, _phy_addr, _cs, _irq, _rst, SPI);
}
_connected = true;
@@ -204,6 +201,26 @@ void EthernetDevice::initialize()
}
}
void EthernetDevice::update()
{
NetworkDevice::update();
if(_checkIpTs != -1)
{
if(_ipConfiguration->ipAddress() != ETH.localIP())
{
Log->println(F("ETH Set static IP"));
ETH.config(_ipConfiguration->ipAddress(), _ipConfiguration->defaultGateway(), _ipConfiguration->subnet(), _ipConfiguration->dnsServer());
_checkIpTs = (esp_timer_get_time() / 1000) + 2000;
}
else
{
_checkIpTs = -1;
}
}
}
void EthernetDevice::reconfigure()
{
delay(200);
@@ -249,4 +266,4 @@ String EthernetDevice::localIP()
String EthernetDevice::BSSIDstr()
{
return "";
}
}

View File

@@ -49,6 +49,8 @@ public:
virtual void initialize();
virtual void reconfigure();
virtual void update();
virtual ReconnectStatus reconnect(bool force = false);
bool supportsEncryption() override;
@@ -89,6 +91,8 @@ private:
int _spi_mosi;
uint8_t _spi_freq_mhz;
int64_t _checkIpTs = -1;
eth_phy_type_t _type;
eth_clock_mode_t _clock_mode;
bool _use_mac_from_efuse;