Commit29b84df

committed

Merge branch 'main' of github.com:arduino/ArduinoCore-mbed

2 parents0c6b337 +31f8045 commit29b84dfCopy full SHA for 29b84df

File tree

+20

-5

lines changed

+20

-5

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;`

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -188,14 +188,16 @@ const char * arduino::GSMClass::getRegistrationStateString(const mbed::CellularN`
`188`	`188`
`189`	`189`	`voidarduino::GSMClass::onStatusChange(nsapi_event_t ev,intptr_t in) {`
`190`	`190`
`191`		`-if(ev == CellularStateRetryEvent) {`
	`191`	`+ cellular_event_status event = (cellular_event_status)ev;`
	`192`	`+`
	`193`	`+if(event == CellularStateRetryEvent) {`
`192`	`194`	`feedWatchdog();`
`193`	`195`	`}`
`194`	`196`
`195`	`197`	`#if GSM_DEBUG_ENABLE`
`196`	`198`	`constcell_callback_data_t data = (constcell_callback_data_t )in;`
`197`	`199`
`198`		`-switch(ev)`
	`200`	`+switch(event)`
`199`	`201`	`{`
`200`	`202`	`case CellularDeviceReady:`
`201`	`203`	`{`

Lines changed: 5 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -21,14 +21,17 @@ int SFU::begin() {`
`21`	`21`	`if (err) {`
`22`	`22`	`err =getFileSystem().reformat(&bd);`
`23`	`23`	`}`
	`24`	`+return err;`
`24`	`25`	`}`
`25`	`26`
`26`	`27`	`intSFU::download(constchar* url) {`
`27`		`-// No download at the moment, allow the user to upload a file via mass storage`
	`28`	`+// No download at the moment, allow the user to upload a file via mass storage`
	`29`	`+return0;`
`28`	`30`	`}`
`29`	`31`
`30`	`32`	`intSFU::apply() {`
`31`		`-// No autoreboot`
	`33`	`+// No autoreboot`
	`34`	`+return0;`
`32`	`35`	`}`
`33`	`36`
`34`	`37`	`#ifdef ADD_USB_MSD`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -69,6 +69,10 @@ int arduino::WiFiClass::beginAP(const char* ssid, const char* passphrase, uint8_`
`69`	`69`	`//Set ap ssid, password and channel`
`70`	`70`	`softAPInterface->set_network(_ip, _netmask, _gateway);`
`71`	`71`	`nsapi_error_t result = softAPInterface->start(ssid, passphrase, NSAPI_SECURITY_WPA2, channel,true/* dhcp server/,NULL,true/ cohexistance*/);`
	`72`	`+if (result != NSAPI_ERROR_OK) {`
	`73`	`+ _currentNetworkStatus = WL_AP_FAILED;`
	`74`	`+return _currentNetworkStatus;`
	`75`	`+ }`
`72`	`76`
`73`	`77`	`nsapi_error_t registrationResult;`
`74`	`78`	`softAPInterface->unregister_event_handler();`

Comments

(0)