arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-07-01 03:26:58 +03:00
Code Activity

Fix build

Browse Source
This commit is contained in:
Ivan Grokhotkov
2015-05-24 15:35:18 +03:00
parent 5d384d55b7
commit 4fdd546ad5
5 changed files with 27 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
libraries/ESP8266WiFi/src/ESP8266WiFi.cpp
View File

@ -468,9 +468,10 @@ void ESP8266WiFiClass::beginSmartConfig()
}
_smartConfigStarted = true;
_smartConfigDone = false;
//SC_TYPE_ESPTOUCH use ESPTOUCH for smartconfig, or use SC_TYPE_AIRKISS for AIRKISS
smartconfig_start(SC_TYPE_ESPTOUCH, &ESP8266WiFiClass::_smartConfigDone);
smartconfig_start(SC_TYPE_ESPTOUCH, reinterpret_cast<sc_callback_t>(&ESP8266WiFiClass::_smartConfigCallback), 1);
}
void ESP8266WiFiClass::stopSmartConfig()
@ -482,22 +483,30 @@ void ESP8266WiFiClass::stopSmartConfig()
_smartConfigStarted = false;
}
bool ESP8266WiFiClass::smartConfigDone(){
bool ESP8266WiFiClass::smartConfigDone()
{
if (!_smartConfigStarted)
return false;
return smartconfig_get_status() == SC_STATUS_LINK_OVER;
return _smartConfigDone;
}
void ESP8266WiFiClass::_smartConfigDone(void* result)
void ESP8266WiFiClass::_smartConfigCallback(uint32_t st, void* result)
{
station_config* sta_conf = reinterpret_cast<station_config*>(result);
wifi_station_set_config(sta_conf);
wifi_station_disconnect();
wifi_station_connect();
}
sc_status status = (sc_status) st;
if (status == SC_STATUS_LINK) {
station_config* sta_conf = reinterpret_cast<station_config*>(result);
wifi_station_set_config(sta_conf);
wifi_station_disconnect();
wifi_station_connect();
WiFi._smartConfigDone = true;
}
else if (status == SC_STATUS_LINK_OVER) {
WiFi.stopSmartConfig();
}
}
void ESP8266WiFiClass::printDiag(Print& p)
{