arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-06-16 11:21:18 +03:00
Code Activity

Rework of arduino compatibility in WiFiSTAClass::config (#4145)

Browse Source
This commit is contained in:
Develo
2018-01-17 15:30:24 -03:00
committed by GitHub
parent bb794f9e02
commit b08ff10269
1 changed files with 52 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

96
libraries/ESP8266WiFi/src/ESP8266WiFiSTA.cpp
View File

@ -214,60 +214,68 @@ swap(IPAddress &lhs, IPAddress &rhs)
* @param dns1 Static DNS server 1 * @param dns1 Static DNS server 1
* @param dns2 Static DNS server 2 * @param dns2 Static DNS server 2
*/ */
bool ESP8266WiFiSTAClass::config(IPAddress local_ip, IPAddress gateway, IPAddress subnet, IPAddress dns1, IPAddress dns2) { bool ESP8266WiFiSTAClass::config(IPAddress local_ip, IPAddress arg1, IPAddress arg2, IPAddress arg3, IPAddress dns2) {
if(!WiFi.enableSTA(true)) { if(!WiFi.enableSTA(true)) {
return false; return false;
} }
//Arduino has a different arg order: ip, dns, gateway, subnet. To allow compatibility, check first octet of 3rd arg. If 255, interpret as ESP order, otherwise Arduino order. //ESP argument order is: ip, gateway, subnet, dns1
if(subnet[0] != 255) //Arduino arg order is: ip, dns, gateway, subnet.
{
//octet is not 255 => interpret as Arduino order
if(dns1[0] == 0) //first, check whether dhcp should be used, which is when ip == 0 && gateway == 0 && subnet == 0.
{ bool espOrderUseDHCP = (local_ip == 0U && arg1 == 0U && arg2 == 0U);
//arg order is arduino and 4th arg not given => assign it arduino default bool arduinoOrderUseDHCP = (local_ip == 0U && arg2 == 0U && arg3 == 0U);
dns1 = IPAddress(255,255,255,0); if (espOrderUseDHCP || arduinoOrderUseDHCP) {
} _useStaticIp = false;
wifi_station_dhcpc_start();
return true;
}
//current order is arduino: ip-dns-gway-subnet //To allow compatibility, check first octet of 3rd arg. If 255, interpret as ESP order, otherwise Arduino order.
swap(gateway, subnet); //after this, order is ip-gway-dns-subnet IPAddress gateway = arg1;
swap(subnet, dns1); //after this, order is ip-gway-subnet-dns (correct ESP order) IPAddress subnet = arg2;
} IPAddress dns1 = arg3;
struct ip_info info; if(subnet[0] != 255)
info.ip.addr = static_cast<uint32_t>(local_ip); {
info.gw.addr = static_cast<uint32_t>(gateway); //octet is not 255 => interpret as Arduino order
info.netmask.addr = static_cast<uint32_t>(subnet); gateway = arg2;
subnet = arg3[0] == 0 ? IPAddress(255,255,255,0) : arg3; //arg order is arduino and 4th arg not given => assign it arduino default
dns1 = arg1;
}
if (local_ip == 0U && gateway == 0U && subnet == 0U) { //ip and gateway must be in the same subnet
_useStaticIp = false; if((local_ip & subnet) != (gateway & subnet)) {
wifi_station_dhcpc_start(); return false;
return true; }
}
wifi_station_dhcpc_stop(); struct ip_info info;
if(wifi_set_ip_info(STATION_IF, &info)) { info.ip.addr = static_cast<uint32_t>(local_ip);
_useStaticIp = true; info.gw.addr = static_cast<uint32_t>(gateway);
} else { info.netmask.addr = static_cast<uint32_t>(subnet);
return false;
}
ip_addr_t d;
if(dns1 != (uint32_t)0x00000000) { wifi_station_dhcpc_stop();
// Set DNS1-Server if(wifi_set_ip_info(STATION_IF, &info)) {
d.addr = static_cast<uint32_t>(dns1); _useStaticIp = true;
dns_setserver(0, &d); } else {
} return false;
}
ip_addr_t d;
if(dns2 != (uint32_t)0x00000000) { if(dns1 != (uint32_t)0x00000000) {
// Set DNS2-Server // Set DNS1-Server
d.addr = static_cast<uint32_t>(dns2); d.addr = static_cast<uint32_t>(dns1);
dns_setserver(1, &d); dns_setserver(0, &d);
} }
return true; if(dns2 != (uint32_t)0x00000000) {
// Set DNS2-Server
d.addr = static_cast<uint32_t>(dns2);
dns_setserver(1, &d);
}
return true;
} }
/** /**