From da5396a080bf46a182704ca5a101addf5d2cfedb Mon Sep 17 00:00:00 2001 From: Theo Arends <11044339+arendst@users.noreply.github.com> Date: Sun, 7 May 2023 17:25:18 +0200 Subject: [PATCH] Add filesystem size to esp8266 GUI --- tasmota/language/af_AF.h | 1 + tasmota/language/bg_BG.h | 1 + tasmota/language/ca_AD.h | 1 + tasmota/language/cs_CZ.h | 1 + tasmota/language/de_DE.h | 1 + tasmota/language/el_GR.h | 1 + tasmota/language/en_GB.h | 1 + tasmota/language/es_ES.h | 1 + tasmota/language/fr_FR.h | 1 + tasmota/language/fy_NL.h | 1 + tasmota/language/he_HE.h | 1 + tasmota/language/hu_HU.h | 1 + tasmota/language/it_IT.h | 1 + tasmota/language/ko_KO.h | 1 + tasmota/language/nl_NL.h | 1 + tasmota/language/pl_PL.h | 1 + tasmota/language/pt_BR.h | 1 + tasmota/language/pt_PT.h | 1 + tasmota/language/ro_RO.h | 1 + tasmota/language/ru_RU.h | 1 + tasmota/language/sk_SK.h | 1 + tasmota/language/sv_SE.h | 1 + tasmota/language/tr_TR.h | 1 + tasmota/language/uk_UA.h | 1 + tasmota/language/vi_VN.h | 1 + tasmota/language/zh_CN.h | 1 + tasmota/language/zh_TW.h | 1 + tasmota/tasmota_xdrv_driver/xdrv_01_9_webserver.ino | 8 ++++++-- tasmota/tasmota_xdrv_driver/xdrv_50_filesystem.ino | 8 ++++++++ 29 files changed, 41 insertions(+), 2 deletions(-) diff --git a/tasmota/language/af_AF.h b/tasmota/language/af_AF.h index f63671846..f3df5343f 100644 --- a/tasmota/language/af_AF.h +++ b/tasmota/language/af_AF.h @@ -104,6 +104,7 @@ #define D_FALLBACK_TOPIC "Terugval onderwerp" #define D_FALSE "Onwaar" #define D_FILE "Lêer" +#define D_FILE_SYSTEM_SIZE "File System Size" #define D_FLOW_RATE "Vloeitempo" #define D_FRAGMENTATION "frag." // Lower case abbreviated version of fragmentation used in "memory fragmentation" #define D_FRAME_RATE "Frame rate" diff --git a/tasmota/language/bg_BG.h b/tasmota/language/bg_BG.h index 672d88b93..880777669 100644 --- a/tasmota/language/bg_BG.h +++ b/tasmota/language/bg_BG.h @@ -104,6 +104,7 @@ #define D_FALLBACK_TOPIC "Резервна тема" #define D_FALSE "Невярно" #define D_FILE "Файл" +#define D_FILE_SYSTEM_SIZE "File System Size" #define D_FLOW_RATE "Дебит" #define D_FRAGMENTATION "фраг." // Lower case abbreviated version of fragmentation used in "memory fragmentation" #define D_FRAME_RATE "Кадъра в секунда" diff --git a/tasmota/language/ca_AD.h b/tasmota/language/ca_AD.h index 277902023..ef786b868 100644 --- a/tasmota/language/ca_AD.h +++ b/tasmota/language/ca_AD.h @@ -104,6 +104,7 @@ #define D_FALLBACK_TOPIC "Tema de recuperació" #define D_FALSE "Fals" #define D_FILE "Arxiu" +#define D_FILE_SYSTEM_SIZE "File System Size" #define D_FLOW_RATE "Cabal" #define D_FRAGMENTATION "frag." // Lower case abbreviated version of fragmentation used in "memory fragmentation" #define D_FRAME_RATE "Frame rate" diff --git a/tasmota/language/cs_CZ.h b/tasmota/language/cs_CZ.h index e42c875de..863ab0786 100644 --- a/tasmota/language/cs_CZ.h +++ b/tasmota/language/cs_CZ.h @@ -104,6 +104,7 @@ #define D_FALLBACK_TOPIC "Záložní topic" #define D_FALSE "Nepravda" #define D_FILE "Soubor" +#define D_FILE_SYSTEM_SIZE "File System Size" #define D_FLOW_RATE "Flow rate" #define D_FRAGMENTATION "frag." // Lower case abbreviated version of fragmentation used in "memory fragmentation" #define D_FRAME_RATE "Frame rate" diff --git a/tasmota/language/de_DE.h b/tasmota/language/de_DE.h index 408408245..a43e36587 100644 --- a/tasmota/language/de_DE.h +++ b/tasmota/language/de_DE.h @@ -104,6 +104,7 @@ #define D_FALLBACK_TOPIC "Fallback-Topic" #define D_FALSE "falsch" #define D_FILE "Datei" +#define D_FILE_SYSTEM_SIZE "File System Size" #define D_FLOW_RATE "Durchflussmenge" #define D_FRAGMENTATION "frag." // Lower case abbreviated version of fragmentation used in "memory fragmentation" #define D_FRAME_RATE "Frame rate" diff --git a/tasmota/language/el_GR.h b/tasmota/language/el_GR.h index a359d49dd..d25e8c307 100644 --- a/tasmota/language/el_GR.h +++ b/tasmota/language/el_GR.h @@ -104,6 +104,7 @@ #define D_FALLBACK_TOPIC "Fallback Topic" #define D_FALSE "Ψευδές" #define D_FILE "Αρχείο" +#define D_FILE_SYSTEM_SIZE "File System Size" #define D_FLOW_RATE "Flow rate" #define D_FRAGMENTATION "frag." // Lower case abbreviated version of fragmentation used in "memory fragmentation" #define D_FRAME_RATE "Frame rate" diff --git a/tasmota/language/en_GB.h b/tasmota/language/en_GB.h index b746c0634..416fc3c03 100644 --- a/tasmota/language/en_GB.h +++ b/tasmota/language/en_GB.h @@ -104,6 +104,7 @@ #define D_FALLBACK_TOPIC "Fallback Topic" #define D_FALSE "False" #define D_FILE "File" +#define D_FILE_SYSTEM_SIZE "File System Size" #define D_FLOW_RATE "Flow rate" #define D_FRAGMENTATION "frag." // Lower case abbreviated version of fragmentation used in "memory fragmentation" #define D_FRAME_RATE "Frame rate" diff --git a/tasmota/language/es_ES.h b/tasmota/language/es_ES.h index 26dd59688..1e8632008 100644 --- a/tasmota/language/es_ES.h +++ b/tasmota/language/es_ES.h @@ -104,6 +104,7 @@ #define D_FALLBACK_TOPIC "FallbackTopic" #define D_FALSE "Falso" #define D_FILE "Archivo" +#define D_FILE_SYSTEM_SIZE "File System Size" #define D_FLOW_RATE "Caudal" #define D_FRAGMENTATION "frag." // Lower case abbreviated version of fragmentation used in "memory fragmentation" #define D_FRAME_RATE "Frame rate" diff --git a/tasmota/language/fr_FR.h b/tasmota/language/fr_FR.h index ae600b589..0f62d1571 100644 --- a/tasmota/language/fr_FR.h +++ b/tasmota/language/fr_FR.h @@ -104,6 +104,7 @@ #define D_FALLBACK_TOPIC "Topic de secours" #define D_FALSE "Faux" #define D_FILE "Fichier" +#define D_FILE_SYSTEM_SIZE "File System Size" #define D_FLOW_RATE "Débit" #define D_FRAGMENTATION "frag." // Lower case abbreviated version of fragmentation used in "memory fragmentation" #define D_FRAME_RATE "Fréq. image" diff --git a/tasmota/language/fy_NL.h b/tasmota/language/fy_NL.h index 0ef74fdb6..7c3955dac 100644 --- a/tasmota/language/fy_NL.h +++ b/tasmota/language/fy_NL.h @@ -104,6 +104,7 @@ #define D_FALLBACK_TOPIC "Fallback Underwerp" #define D_FALSE "Falsk" #define D_FILE "Bestân" +#define D_FILE_SYSTEM_SIZE "File System Size" #define D_FLOW_RATE "Stromingssnelheid" #define D_FRAGMENTATION "frag." // Lower case abbreviated version of fragmentation used in "memory fragmentation" #define D_FRAME_RATE "Frame rate" diff --git a/tasmota/language/he_HE.h b/tasmota/language/he_HE.h index c1d13b7bc..39daf879e 100644 --- a/tasmota/language/he_HE.h +++ b/tasmota/language/he_HE.h @@ -104,6 +104,7 @@ #define D_FALLBACK_TOPIC "נושא לחזרה" #define D_FALSE "שגוי" #define D_FILE "קובץ" +#define D_FILE_SYSTEM_SIZE "File System Size" #define D_FLOW_RATE "Flow rate" #define D_FRAGMENTATION "frag." // Lower case abbreviated version of fragmentation used in "memory fragmentation" #define D_FRAME_RATE "Frame rate" diff --git a/tasmota/language/hu_HU.h b/tasmota/language/hu_HU.h index 71540307b..bb0e6b211 100644 --- a/tasmota/language/hu_HU.h +++ b/tasmota/language/hu_HU.h @@ -104,6 +104,7 @@ #define D_FALLBACK_TOPIC "fallback topik" #define D_FALSE "Hamis" #define D_FILE "Fájl" +#define D_FILE_SYSTEM_SIZE "File System Size" #define D_FLOW_RATE "Átfolyás ráta" #define D_FRAGMENTATION "frag." // Lower case abbreviated version of fragmentation used in "memory fragmentation" #define D_FRAME_RATE "Frame rate" diff --git a/tasmota/language/it_IT.h b/tasmota/language/it_IT.h index 2690363bb..a5378c52a 100644 --- a/tasmota/language/it_IT.h +++ b/tasmota/language/it_IT.h @@ -104,6 +104,7 @@ #define D_FALLBACK_TOPIC "Topic Riserva" #define D_FALSE "Falso" #define D_FILE "File" +#define D_FILE_SYSTEM_SIZE "File System Size" #define D_FLOW_RATE "Flusso dati" #define D_FRAGMENTATION "framm." // Lower case abbreviated version of fragmentation used in "memory fragmentation" #define D_FRAME_RATE "Frequenza fotogrammi" diff --git a/tasmota/language/ko_KO.h b/tasmota/language/ko_KO.h index 4f941a3b8..c5db16e45 100644 --- a/tasmota/language/ko_KO.h +++ b/tasmota/language/ko_KO.h @@ -104,6 +104,7 @@ #define D_FALLBACK_TOPIC "Fallback Topic" #define D_FALSE "거짓" #define D_FILE "파일" +#define D_FILE_SYSTEM_SIZE "File System Size" #define D_FLOW_RATE "Flow rate" #define D_FRAGMENTATION "frag." // Lower case abbreviated version of fragmentation used in "memory fragmentation" #define D_FRAME_RATE "Frame rate" diff --git a/tasmota/language/nl_NL.h b/tasmota/language/nl_NL.h index 05f85db2b..4ab10ce0e 100644 --- a/tasmota/language/nl_NL.h +++ b/tasmota/language/nl_NL.h @@ -104,6 +104,7 @@ #define D_FALLBACK_TOPIC "Fallback Topic" #define D_FALSE "Onwaar" #define D_FILE "Bestand" +#define D_FILE_SYSTEM_SIZE "File System Size" #define D_FLOW_RATE "Debiet" #define D_FRAGMENTATION "frag." // Lower case abbreviated version of fragmentation used in "memory fragmentation" #define D_FRAME_RATE "Frame rate" diff --git a/tasmota/language/pl_PL.h b/tasmota/language/pl_PL.h index 4444de792..db8330800 100644 --- a/tasmota/language/pl_PL.h +++ b/tasmota/language/pl_PL.h @@ -104,6 +104,7 @@ #define D_FALLBACK_TOPIC "Temat zastępczy" #define D_FALSE "Fałsz" #define D_FILE "Plik" +#define D_FILE_SYSTEM_SIZE "File System Size" #define D_FLOW_RATE "Przepływ" #define D_FRAGMENTATION "frag." // Lower case abbreviated version of fragmentation used in "memory fragmentation" #define D_FRAME_RATE "Frame rate" diff --git a/tasmota/language/pt_BR.h b/tasmota/language/pt_BR.h index ea04901c7..b4b32eeb1 100644 --- a/tasmota/language/pt_BR.h +++ b/tasmota/language/pt_BR.h @@ -104,6 +104,7 @@ #define D_FALLBACK_TOPIC "Tópico para retornar" #define D_FALSE "Falso" #define D_FILE "Arquivo" +#define D_FILE_SYSTEM_SIZE "File System Size" #define D_FLOW_RATE "Quociente de vazão" #define D_FRAGMENTATION "frag." // Lower case abbreviated version of fragmentation used in "memory fragmentation" #define D_FRAME_RATE "Frame rate" diff --git a/tasmota/language/pt_PT.h b/tasmota/language/pt_PT.h index 3377d7d72..8d22afd35 100644 --- a/tasmota/language/pt_PT.h +++ b/tasmota/language/pt_PT.h @@ -104,6 +104,7 @@ #define D_FALLBACK_TOPIC "Tópico de contingência" #define D_FALSE "Falso" #define D_FILE "Ficheiro" +#define D_FILE_SYSTEM_SIZE "File System Size" #define D_FLOW_RATE "Taxa de Fluxo" #define D_FRAGMENTATION "frag." // Lower case abbreviated version of fragmentation used in "memory fragmentation" #define D_FRAME_RATE "Frame rate" diff --git a/tasmota/language/ro_RO.h b/tasmota/language/ro_RO.h index c97bc649a..ddb93ccc6 100644 --- a/tasmota/language/ro_RO.h +++ b/tasmota/language/ro_RO.h @@ -104,6 +104,7 @@ #define D_FALLBACK_TOPIC "Listă de rezervă" #define D_FALSE "Fals" #define D_FILE "Fișier" +#define D_FILE_SYSTEM_SIZE "File System Size" #define D_FLOW_RATE "Debit" #define D_FRAGMENTATION "frag." // Lower case abbreviated version of fragmentation used in "memory fragmentation" #define D_FRAME_RATE "Frame rate" diff --git a/tasmota/language/ru_RU.h b/tasmota/language/ru_RU.h index 6e9bbe95d..655778364 100644 --- a/tasmota/language/ru_RU.h +++ b/tasmota/language/ru_RU.h @@ -104,6 +104,7 @@ #define D_FALLBACK_TOPIC "Топик обратной связи" #define D_FALSE "Ложно" #define D_FILE "Файл" +#define D_FILE_SYSTEM_SIZE "File System Size" #define D_FLOW_RATE "Flow rate" #define D_FRAGMENTATION "frag." // Lower case abbreviated version of fragmentation used in "memory fragmentation" #define D_FRAME_RATE "Frame rate" diff --git a/tasmota/language/sk_SK.h b/tasmota/language/sk_SK.h index 679abff2e..bcb03e92d 100644 --- a/tasmota/language/sk_SK.h +++ b/tasmota/language/sk_SK.h @@ -80,6 +80,7 @@ #define D_CURRENT "Prúd" // As in Voltage and Current #define D_CURRENT_NEUTRAL "Current Neutral" #define D_DATA "Dáta" +#define D_FILE_SYSTEM_SIZE "File System Size" #define D_FLOW_RATE "Flow rate" #define D_DARKLIGHT "Tmavý" #define D_DEBUG "Debug" diff --git a/tasmota/language/sv_SE.h b/tasmota/language/sv_SE.h index 0c3c896fe..7555763c0 100644 --- a/tasmota/language/sv_SE.h +++ b/tasmota/language/sv_SE.h @@ -104,6 +104,7 @@ #define D_FALLBACK_TOPIC "Reservämne" #define D_FALSE "Falskt" #define D_FILE "Fil" +#define D_FILE_SYSTEM_SIZE "File System Size" #define D_FLOW_RATE "Flow rate" #define D_FRAGMENTATION "frag." // Lower case abbreviated version of fragmentation used in "memory fragmentation" #define D_FRAME_RATE "Frame rate" diff --git a/tasmota/language/tr_TR.h b/tasmota/language/tr_TR.h index bc62a9ff5..36b763a07 100644 --- a/tasmota/language/tr_TR.h +++ b/tasmota/language/tr_TR.h @@ -104,6 +104,7 @@ #define D_FALLBACK_TOPIC "Geri İletim Topiği" #define D_FALSE "False" #define D_FILE "Dosya" +#define D_FILE_SYSTEM_SIZE "File System Size" #define D_FLOW_RATE "Flow rate" #define D_FRAGMENTATION "frag." // Lower case abbreviated version of fragmentation used in "memory fragmentation" #define D_FRAME_RATE "Frame rate" diff --git a/tasmota/language/uk_UA.h b/tasmota/language/uk_UA.h index d0664f542..0023f5c34 100644 --- a/tasmota/language/uk_UA.h +++ b/tasmota/language/uk_UA.h @@ -104,6 +104,7 @@ #define D_FALLBACK_TOPIC "Запасний топік" #define D_FALSE "Ні" #define D_FILE "Файл" +#define D_FILE_SYSTEM_SIZE "File System Size" #define D_FLOW_RATE "Потік" #define D_FRAGMENTATION "frag." // Lower case abbreviated version of fragmentation used in "memory fragmentation" #define D_FRAME_RATE "Frame rate" diff --git a/tasmota/language/vi_VN.h b/tasmota/language/vi_VN.h index 74e8398a2..11f293b03 100644 --- a/tasmota/language/vi_VN.h +++ b/tasmota/language/vi_VN.h @@ -104,6 +104,7 @@ #define D_FALLBACK_TOPIC "Fallback Topic" #define D_FALSE "Sai" #define D_FILE "Tệp" +#define D_FILE_SYSTEM_SIZE "File System Size" #define D_FLOW_RATE "Tốc độ dòng" #define D_FRAGMENTATION "frag." // Lower case abbreviated version of fragmentation used in "memory fragmentation" #define D_FRAME_RATE "Frame rate" diff --git a/tasmota/language/zh_CN.h b/tasmota/language/zh_CN.h index b4fa7c00e..ea316b48d 100644 --- a/tasmota/language/zh_CN.h +++ b/tasmota/language/zh_CN.h @@ -104,6 +104,7 @@ #define D_FALLBACK_TOPIC "回退主题" #define D_FALSE "False" #define D_FILE "文件:" +#define D_FILE_SYSTEM_SIZE "File System Size" #define D_FLOW_RATE "Flow rate" #define D_FRAGMENTATION "frag." // Lower case abbreviated version of fragmentation used in "memory fragmentation" #define D_FRAME_RATE "Frame rate" diff --git a/tasmota/language/zh_TW.h b/tasmota/language/zh_TW.h index a5611d532..62b656086 100644 --- a/tasmota/language/zh_TW.h +++ b/tasmota/language/zh_TW.h @@ -104,6 +104,7 @@ #define D_FALLBACK_TOPIC "Fallback Topic" #define D_FALSE "假" #define D_FILE "檔案:" +#define D_FILE_SYSTEM_SIZE "File System Size" #define D_FLOW_RATE "流量" #define D_FRAGMENTATION "frag." // Lower case abbreviated version of fragmentation used in "memory fragmentation" #define D_FRAME_RATE "Frame rate" diff --git a/tasmota/tasmota_xdrv_driver/xdrv_01_9_webserver.ino b/tasmota/tasmota_xdrv_driver/xdrv_01_9_webserver.ino index 7c8300cb7..01de3fe42 100644 --- a/tasmota/tasmota_xdrv_driver/xdrv_01_9_webserver.ino +++ b/tasmota/tasmota_xdrv_driver/xdrv_01_9_webserver.ino @@ -2508,9 +2508,13 @@ void HandleInformation(void) } } esp_partition_iterator_release(it); -#else // ESP32 +#else // not ESP32 WSContentSend_PD(PSTR("}1" D_FREE_MEMORY "}2%1_f KB"), &freemem); -#endif // ESP32 +#ifdef USE_UFILESYS + WSContentSend_P(PSTR("}1}2 ")); // Empty line + WSContentSend_P(PSTR("}1" D_FILE_SYSTEM_SIZE "}2%d KB"), UfsSize()); +#endif // USE_UFILESYS +#endif // ESP32 WSContentSend_P(PSTR("")); WSContentSend_P(HTTP_SCRIPT_INFO_END); diff --git a/tasmota/tasmota_xdrv_driver/xdrv_50_filesystem.ino b/tasmota/tasmota_xdrv_driver/xdrv_50_filesystem.ino index dce7fdee1..e61a22535 100644 --- a/tasmota/tasmota_xdrv_driver/xdrv_50_filesystem.ino +++ b/tasmota/tasmota_xdrv_driver/xdrv_50_filesystem.ino @@ -267,6 +267,14 @@ uint32_t UfsInfo(uint32_t sel, uint32_t type) { return result / 1024; } +uint32_t UfsSize(void) { + return UfsInfo(0, ufs_dir == 2 ? 1:0); +} + +uint32_t UfsFree(void) { + return UfsInfo(1, ufs_dir == 2 ? 1:0); +} + #if USE_LONG_FILE_NAMES>0 #undef REJCMPL #define REJCMPL 6