improving the scanning functionality

Author: gjroots

components/web_server/www/html/js/functions.js

@@ -1,6 +1,6 @@
 ---
 ---
-var version="1.0.0_beta",
+var version="1.1.0",
 	sL = getE('spinner-container'),
 	notification = getE("notification"),
 	themeColor = getComputedStyle(document.body),

components/web_server/www/html/js/scan.js

@@ -4,7 +4,6 @@ var table = document.getElementsByTagName('table')[0],
 	networkInfo = getE('networksFound'),
 	scanInfo = getE('spinner-container'),
 	apMAC = getE('apMAC'),
-	startStopScan = getE('startStopScan'),
 	selectAll = getE('selectAll'),
 	ssid = getE("ssid"),
 	password = getE("password"),
@@ -13,13 +12,16 @@ var table = document.getElementsByTagName('table')[0],
 	selectedApElement = -1,
 	previousCall = new Date().getTime(),
 	url = window.location.href,
-	wifiIndicator, securityState, res;
+	wifiIndicator, securityState,
+	scanning = false, res;
 
 function toggleScan(onoff) {
 	if (onoff) {
 		showLoading("hide");
+		scanning = false;
 	} else {
 		showLoading();
+		scanning = true;
 	}
 }
 
@@ -54,10 +56,11 @@ function getStatus(enc, hid) {
 	return buff
 }
 function scan() {
+	if (scanning) return;
 	toggleScan(false);
 	getResponse('{% if jekyll.environment == "development" %}APScanResults.json{% else %}data/APScanResults.json{% endif %}', function (responseText, status) {
-
 		try {
+			if (responseText == "false") return setTimeout(function () { scanning = false;scan(); }, 1000);
 			res = JSON.parse(responseText);
 			log("RESPONSE  ~ ", res, true)
 			notify();
@@ -66,6 +69,7 @@ function scan() {
 			log("INVALID   ~ ", responseText, false)
 			console.error(err)
 			notify('{% t scan.messages.E0 %} (E0)');
+			scanning = false;
 			return
 		}
 		res.aps = res.aps.sort(compare);
@@ -148,15 +152,15 @@ function connect() {
 		if (responseText == "true") {
 			indicate(true);
 			restart(true);
-			notify("{% t scan.messages.E2 %} (E2)",2000);
+			notify("{% t scan.messages.E2 %} (E2)", 2000);
 		} else {
 			indicate(false);
 			notify("{% t scan.messages.E3 %} (E3)");
 		}
-	},function(){
+	}, function () {
 		ndicate(false);
 		notify("{% t scan.messages.E4 %} (E4)");
-	},null,"POST");
+	}, null, "POST");
 }
 
 

components/web_server/www/output/gzip/functions.js.gz

@@ -28,18 +28,28 @@ static const char *TAG = "wifi_event_handler";
 EventGroupHandle_t wifi_event_group;
 const int WIFI_CONNECTED_BIT = BIT0;
 
+#define WIFI_RETRY_COUNT 3
+#define WIFI_RETRY_DELAY_MAX 8000
+static int wifi_retry_count = 0;
+
 void wifi_retry_handler(void)
 {
-    ESP_LOGI(TAG, "Retrying WiFi connection");
-    // Retry the WiFi connection
-    esp_wifi_scan_stop();
-    esp_wifi_disconnect();
-    esp_wifi_connect();
-    xEventGroupClearBits(wifi_event_group, WIFI_CONNECTED_BIT);
+    if (wifi_retry_count < WIFI_RETRY_COUNT)
+    {
+        ESP_LOGI(TAG, "Retrying WiFi connection (%d/%d)", wifi_retry_count + 1, WIFI_RETRY_COUNT);
+        esp_wifi_scan_stop();
+        esp_wifi_disconnect();
+        esp_wifi_connect();
+        wifi_retry_count++;
+    }
+    else
+    {
+        vTaskDelay(WIFI_RETRY_DELAY_MAX / portTICK_PERIOD_MS);
+        ESP_LOGW(TAG, "Maximum number of WiFi connection retries reached (%d)", WIFI_RETRY_COUNT);
+        wifi_retry_count = 0;
+        wifi_retry_handler();
+    }
 }
-
-//-----------------------------------------------------------------------------
-// Disconnect handler for wifi connection
 static void wifi_disconnect_handler(const uint8_t reason)
 {
     switch (reason)

components/web_server/www/output/gzip/scan.js.gz

@@ -37,8 +37,13 @@ char *wifi_scan_handler(void)
         .scan_type = WIFI_SCAN_TYPE_ACTIVE,
     };
     printf("Start scanning...\n");
-    ESP_ERROR_CHECK(esp_wifi_scan_start(&scan_config, true));
-    printf(" completed!\n");
+    esp_err_t err = esp_wifi_scan_start(&scan_config, true);
+    if (err != ESP_OK)
+    {
+        return "false";
+        printf("scanning Failed!\n");
+    }
+    printf("scanning completed!\n");
     // Get the number of access points found
 
     uint16_t ap_num;

components/wifi_handler/wifi_event_handler.c

@@ -127,10 +127,7 @@ void wifi_init()
     // Enable DNS (offer) for dhcp server
     dhcps_offer_t dhcps_dns_value = OFFER_DNS;
     dhcps_set_option_info(6, &dhcps_dns_value, sizeof(dhcps_dns_value));
-
-    xEventGroupWaitBits(wifi_event_group, WIFI_CONNECTED_BIT,
-                        pdFALSE, pdTRUE, JOIN_TIMEOUT_MS / portTICK_PERIOD_MS);
-    // vTaskDelay(2000 / portTICK_PERIOD_MS);
+    
     ESP_ERROR_CHECK(esp_wifi_start());
 
     if (strlen(ssid) > 0)
@@ -142,6 +139,8 @@ void wifi_init()
     {
         ESP_LOGI(TAG, "wifi_init_ap with default finished.");
     }
+    xEventGroupWaitBits(wifi_event_group, WIFI_CONNECTED_BIT,
+                        pdFALSE, pdFALSE, JOIN_TIMEOUT_MS / portTICK_PERIOD_MS);
 }
 
 //-----------------------------------------------------------------------------

components/wifi_handler/wifi_handler.c

@@ -10,7 +10,7 @@
 
 
 [extra_script_settings]
-version = 1.0.0_beta ; Set the version to the project 
+version = 1.1.0 ; Set the version to the project 
 merge_to_single_bin = 1 ; (0 = disable) Enable the conversion of a multiple bins to single bin file of 0x0 format