Merge branch 'bugfix/roam_event_scan_failure' into 'master'

nachiketkukade · nachiketkukade · commit f931739352d7 · 2025-05-20T01:51:23.000+08:00
bugfix(wifi): Reset scan_ongoing flag in scan done event to allow scan trigger post roam

Closes WIFIBUG-1203

See merge request espressif/esp-idf!39163
diff --git a/components/esp_wifi/wifi_apps/roaming_app/src/roaming_app.c b/components/esp_wifi/wifi_apps/roaming_app/src/roaming_app.c
@@ -638,11 +638,13 @@ static void scan_done_event_handler(void *arg, ETS_STATUS status)
         esp_wifi_scan_get_ap_records(&g_roaming_app.scanned_aps.current_count, g_roaming_app.scanned_aps.ap_records);
         print_ap_records(&g_roaming_app.scanned_aps);
         parse_scan_results_and_roam();
-        g_roaming_app.scan_ongoing = false;
         ROAM_SCAN_RESULTS_UNLOCK();
-        } else {
-            ESP_LOGD(ROAMING_TAG, "Scan Done with error %d ", status);
+    } else {
+        ESP_LOGD(ROAMING_TAG, "Scan Done with error %d ", status);
     }
+    ROAM_SCAN_RESULTS_LOCK();
+    g_roaming_app.scan_ongoing = false;
+    ROAM_SCAN_RESULTS_UNLOCK();
 }
 static void conduct_scan(void)
 {

Original file line number	Diff line number	Diff line change
`@@ -638,11 +638,13 @@ static void scan_done_event_handler(void *arg, ETS_STATUS status)`
`638`	`638`	`esp_wifi_scan_get_ap_records(&g_roaming_app.scanned_aps.current_count, g_roaming_app.scanned_aps.ap_records);`
`639`	`639`	`print_ap_records(&g_roaming_app.scanned_aps);`
`640`	`640`	`parse_scan_results_and_roam();`
`641`		`- g_roaming_app.scan_ongoing = false;`
`642`	`641`	`ROAM_SCAN_RESULTS_UNLOCK();`
`643`		`- } else {`
`644`		`- ESP_LOGD(ROAMING_TAG, "Scan Done with error %d ", status);`
	`642`	`+ } else {`
	`643`	`+ ESP_LOGD(ROAMING_TAG, "Scan Done with error %d ", status);`
`645`	`644`	`}`
	`645`	`+ ROAM_SCAN_RESULTS_LOCK();`
	`646`	`+ g_roaming_app.scan_ongoing = false;`
	`647`	`+ ROAM_SCAN_RESULTS_UNLOCK();`
`646`	`648`	`}`
`647`	`649`	`static void conduct_scan(void)`
`648`	`650`	`{`