Use bssid to connect to best WIFI and added option to always perform …

…a WIFI-scan #241

Thank's to @Joe91 !

changelog.md

@@ -1,4 +1,5 @@
 ## DEV-branch
+* 07.06.2023: Use bssid to connect to best WIFI and added option to always perform a WIFI-scan #241
 * 06.06.2023: List available WiFi's in accesspoint view
 * 06.06.2023: Remove support for Arduino 1.0.6 & playlist cache
 * 05.06.2023: FastLED 3.6.0, PlatformIO package 6.3.1

html/accesspoint.html

@@ -18,6 +18,10 @@
 				border: 0;
 				padding: 0 15px
 			}
+			input[type="checkbox"] {
+				width: 20px;
+				height: 20px
+			}
 			body {
 				background: #007bff;
 				font-family: sans-serif;
@@ -81,6 +85,8 @@ <h1 data-i18n="wifi.title">WiFi-configuration</h1>
 			<label for="hostname" data-i18n="wifi.hostname.title">Hostname</label>:<br>
 			<input type="text" id="hostname" name="hostname" value="espuino" required><br><br>
 
+			<input type="checkbox" id="scan_wifi_on_start" name="scan_wifi_on_start" value=false>
+			<label for="scan_wifi_on_start" data-i18n="wifi.scan.enabled">Start with best WiFi</label><br><br>
 			<input type="checkbox" id="static_enabled" name="static_enabled" value=false>
 			<label for="static_enabled" data-i18n="wifi.static.enabled">Static IP</label>
 
@@ -110,15 +116,15 @@ <h1 data-i18n="wifi.restartPrompt">Ready to go?</h1>
                 loadPath: "/locales/{{lng}}.json"
             },
             debug: true,
-            fallbackLng: 'en',
+            fallbackLng: 'de',
         }, (err, t) => {
             localize = locI18next.init(i18next);
             localize('body');
         });
 
 		function selectWiFi(ssid) {
 			document.getElementById("ssid").value = ssid;
-			document.getElementById("ssid").focus();
+			document.getElementById("pwd").focus();
 		}
 
 		async function getWiFiList() {
@@ -152,11 +158,13 @@ <h1 data-i18n="wifi.restartPrompt">Ready to go?</h1>
 
 		async function wifiConfig() {
 			let static = document.getElementById('static_enabled').checked;
+			let scanwifionstart = document.getElementById('scan_wifi_on_start').checked;
 
 			var myObj = { 
 				ssid: document.getElementById('ssid').value,
 				pwd: document.getElementById('pwd').value,
-				static: static
+				static: static,
+				scanwifionstart: scanwifionstart
 			};
 
 			if (static) {

html/locales/de.json

@@ -49,6 +49,9 @@
             "dns1": " DNS 1 für statische IP-Konfiguration",
             "dns2": "DNS 2 für statische IP-Konfiguration"
         },
+        "scan": {
+            "enabled": "Start mit bestem WLAN"
+        },
         "restartPrompt": "Fertig?"
     },
     "control": {

html/locales/en.json

@@ -49,6 +49,9 @@
             "dns1": " DNS 1 for static IP-Configuration",
             "dns2": "DNS 2 for static IP-Configuration"
         },
+        "scan": {
+            "enabled": "Start with strongest WiFi"
+        },
         "restartPrompt": "Ready to go?"
     },
     "control": {

html/management.html

@@ -200,6 +200,8 @@
 						<label for="pwd" data-i18n="[prepend]wifi.password.title">:</label>
 						<input type="password" class="form-control" id="pwd" name="pwd" data-i18n="[placeholder]wifi.password.placeholder" required>
 
+						<input type="checkbox" id="scan_wifi_on_start" name="scan_wifi_on_start" value=false>
+						<label for="scan_wifi_on_start" data-i18n="wifi.scan.enabled">Start with best WiFi</label><br><br>
 						<input type="checkbox" id="static_enabled" name="static_enabled" value=false>
 						<label for="static_enabled" data-i18n="[prepend]wifi.static.enabled">:</label>
 						<div id="wifi_static_div" style="display:none">
@@ -1507,11 +1509,13 @@
 	async function wifiConfig(clickedId) {
 		lastIdclicked = clickedId;
 		let static = document.getElementById('static_enabled').checked;
+		let scanwifionstart = document.getElementById('scan_wifi_on_start').checked;
 
 		var myObj = { 
 			ssid: document.getElementById('ssid').value,
 			pwd: document.getElementById('pwd').value,
-			static: static
+			static: static,
+			scanwifionstart: scanwifionstart
 		};
 
 		if (static) {

src/Web.cpp

@@ -1249,6 +1249,10 @@ void handlePostSavedSSIDs(AsyncWebServerRequest *request, JsonVariant &json) {
 	strncpy(networkSettings.password, (const char*) jsonObj["pwd"], 64);
 	networkSettings.password[64] = '\0';
 
+	// always perform perform a WiFi scan on startup?
+	static bool alwaysScan = (bool) jsonObj["scanwifionstart"];
+	gPrefsSettings.putBool("ScanWiFiOnStart", alwaysScan);
+
 	networkSettings.use_static_ip = (bool) jsonObj["static"];
 
 	if (jsonObj.containsKey("static_addr")) {

src/Wlan.cpp

@@ -125,7 +125,7 @@ void Wlan_Init(void) {
 	handleWifiStateInit();
 }
 
-void connectToKnownNetwork(WiFiSettings settings) {
+void connectToKnownNetwork(WiFiSettings settings, byte *bssid = nullptr) {
 	// set hostname on connect, because when resetting wifi config elsewhere it could be reset
 	if (hostname.compareTo("-1")) {
 		WiFi.setHostname(hostname.c_str());
@@ -145,7 +145,7 @@ void connectToKnownNetwork(WiFiSettings settings) {
 
 	Log_Printf(LOGLEVEL_NOTICE, wifiConnectionInProgress, settings.ssid);
 
-	WiFi.begin(settings.ssid, settings.password);
+	WiFi.begin(settings.ssid, settings.password, 0, bssid);
 }
 
 void handleWifiStateInit() {
@@ -160,7 +160,15 @@ void handleWifiStateInit() {
 	connectionAttemptCounter = 0;
 	connectStartTimestamp = 0;
 	connectionFailedTimestamp = 0;
-	wifiState = WIFI_STATE_CONNECT_LAST;
+	bool scanWiFiOnStart = gPrefsSettings.getBool("ScanWiFiOnStart", false);
+	if (scanWiFiOnStart) {
+		// perform a scan to find the strongest network with same ssid (e.g. for mesh/repeater networks)
+		WiFi.scanNetworks(true, false, true, 120);		
+		wifiState = WIFI_STATE_SCAN_CONN;
+	} else {
+		// quick connect without additional scan
+		wifiState = WIFI_STATE_CONNECT_LAST;
+	}
 }
 
 void handleWifiStateConnectLast() {
@@ -246,10 +254,11 @@ void handleWifiStateScanConnect() {
 	for (int i = scanIndex; i < wifiScanCompleteResult; i++) {
 		// try to connect to wifi network with index i
 		String issid = WiFi.SSID(i);
+		byte *bssid = WiFi.BSSID(i);
 		// check if ssid name matches any saved ssid
 		for (int j = 0; j < numKnownNetworks; j++) {
 			if (strncmp(issid.c_str(), knownNetworks[j].ssid, 32) ==0 ) {
-				connectToKnownNetwork(knownNetworks[j]);
+				connectToKnownNetwork(knownNetworks[j], bssid);
 
 				connectStartTimestamp = millis();
 

src/revision.h

@@ -1,4 +1,4 @@
 #pragma once
 
 #include "gitrevision.h"
-constexpr const char softwareRevision[] = "Software-revision: 20230606-1";
+constexpr const char softwareRevision[] = "Software-revision: 20230607-1";