Skip to content

Commit 9ae4463

Browse files
author
Marcin Tomczyk
committed
Need to change ESP8266 driver's support AT firmware version. Only AT version 1.6 0r above support AT+CWCOUNTRY command. Command AT+CWLAP format is different for version 1.6 and above
1 parent 149d53c commit 9ae4463

File tree

1 file changed

+13
-1
lines changed

1 file changed

+13
-1
lines changed

components/wifi/esp8266-driver/ESP8266/ESP8266.cpp

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -460,7 +460,15 @@ int ESP8266::scan(WiFiAccessPoint *res, unsigned limit, scan_mode mode, unsigned
460460
_scan_r.limit = limit;
461461
_scan_r.cnt = 0;
462462

463-
if (!(_parser.send("AT+CWLAP=,,,%u,%u,%u", (mode == SCANMODE_ACTIVE ? 0 : 1), t_min, t_max) && _parser.recv("OK\n"))) {
463+
bool ret_parse_send = true;
464+
465+
if (FW_AT_LEAST_VERSION(_at_v.major, _at_v.minor, _at_v.patch, 0, ESP8266_AT_VERSION_WIFI_SCAN_CHANGE)) {
466+
ret_parse_send = _parser.send("AT+CWLAP=,,,%u,%u,%u", (mode == SCANMODE_ACTIVE ? 0 : 1), t_min, t_max);
467+
} else {
468+
ret_parse_send = _parser.send("AT+CWLAP");
469+
}
470+
471+
if (!(ret_parse_send && _parser.recv("OK\n"))) {
464472
tr_warning("scan(): AP info parsing aborted");
465473
// Lets be happy about partial success and not return NSAPI_ERROR_DEVICE_ERROR
466474
if (!_scan_r.cnt) {
@@ -1225,6 +1233,10 @@ nsapi_connection_status_t ESP8266::connection_status() const
12251233

12261234
bool ESP8266::set_country_code_policy(bool track_ap, const char *country_code, int channel_start, int channels)
12271235
{
1236+
if (!(FW_AT_LEAST_VERSION(_at_v.major, _at_v.minor, _at_v.patch, 0, ESP8266_AT_VERSION_WIFI_SCAN_CHANGE))) {
1237+
return true;
1238+
}
1239+
12281240
int t_ap = track_ap ? 0 : 1;
12291241

12301242
_smutex.lock();

0 commit comments

Comments
 (0)