mirror
/
esp-idf
kopia lustrzana https://github.com/espressif/esp-idf
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Merge branch 'bugfix/fix_iperf_example_crash_issue' into 'master' 

example: Scan failure should not cause system crash

Closes WIFI-3306

See merge request espressif/esp-idf!11998
pull/6491/head
Jiang Jiang Jian 2021-01-18 10:52:58 +08:00
rodzic e82fe93b3d d9e1d51ec8
commit 9e059689f2
5 zmienionych plików z 7 dodań i 7 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
examples/bluetooth/bluedroid/ble/blufi/main/blufi_example_main.c
Wyświetl plik

@ -371,7 +371,7 @@ static void example_event_callback(esp_blufi_cb_event_t event, esp_blufi_cb_para
.channel = 0,
.show_hidden = false
};
ESP_ERROR_CHECK(esp_wifi_scan_start(&scanConf, true));
esp_wifi_scan_start(&scanConf, true);
break;
}
case ESP_BLUFI_EVENT_RECV_CUSTOM_DATA:

2
examples/bluetooth/esp_ble_mesh/ble_mesh_wifi_coexist/components/iperf/cmd_wifi.c
Wyświetl plik

@ -194,7 +194,7 @@ static bool wifi_cmd_sta_scan(const char *ssid)
scan_config.ssid = (uint8_t *) ssid;
ESP_ERROR_CHECK( esp_wifi_set_mode(WIFI_MODE_STA) );
ESP_ERROR_CHECK( esp_wifi_scan_start(&scan_config, false) );
esp_wifi_scan_start(&scan_config, false);
return true;
}

6
examples/mesh/manual_networking/main/mesh_main.c
Wyświetl plik

@ -136,7 +136,7 @@ void mesh_scan_done_handler(int num)
esp_wifi_scan_stop();
scan_config.show_hidden = 1;
scan_config.scan_type = WIFI_SCAN_TYPE_PASSIVE;
ESP_ERROR_CHECK(esp_wifi_scan_start(&scan_config, 0));
esp_wifi_scan_start(&scan_config, 0);
}
}
@ -157,7 +157,7 @@ void mesh_event_handler(void *arg, esp_event_base_t event_base,
/* mesh softAP is hidden */
scan_config.show_hidden = 1;
scan_config.scan_type = WIFI_SCAN_TYPE_PASSIVE;
ESP_ERROR_CHECK(esp_wifi_scan_start(&scan_config, 0));
esp_wifi_scan_start(&scan_config, 0);
}
break;
case MESH_EVENT_STOPPED: {
@ -228,7 +228,7 @@ void mesh_event_handler(void *arg, esp_event_base_t event_base,
esp_wifi_scan_stop();
scan_config.show_hidden = 1;
scan_config.scan_type = WIFI_SCAN_TYPE_PASSIVE;
ESP_ERROR_CHECK(esp_wifi_scan_start(&scan_config, 0));
esp_wifi_scan_start(&scan_config, 0);
}
}
break;

2
examples/wifi/iperf/main/cmd_wifi.c
Wyświetl plik

@ -186,7 +186,7 @@ static bool wifi_cmd_sta_scan(const char* ssid)
scan_config.ssid = (uint8_t *) ssid;
ESP_ERROR_CHECK( esp_wifi_set_mode(WIFI_MODE_STA) );
ESP_ERROR_CHECK( esp_wifi_scan_start(&scan_config, false) );
esp_wifi_scan_start(&scan_config, false);
return true;
}

2
examples/wifi/scan/main/scan.c
Wyświetl plik

@ -124,7 +124,7 @@ static void wifi_scan(void)
ESP_ERROR_CHECK(esp_wifi_set_mode(WIFI_MODE_STA));
ESP_ERROR_CHECK(esp_wifi_start());
ESP_ERROR_CHECK(esp_wifi_scan_start(NULL, true));
esp_wifi_scan_start(NULL, true);
ESP_ERROR_CHECK(esp_wifi_scan_get_ap_records(&number, ap_info));
ESP_ERROR_CHECK(esp_wifi_scan_get_ap_num(&ap_count));
ESP_LOGI(TAG, "Total APs scanned = %u", ap_count);