From 717560a8d8893fa6c3f81de689d1cac9b7f1426e Mon Sep 17 00:00:00 2001
From: Bogdan <bogd@live.ru>
Date: Sun, 8 Jan 2023 10:35:33 +0200
Subject: [PATCH] added test scen wifi routine

---
 include/NetTransport.h |  1 +
 src/HTTPPostSystem.c   |  1 +
 src/WiFiTransport.c    | 68 +++++++++++++++++++++++++++---------------
 3 files changed, 46 insertions(+), 24 deletions(-)

diff --git a/include/NetTransport.h b/include/NetTransport.h
index 044f763..528af3b 100644
--- a/include/NetTransport.h
+++ b/include/NetTransport.h
@@ -54,6 +54,7 @@ void StartTimeGet(void);
 
 void WiFiAPStart(void);
 void WiFiSTAStart(void);
+void WiFiScan(void);
 void EthStart(void);
 
 void WiFiTransportTask(void *prm);
diff --git a/src/HTTPPostSystem.c b/src/HTTPPostSystem.c
index 8fd5479..82d1e8d 100644
--- a/src/HTTPPostSystem.c
+++ b/src/HTTPPostSystem.c
@@ -450,6 +450,7 @@ static HTTP_IO_RESULT HTTPPostSystemSettings(httpd_req_t *req, char *PostData)
     {
         if (!strcmp(tmp, (const char*) "1"))
         {
+           WiFiScan();
             return HTTP_IO_DONE_NOREFRESH;
         }
         else if (!strcmp(tmp, (const char*) "2"))
diff --git a/src/WiFiTransport.c b/src/WiFiTransport.c
index dae7ff5..e6d695b 100644
--- a/src/WiFiTransport.c
+++ b/src/WiFiTransport.c
@@ -444,31 +444,31 @@ static void wifi_init_apsta(void *pvParameter)
     ESP_LOGI(TAG, "wifi_init_softap_sta finished");
 
     /* Waiting until either the connection is established (WIFI_CONNECTED_BIT) or connection failed for the maximum
-      * number of re-tries (WIFI_FAIL_BIT). The bits are set by event_handler() (see above) */
-     EventBits_t bits = xEventGroupWaitBits(s_wifi_event_group,
-     WIFI_CONNECTED_BIT | WIFI_FAIL_BIT,
-                                            pdFALSE,
-                                            pdFALSE,
-                                            portMAX_DELAY);
+     * number of re-tries (WIFI_FAIL_BIT). The bits are set by event_handler() (see above) */
+    EventBits_t bits = xEventGroupWaitBits(s_wifi_event_group,
+    WIFI_CONNECTED_BIT | WIFI_FAIL_BIT,
+                                           pdFALSE,
+                                           pdFALSE,
+                                           portMAX_DELAY);
 
-     /* xEventGroupWaitBits() returns the bits before the call returned, hence we can test which event actually
-      * happened. */
-     if (bits & WIFI_CONNECTED_BIT)
-     {
-         ESP_LOGI(TAG, "connected to ap SSID:%s password:%s",
-                  GetSysConf()->wifiSettings.InfSSID,
-                  GetSysConf()->wifiSettings.InfSecurityKey);
-     }
-     else if (bits & WIFI_FAIL_BIT)
-     {
-         ESP_LOGI(TAG, "Failed to connect to SSID:%s, password:%s",
-                  GetSysConf()->wifiSettings.InfSSID,
-                  GetSysConf()->wifiSettings.InfSecurityKey);
-     }
-     else
-     {
-         ESP_LOGE(TAG, "UNEXPECTED EVENT");
-     }
+    /* xEventGroupWaitBits() returns the bits before the call returned, hence we can test which event actually
+     * happened. */
+    if (bits & WIFI_CONNECTED_BIT)
+    {
+        ESP_LOGI(TAG, "connected to ap SSID:%s password:%s",
+                 GetSysConf()->wifiSettings.InfSSID,
+                 GetSysConf()->wifiSettings.InfSecurityKey);
+    }
+    else if (bits & WIFI_FAIL_BIT)
+    {
+        ESP_LOGI(TAG, "Failed to connect to SSID:%s, password:%s",
+                 GetSysConf()->wifiSettings.InfSSID,
+                 GetSysConf()->wifiSettings.InfSecurityKey);
+    }
+    else
+    {
+        ESP_LOGE(TAG, "UNEXPECTED EVENT");
+    }
 
     vTaskDelete(NULL);
 }
@@ -484,3 +484,23 @@ void WiFiSTAStart(void)
     xTaskCreate(wifi_init_sta, "InitStationTask", 1024 * 4, (void*) 0, 3, NULL);
 }
 
+#define DEFAULT_SCAN_LIST_SIZE 20
+
+void WiFiScan(void)
+{
+    uint16_t number = DEFAULT_SCAN_LIST_SIZE;
+    wifi_ap_record_t ap_info[DEFAULT_SCAN_LIST_SIZE];
+    uint16_t ap_count = 0;
+    memset(ap_info, 0, sizeof(ap_info));
+
+    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);
+    for (int i = 0; (i < DEFAULT_SCAN_LIST_SIZE) && (i < ap_count); i++)
+    {
+        ESP_LOGI(TAG, "SSID \t\t%s", ap_info[i].ssid);
+        ESP_LOGI(TAG, "RSSI \t\t%d", ap_info[i].rssi);
+        ESP_LOGI(TAG, "Channel \t\t%d\n", ap_info[i].primary);
+    }
+}