From a5cfa8b3b99b5445bc6d59bb5900ad3145362638 Mon Sep 17 00:00:00 2001 From: Torsten Stauder Date: Thu, 8 Jul 2021 08:47:29 +0200 Subject: [PATCH] Adding RSSI --- html/management_DE.html | 2 +- html/management_EN.html | 2 +- src/HTMLmanagement_DE.h | 2 +- src/HTMLmanagement_EN.h | 2 +- src/Web.cpp | 10 +++++++--- src/Wlan.cpp | 6 +++++- src/Wlan.h | 3 ++- src/main.cpp | 6 +++++- 8 files changed, 23 insertions(+), 10 deletions(-) diff --git a/html/management_DE.html b/html/management_DE.html index 3dbcabd..67dbf33 100644 --- a/html/management_DE.html +++ b/html/management_DE.html @@ -137,7 +137,7 @@ Neustart Ausschalten Log - RAM-info + Infos
diff --git a/html/management_EN.html b/html/management_EN.html index e6255c8..59492fd 100644 --- a/html/management_EN.html +++ b/html/management_EN.html @@ -137,7 +137,7 @@ Restart Shutdown Log - RAM-info + Infos
diff --git a/src/HTMLmanagement_DE.h b/src/HTMLmanagement_DE.h index 5426302..e07cbcf 100644 --- a/src/HTMLmanagement_DE.h +++ b/src/HTMLmanagement_DE.h @@ -137,7 +137,7 @@ static const char management_HTML[] PROGMEM = "\ Neustart\ Ausschalten\ Log\ - RAM-info\ + Infos\ \ \
\ diff --git a/src/HTMLmanagement_EN.h b/src/HTMLmanagement_EN.h index 36efced..205d893 100644 --- a/src/HTMLmanagement_EN.h +++ b/src/HTMLmanagement_EN.h @@ -137,7 +137,7 @@ static const char management_HTML[] PROGMEM = "\ Restart\ Shutdown\ Log\ - RAM-info\ + Infos\ \ \
\ diff --git a/src/Web.cpp b/src/Web.cpp index 0dfd520..38415f3 100644 --- a/src/Web.cpp +++ b/src/Web.cpp @@ -156,11 +156,17 @@ void webserverStart(void) { info += "\nGroesster freier heap-block: " + String((uint32_t)heap_caps_get_largest_free_block(MALLOC_CAP_8BIT)); info += "\nFreier PSRAM: "; info += (!psramInit()) ? "nicht verfuegbar" : String(ESP.getFreePsram()); + if (Wlan_IsConnected) { + info += "\nWLAN-Signalstaerke: " + String((int8_t)Wlan_GetRssi()) + " dBm"; + } #else String info = "Free heap: " + String(ESP.getFreeHeap()); info += "\nLargest free heap-block: " + String((uint32_t)heap_caps_get_largest_free_block(MALLOC_CAP_8BIT)); info += "\nFree PSRAM: "; info += (!psramInit()) ? "not available" : String(ESP.getFreePsram()); + if (Wlan_IsConnected) { + info += "\nWiFi signal-strength: " + String((int8_t)Wlan_GetRssi()) + " dBm"; + } #endif request->send_P(200, "text/plain", info.c_str()); }); @@ -812,7 +818,7 @@ void handleUpload(AsyncWebServerRequest *request, String filename, size_t index, } if (!tmpFile) { - Serial.println(F("Error occured while saving tmpfile to SD")); + Log_Println((char *) FPSTR(errorWritingTmpfile), LOGLEVEL_ERROR); return; } @@ -859,12 +865,10 @@ void Web_DumpSdToNvs(const char *_filename) { count = true; memcpy(nvsEntry[0].nvsKey, token, strlen(token)); nvsEntry[0].nvsKey[strlen(token)] = '\0'; - //Serial.printf("Key: %s\n", token); } else { count = false; memcpy(nvsEntry[0].nvsEntry, token, strlen(token)); nvsEntry[0].nvsEntry[strlen(token)] = '\0'; - //Serial.printf("Entry: %s\n", token); } token = strtok(NULL, stringOuterDelimiter); } diff --git a/src/Wlan.cpp b/src/Wlan.cpp index c12e373..063cd64 100644 --- a/src/Wlan.cpp +++ b/src/Wlan.cpp @@ -30,7 +30,7 @@ void Wlan_Init(void) { } void Wlan_Cyclic(void) { - // If wifi whould not be activated, return instantly + // If wifi would not be activated, return instantly if (!wifiEnabled) { return; } @@ -114,6 +114,10 @@ String Wlan_GetIpAddress(void) { return WiFi.localIP().toString(); } +int8_t Wlan_GetRssi(void) { + return WiFi.RSSI(); +} + // Initialize soft access-point void accessPointStart(const char *SSID, IPAddress ip, IPAddress netmask) { WiFi.mode(WIFI_AP); diff --git a/src/Wlan.h b/src/Wlan.h index 3ccdbcd..4fa2250 100644 --- a/src/Wlan.h +++ b/src/Wlan.h @@ -4,4 +4,5 @@ void Wlan_Init(void); void Wlan_Cyclic(void); bool Wlan_IsConnected(void); boolean Wlan_ToggleEnable(void); -String Wlan_GetIpAddress(void); \ No newline at end of file +String Wlan_GetIpAddress(void); +int8_t Wlan_GetRssi(void); \ No newline at end of file diff --git a/src/main.cpp b/src/main.cpp index b5992a6..9c3318e 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -185,7 +185,7 @@ void setup() Serial.println(F(" | |___ ___) | | __/ | |_| | | | | | | | | (_) |")); Serial.println(F(" |_____| |____/ |_| \\__,_| |_| |_| |_| \\___/ ")); Serial.println(F(" Rfid-controlled musicplayer\n")); - Serial.println(F(" Rev 20210707-1\n")); + Serial.println(F(" Rev 20210708-1\n")); // print wake-up reason printWakeUpReason(); @@ -231,6 +231,10 @@ void setup() Log_Println(Log_Buffer, LOGLEVEL_DEBUG); snprintf(Log_Buffer, Log_BufferLength, "Flash-size: %u bytes", ESP.getFlashChipSize()); Log_Println(Log_Buffer, LOGLEVEL_DEBUG); + if (Wlan_IsConnected()) { + snprintf(Log_Buffer, Log_BufferLength, "RSSI: %d dBm", Wlan_GetRssi()); + Log_Println(Log_Buffer, LOGLEVEL_DEBUG); + } System_ShowUpgradeWarning(); }