ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #10967 from mtomczykmobica/IOTCORE-1251 

ESP8266: fix driver's support AT firmware version
pull/11020/head
Arto Kinnunen 2019-07-08 11:49:05 +03:00 committed by GitHub
parent 3d65ace77a 9ae4463ccc
commit 492d10cb3e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
components/wifi/esp8266-driver/ESP8266/ESP8266.cpp
View File

@ -460,7 +460,15 @@ int ESP8266::scan(WiFiAccessPoint *res, unsigned limit, scan_mode mode, unsigned
_scan_r.limit = limit; _scan_r.limit = limit;
_scan_r.cnt = 0; _scan_r.cnt = 0;
if (!(_parser.send("AT+CWLAP=,,,%u,%u,%u", (mode == SCANMODE_ACTIVE ? 0 : 1), t_min, t_max) && _parser.recv("OK\n"))) { bool ret_parse_send = true;
if (FW_AT_LEAST_VERSION(_at_v.major, _at_v.minor, _at_v.patch, 0, ESP8266_AT_VERSION_WIFI_SCAN_CHANGE)) {
ret_parse_send = _parser.send("AT+CWLAP=,,,%u,%u,%u", (mode == SCANMODE_ACTIVE ? 0 : 1), t_min, t_max);
} else {
ret_parse_send = _parser.send("AT+CWLAP");
}
if (!(ret_parse_send && _parser.recv("OK\n"))) {
tr_warning("scan(): AP info parsing aborted"); tr_warning("scan(): AP info parsing aborted");
// Lets be happy about partial success and not return NSAPI_ERROR_DEVICE_ERROR // Lets be happy about partial success and not return NSAPI_ERROR_DEVICE_ERROR
if (!_scan_r.cnt) { if (!_scan_r.cnt) {
@ -1225,6 +1233,10 @@ nsapi_connection_status_t ESP8266::connection_status() const
bool ESP8266::set_country_code_policy(bool track_ap, const char *country_code, int channel_start, int channels) bool ESP8266::set_country_code_policy(bool track_ap, const char *country_code, int channel_start, int channels)
{ {
if (!(FW_AT_LEAST_VERSION(_at_v.major, _at_v.minor, _at_v.patch, 0, ESP8266_AT_VERSION_WIFI_SCAN_CHANGE))) {
return true;
}
int t_ap = track_ap ? 0 : 1; int t_ap = track_ap ? 0 : 1;
_smutex.lock(); _smutex.lock();