Commit31f8045

authored

Merge pull request#823 from JAndrassy/ethernet_return_to_dhcp

Ethernet - allow return to DHCP after begin with static IP

2 parentsfb8dc9d +6701a63 commit31f8045Copy full SHA for 31f8045

File tree

-1

lines changed

-1

lines changed

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,11 @@ int arduino::EthernetClass::begin(uint8_t *mac, unsigned long timeout, unsigned`
`8`	`8`	`_initializerCallback();`
`9`	`9`	`if (eth_if ==nullptr)return0;`
`10`	`10`	`}`
	`11`	`+ eth_if->set_dhcp(true);`
	`12`	`+_begin(mac, timeout, responseTimeout);`
	`13`	`+}`
`11`	`14`
	`15`	`+intarduino::EthernetClass::_begin(uint8_t *mac,unsignedlong timeout,unsignedlong responseTimeout) {`
`12`	`16`	`if (mac !=nullptr) {`
`13`	`17`	`eth_if->get_emac().set_hwaddr(mac);`
`14`	`18`	`}`
`@@ -53,7 +57,7 @@ int arduino::EthernetClass::begin(uint8_t *mac, IPAddress ip, IPAddress dns, IPA`
`53`	`57`	`eth_if->set_network(_ip, _netmask, _gateway);`
`54`	`58`	`eth_if->add_dns_server(_dnsServer1,nullptr);`
`55`	`59`
`56`		`-auto ret =begin(mac, timeout, responseTimeout);`
	`60`	`+auto ret =_begin(mac, timeout, responseTimeout);`
`57`	`61`	`return ret;`
`58`	`62`	`}`
`59`	`63`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -116,6 +116,8 @@ class EthernetClass : public MbedSocketClass {`
`116`	`116`	`constexprstaticintmaintain () {return DHCP_CHECK_NONE; }`
`117`	`117`
`118`	`118`	`private:`
	`119`	`+int_begin(uint8_t *mac,unsignedlong timeout,unsignedlong responseTimeout);`
	`120`	`+`
`119`	`121`	`volatile EthernetLinkStatus _currentNetworkStatus = Unknown;`
`120`	`122`	`EthernetInterface net;`
`121`	`123`	`EthernetInterface *eth_if = &net;`

Comments

(0)