Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions libraries/WiFi/src/WiFi.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -337,15 +337,22 @@ int8_t WiFiClass::scanNetworks() {
wifi_assert_raise_ret(_last_error, 0);
}

/* Reset scan results before starting new scan */
scan_results.status = CY_WCM_SCAN_INCOMPLETE;
scan_results.result_count = 0;

cy_rslt_t ret = cy_wcm_start_scan(WiFiClass::wcm_scan_cb, (void *)&scan_results, NULL);
wcm_assert_raise_ret(ret, WIFI_ERROR_SCAN_FAILED, 0);

constexpr uint16_t timeout = 1000; /* 1000 times by 10 ms delay = 10 seconds */
constexpr uint16_t scan_timeout_ms = 1000; /* 1000 times by 10 ms delay = 10 seconds */
uint16_t timer = 0;
while (scan_results.status == CY_WCM_SCAN_INCOMPLETE && timer < timeout) {
while (scan_results.status == CY_WCM_SCAN_INCOMPLETE && timer < scan_timeout_ms) {
delay(10);
timer++;
}
/* Stop scan after completion or timeout */
ret = cy_wcm_stop_scan();
wcm_assert_raise_ret(ret, WIFI_ERROR_SCAN_FAILED, 0);

/* Deinitialize if it was not already assigned as access
point or station. */
Expand Down Expand Up @@ -625,13 +632,13 @@ wl_auth_mode WiFiClass::convertEncryptType(cy_wcm_security_t wcm_sec) {
}
return sec_type;
}

/* Callback function for scanNetworks() method. After each scan result, the scan callback is executed.*/
void WiFiClass::wcm_scan_cb(cy_wcm_scan_result_t *result_ptr, void *user_data, cy_wcm_scan_status_t status) {
scan_results_t *scan_user_data = (scan_results_t *)user_data;

/* Stop after if more results than the maximum are available */
if (scan_user_data->result_count > CY_MAX_SCAN_RESULTS) {
cy_wcm_stop_scan();
if (scan_user_data->result_count >= CY_MAX_SCAN_RESULTS) {
scan_user_data->status = CY_WCM_SCAN_COMPLETE;
return;
}
Expand Down
Loading