1
0
mirror of https://github.com/esp8266/Arduino.git synced 2025-04-19 23:22:16 +03:00

EthernetCompat - static IP auto gw,mask,dns as in Arduino libraries (#9024)

This commit is contained in:
Juraj Andrássy 2023-11-10 15:00:56 +01:00 committed by GitHub
parent 0c599ee0dc
commit 5bd52d4f86
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -38,10 +38,29 @@ public:
// Arduino-Ethernet API compatibility, order can be either: // Arduino-Ethernet API compatibility, order can be either:
// mac, ip, gateway, netmask, dns (esp8266 or natural order) // mac, ip, gateway, netmask, dns (esp8266 or natural order)
// mac, ip, dns, gateway, netmask (Arduino legacy) // mac, ip, dns, gateway, netmask (Arduino legacy)
boolean begin(const uint8_t* macAddress, const IPAddress& local_ip = IPADDR_NONE, boolean begin(const uint8_t* macAddress, IPAddress local_ip = IPADDR_NONE,
const IPAddress& arg1 = IPADDR_NONE, const IPAddress& arg2 = IPADDR_NONE, IPAddress arg1 = IPADDR_NONE, IPAddress arg2 = IPADDR_NONE,
const IPAddress& arg3 = IPADDR_NONE) IPAddress arg3 = IPADDR_NONE)
{ {
if (local_ip.isSet() && local_ip.isV4())
{
// setting auto values using arduino ordering of parameters
if (arg1 == IPADDR_NONE) // else dns or gw
{
arg1 = local_ip;
arg1[3] = 1;
}
if (arg2 == IPADDR_NONE) // else gw or mask
{
arg2 = local_ip;
arg2[3] = 1;
}
// if arg2 is mask (esp ordering), let DNS IP unconfigured
if (arg3 == IPADDR_NONE && arg2[0] != 255) // else mask or dns
{
arg3 = IPAddress(255, 255, 255, 0);
}
}
SPI4EthInit(); // Arduino Ethernet self-initializes SPI SPI4EthInit(); // Arduino Ethernet self-initializes SPI
bool ret = true; bool ret = true;
if (local_ip.isSet()) if (local_ip.isSet())