From dd9c84fcc5fd81f3467943dfdd2fd1d7a204c69b Mon Sep 17 00:00:00 2001 From: fvanroie Date: Wed, 11 Jan 2023 13:49:06 +0100 Subject: [PATCH] Add BSSID to info page --- src/lang/en_US.h | 1 + src/lang/es_ES.h | 1 + src/lang/fr_FR.h | 1 + src/lang/hu_HU.h | 1 + src/lang/nl_NL.h | 1 + src/lang/pt_PT.h | 1 + src/lang/ro_RO.h | 1 + src/sys/net/hasp_wifi.cpp | 12 +++++++++--- 8 files changed, 16 insertions(+), 3 deletions(-) diff --git a/src/lang/en_US.h b/src/lang/en_US.h index 5d2484d0..2a971d96 100644 --- a/src/lang/en_US.h +++ b/src/lang/en_US.h @@ -189,6 +189,7 @@ #define D_INFO_WIFI "Wifi" #define D_INFO_LINK_SPEED "Link Speed" #define D_INFO_FULL_DUPLEX "Full Duplex" +#define D_INFO_BSSID "BSSID" #define D_INFO_SSID "SSID" #define D_INFO_RSSI "Signal Strength" #define D_INFO_IP_ADDRESS "IP Address" diff --git a/src/lang/es_ES.h b/src/lang/es_ES.h index c4823b5a..081a769d 100644 --- a/src/lang/es_ES.h +++ b/src/lang/es_ES.h @@ -190,6 +190,7 @@ #define D_INFO_WIFI "Wifi" #define D_INFO_LINK_SPEED "Velocidad de enlace" #define D_INFO_FULL_DUPLEX "Full Duplex" +#define D_INFO_BSSID "BSSID" #define D_INFO_SSID "SSID" #define D_INFO_RSSI "Potencia de señal" #define D_INFO_IP_ADDRESS "Dirección IP" diff --git a/src/lang/fr_FR.h b/src/lang/fr_FR.h index 4d6ea609..90c7b4fa 100644 --- a/src/lang/fr_FR.h +++ b/src/lang/fr_FR.h @@ -190,6 +190,7 @@ #define D_INFO_WIFI "Wifi" #define D_INFO_LINK_SPEED "Vitesse de liaison" #define D_INFO_FULL_DUPLEX "Duplex intégral" +#define D_INFO_BSSID "BSSID" #define D_INFO_SSID "SSID" #define D_INFO_RSSI "Force du signal" #define D_INFO_IP_ADDRESS "Adresse IP" diff --git a/src/lang/hu_HU.h b/src/lang/hu_HU.h index 3f64e993..8fd3679f 100644 --- a/src/lang/hu_HU.h +++ b/src/lang/hu_HU.h @@ -189,6 +189,7 @@ #define D_INFO_WIFI "WiFi" #define D_INFO_LINK_SPEED "Linksebesség" #define D_INFO_FULL_DUPLEX "Full Duplex" +#define D_INFO_BSSID "BSSID" #define D_INFO_SSID "SSID" #define D_INFO_RSSI "Jelerősség" #define D_INFO_IP_ADDRESS "IP cím" diff --git a/src/lang/nl_NL.h b/src/lang/nl_NL.h index f54b56c6..ab0940f9 100644 --- a/src/lang/nl_NL.h +++ b/src/lang/nl_NL.h @@ -189,6 +189,7 @@ #define D_INFO_WIFI "Wifi" #define D_INFO_LINK_SPEED "Snelheid" #define D_INFO_FULL_DUPLEX "Full Duplex" +#define D_INFO_BSSID "BSSID" #define D_INFO_SSID "SSID" #define D_INFO_RSSI "Signaalsterkte" #define D_INFO_IP_ADDRESS "IP Adres" diff --git a/src/lang/pt_PT.h b/src/lang/pt_PT.h index 463d3ad4..8bdb073a 100644 --- a/src/lang/pt_PT.h +++ b/src/lang/pt_PT.h @@ -190,6 +190,7 @@ #define D_INFO_WIFI "Wifi" #define D_INFO_LINK_SPEED "Link Speed" #define D_INFO_FULL_DUPLEX "Full Duplex" +#define D_INFO_BSSID "BSSID" #define D_INFO_SSID "SSID" #define D_INFO_RSSI "Potência do sinal" #define D_INFO_IP_ADDRESS "Endereço IP" diff --git a/src/lang/ro_RO.h b/src/lang/ro_RO.h index 7e2482e4..53f12e8e 100644 --- a/src/lang/ro_RO.h +++ b/src/lang/ro_RO.h @@ -189,6 +189,7 @@ #define D_INFO_WIFI "WiFi" #define D_INFO_LINK_SPEED "Viteză Link" #define D_INFO_FULL_DUPLEX "Duplexitate completă" +#define D_INFO_BSSID "BSSID" #define D_INFO_SSID "SSID" #define D_INFO_RSSI "Putere semnal" #define D_INFO_IP_ADDRESS "Addresa IP" diff --git a/src/sys/net/hasp_wifi.cpp b/src/sys/net/hasp_wifi.cpp index 3f45dc6c..13bdc8ef 100644 --- a/src/sys/net/hasp_wifi.cpp +++ b/src/sys/net/hasp_wifi.cpp @@ -274,7 +274,6 @@ static void wifi_callback(WiFiEvent_t event, WiFiEventInfo_t info) case SYSTEM_EVENT_WIFI_READY: /*!< ESP32 WiFi ready */ case SYSTEM_EVENT_STA_START: /*!< ESP32 station start */ case SYSTEM_EVENT_STA_AUTHMODE_CHANGE: /*!< the auth mode of AP connected by ESP32 station changed */ - case SYSTEM_EVENT_STA_BSS_RSSI_LOW: /*!< ESP32 station connected BSS rssi goes below threshold */ case SYSTEM_EVENT_STA_WPS_ER_SUCCESS: /*!< ESP32 station wps succeeds in enrollee mode */ case SYSTEM_EVENT_STA_WPS_ER_FAILED: /*!< ESP32 station wps fails in enrollee mode */ case SYSTEM_EVENT_STA_WPS_ER_TIMEOUT: /*!< ESP32 station wps timeout in enrollee mode */ @@ -308,6 +307,10 @@ static void wifi_callback(WiFiEvent_t event, WiFiEventInfo_t info) #endif break; + case SYSTEM_EVENT_STA_BSS_RSSI_LOW: + LOG_WARNING(TAG_WIFI, F("BSS rssi goes below threshold")); + break; + case SYSTEM_EVENT_AP_STOP: /*!< ESP32 soft-AP stop */ case SYSTEM_EVENT_STA_STOP: /*!< ESP32 station stop */ // wifiSetup(); @@ -507,11 +510,13 @@ bool wifiEvery5Seconds() } #else if(WiFi.getMode() != WIFI_STA) { + LOG_DEBUG(TAG_WIFI, F("5sec not STA %d"), WiFi.getMode()); return false; } #endif - if(WiFi.status() == WL_CONNECTED) { + if(WiFi.status() == WL_CONNECTED && WiFi.localIP() > 0) { + LOG_DEBUG(TAG_WIFI, F("5sec OK")); return true; } @@ -600,7 +605,8 @@ void wifi_get_info(JsonDocument& doc) String buffer((char*)0); buffer.reserve(64); - JsonObject info = doc.createNestedObject(F(D_INFO_WIFI)); + JsonObject info = doc.createNestedObject(F(D_INFO_WIFI)); + info[F(D_INFO_BSSID)] = WiFi.BSSIDstr(); int8_t rssi = WiFi.RSSI(); buffer += String(rssi);