From 5280a8914f02d4f72857a888f487bc34eac7b815 Mon Sep 17 00:00:00 2001 From: Dmitry Borisenko <49808844+DmitryBorisenko33@users.noreply.github.com> Date: Sat, 19 Dec 2020 13:51:53 +0100 Subject: [PATCH] some --- src/FileSystem.cpp | 7 ++----- src/Utils/WiFiUtils.cpp | 2 ++ 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/FileSystem.cpp b/src/FileSystem.cpp index d33c8857..9504cd2e 100644 --- a/src/FileSystem.cpp +++ b/src/FileSystem.cpp @@ -1,10 +1,7 @@ #include "FileSystem.h" #include "Global.h" - +// Информация о ФС void getFSInfo() { - // Информация о ФС - - FSInfo buf; if (getInfo(buf)) { SerialPrint("I", F("FS"), F("Get FS info completed")); @@ -17,7 +14,7 @@ void getFSInfo() { size_t freeBytes = totalBytes - usedBytes; float freePer = ((float) freeBytes / totalBytes) * 100; - jsonWriteStr(configSetupJson, F("freeBytes"), String(freePer) + "% (" + String(freeBytes) + ")"); + jsonWriteStr(configSetupJson, F("freeBytes"), String(freePer) + "% (" + prettyBytes(freeBytes) + ")"); SerialPrint("I", F("FS"), "totalBytes=" + String(totalBytes)); SerialPrint("I", F("FS"), "usedBytes=" + String(usedBytes)); diff --git a/src/Utils/WiFiUtils.cpp b/src/Utils/WiFiUtils.cpp index a8326df2..8a948ee7 100644 --- a/src/Utils/WiFiUtils.cpp +++ b/src/Utils/WiFiUtils.cpp @@ -1,4 +1,5 @@ #include "Utils/WiFiUtils.h" +#include "FileSystem.h" void routerConnect() { @@ -145,6 +146,7 @@ void wifiSignalInit() { ts.add( SYGNAL, 1000 * 60, [&](void*) { SerialPrint("I", "System", printMemoryStatus()); + getFSInfo(); switch (RSSIquality()) { case 0: jsonWriteStr(configSetupJson, F("signal"), F("Уровень WiFi сигнала: не подключено к роутеру"));