From 04760589582377a26a7562ae53a93402270b6952 Mon Sep 17 00:00:00 2001 From: Gunnar Skjold Date: Thu, 23 Jan 2025 14:46:52 +0100 Subject: [PATCH] Fixed wifi scan for 8266 --- lib/SvelteUi/src/AmsWebServer.cpp | 40 ++++++++++++++++++++----------- 1 file changed, 26 insertions(+), 14 deletions(-) diff --git a/lib/SvelteUi/src/AmsWebServer.cpp b/lib/SvelteUi/src/AmsWebServer.cpp index aba1f44d..75bf1d04 100644 --- a/lib/SvelteUi/src/AmsWebServer.cpp +++ b/lib/SvelteUi/src/AmsWebServer.cpp @@ -2735,20 +2735,32 @@ void AmsWebServer::wifiScan() { String ssid = WiFi.SSID(i); int32_t rssi = WiFi.RSSI(i); int32_t chan = WiFi.channel(i); - wifi_auth_mode_t enc = WiFi.encryptionType(i); - String encStr; - switch (enc) { - case WIFI_AUTH_OPEN: encStr = "open"; break; - case WIFI_AUTH_WEP: encStr = "WEP"; break; - case WIFI_AUTH_WPA_PSK: encStr = "WPA"; break; - case WIFI_AUTH_WPA2_PSK: encStr = "WPA2"; break; - case WIFI_AUTH_WPA_WPA2_PSK: encStr = "WPA+WPA2"; break; - case WIFI_AUTH_WPA2_ENTERPRISE: encStr = "WPA2-EAP"; break; - case WIFI_AUTH_WPA3_PSK: encStr = "WPA3"; break; - case WIFI_AUTH_WPA2_WPA3_PSK: encStr = "WPA2+WPA3"; break; - case WIFI_AUTH_WAPI_PSK: encStr = "WAPI"; break; - default: encStr = "unknown"; - } + #if defined(ESP32) + wifi_auth_mode_t enc = WiFi.encryptionType(i); + String encStr; + switch (enc) { + case WIFI_AUTH_OPEN: encStr = "open"; break; + case WIFI_AUTH_WEP: encStr = "WEP"; break; + case WIFI_AUTH_WPA_PSK: encStr = "WPA"; break; + case WIFI_AUTH_WPA2_PSK: encStr = "WPA2"; break; + case WIFI_AUTH_WPA_WPA2_PSK: encStr = "WPA+WPA2"; break; + case WIFI_AUTH_WPA2_ENTERPRISE: encStr = "WPA2-EAP"; break; + case WIFI_AUTH_WPA3_PSK: encStr = "WPA3"; break; + case WIFI_AUTH_WPA2_WPA3_PSK: encStr = "WPA2+WPA3"; break; + case WIFI_AUTH_WAPI_PSK: encStr = "WAPI"; break; + default: encStr = "unknown"; + } + #else + uint8_t enc = WiFi.encryptionType(i); + String encStr; + switch (enc) { + case ENC_TYPE_WEP: encStr = "WEP"; break; + case ENC_TYPE_TKIP: encStr = "WPA"; break; + case ENC_TYPE_CCMP: encStr = "WPA2"; break; + case ENC_TYPE_NONE: encStr = "open"; break; + default: encStr = "unknown"; + } + #endif char bssidStr[18] = { 0 }; sprintf(bssidStr, "%02X:%02X:%02X:%02X:%02X:%02X", bssid[0], bssid[1], bssid[2], bssid[3], bssid[4], bssid[5]);