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

Fix issues with WiFi scanning

Browse Source
This commit is contained in:
Ivan Grokhotkov 2014-12-23 12:33:59 +03:00
parent 6aaa9ab3e6
commit 4b25ae86ea
1 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -218,11 +218,27 @@ void ESP8266WiFiClass::_scanDone(void* result, int status)
else else
{ {
int i = 0; int i = 0;
bss_info_head_t* head = reinterpret_cast<bss_info_head_t*>(result); bss_info_head_t* head = reinterpret_cast<bss_info_head_t*>(result);
ESP8266WiFiClass::_scanResult = STAILQ_FIRST(head);
for (bss_info* it = STAILQ_FIRST(head); it; it = STAILQ_NEXT(it, next), ++i); for (bss_info* it = STAILQ_FIRST(head); it; it = STAILQ_NEXT(it, next), ++i);
ESP8266WiFiClass::_scanCount = i; ESP8266WiFiClass::_scanCount = i;
if (i == 0)
{
ESP8266WiFiClass::_scanResult = 0;
}
else
{
bss_info* copied_info = new bss_info[i];
i = 0;
for (bss_info* it = STAILQ_FIRST(head); it; it = STAILQ_NEXT(it, next), ++i)
{
memcpy(copied_info + i, it, sizeof(bss_info));
}
ESP8266WiFiClass::_scanResult = copied_info;
}
} }
esp_schedule(); esp_schedule();
} }
@ -242,15 +258,9 @@ int8_t ESP8266WiFiClass::scanNetworks()
if (ESP8266WiFiClass::_scanResult) if (ESP8266WiFiClass::_scanResult)
{ {
struct bss_info* it = reinterpret_cast<bss_info*>(ESP8266WiFiClass::_scanResult); delete[] reinterpret_cast<bss_info*>(ESP8266WiFiClass::_scanResult);
ESP8266WiFiClass::_scanResult = 0; ESP8266WiFiClass::_scanResult = 0;
ESP8266WiFiClass::_scanCount = 0; ESP8266WiFiClass::_scanCount = 0;
while(it)
{
bss_info* next = STAILQ_NEXT(it, next);
os_free(it);
it = next;
}
} }
struct scan_config config; struct scan_config config;
@ -268,15 +278,8 @@ void * ESP8266WiFiClass::_getScanInfoByIndex(int i)
{ {
return 0; return 0;
} }
struct bss_info* it = reinterpret_cast<bss_info*>(ESP8266WiFiClass::_scanResult);
while(i > 0 && it)
{
it = STAILQ_NEXT(it, next);
--i;
}
return it; return reinterpret_cast<bss_info*>(ESP8266WiFiClass::_scanResult) + i;
} }
const char* ESP8266WiFiClass::SSID(uint8_t i) const char* ESP8266WiFiClass::SSID(uint8_t i)