From d182817892297d0935fb8f6bad4e3d9734eab406 Mon Sep 17 00:00:00 2001 From: gemu2015 Date: Tue, 12 May 2020 14:19:10 +0200 Subject: [PATCH] add psram to info page ESP32 --- tasmota/language/bg_BG.h | 2 ++ tasmota/language/cs_CZ.h | 2 ++ tasmota/language/de_DE.h | 2 ++ tasmota/language/el_GR.h | 2 ++ tasmota/language/en_GB.h | 2 ++ tasmota/language/es_ES.h | 2 ++ tasmota/language/fr_FR.h | 2 ++ tasmota/language/he_HE.h | 2 ++ tasmota/language/hu_HU.h | 2 ++ tasmota/language/it_IT.h | 2 ++ tasmota/language/ko_KO.h | 2 ++ tasmota/language/nl_NL.h | 2 ++ tasmota/language/pl_PL.h | 2 ++ tasmota/language/pt_BR.h | 2 ++ tasmota/language/pt_PT.h | 2 ++ tasmota/language/ro_RO.h | 2 ++ tasmota/language/ru_RU.h | 2 ++ tasmota/language/sk_SK.h | 2 ++ tasmota/language/sv_SE.h | 2 ++ tasmota/language/tr_TR.h | 2 ++ tasmota/language/uk_UA.h | 2 ++ tasmota/language/zh_CN.h | 2 ++ tasmota/language/zh_TW.h | 2 ++ tasmota/xdrv_01_webserver.ino | 6 ++++++ 24 files changed, 52 insertions(+) diff --git a/tasmota/language/bg_BG.h b/tasmota/language/bg_BG.h index a27b150f9..03ae5bd6c 100644 --- a/tasmota/language/bg_BG.h +++ b/tasmota/language/bg_BG.h @@ -98,6 +98,8 @@ #define D_FILE "Файл" #define D_FLOW_RATE "Дебит" #define D_FREE_MEMORY "Свободна памет" +#define D_PSR_MAX_MEMORY "PS-RAM Memory" +#define D_PSR_FREE_MEMORY "PS-RAM free Memory" #define D_FREQUENCY "Честота" #define D_GAS "Газ" #define D_GATEWAY "Шлюз" diff --git a/tasmota/language/cs_CZ.h b/tasmota/language/cs_CZ.h index a048c890a..71a907a81 100644 --- a/tasmota/language/cs_CZ.h +++ b/tasmota/language/cs_CZ.h @@ -98,6 +98,8 @@ #define D_FILE "Soubor" #define D_FLOW_RATE "Flow rate" #define D_FREE_MEMORY "Volná paměť" +#define D_PSR_MAX_MEMORY "PS-RAM Memory" +#define D_PSR_FREE_MEMORY "PS-RAM free Memory" #define D_FREQUENCY "Kmitočet" #define D_GAS "Plyn" #define D_GATEWAY "Výchozí brána" diff --git a/tasmota/language/de_DE.h b/tasmota/language/de_DE.h index f1150405e..fdd1ec18d 100644 --- a/tasmota/language/de_DE.h +++ b/tasmota/language/de_DE.h @@ -98,6 +98,8 @@ #define D_FILE "Datei" #define D_FLOW_RATE "Durchflussmenge" #define D_FREE_MEMORY "Freier Arbeitsspeicher" +#define D_PSR_MAX_MEMORY "PS-RAM Speicher" +#define D_PSR_FREE_MEMORY "PS-RAM freier Speicher" #define D_FREQUENCY "Frequenz" #define D_GAS "Gas" #define D_GATEWAY "Gateway" diff --git a/tasmota/language/el_GR.h b/tasmota/language/el_GR.h index 4d9424b5d..ddd1d5b0b 100644 --- a/tasmota/language/el_GR.h +++ b/tasmota/language/el_GR.h @@ -98,6 +98,8 @@ #define D_FILE "Αρχείο" #define D_FLOW_RATE "Flow rate" #define D_FREE_MEMORY "Ελεύθερη μνήμη" +#define D_PSR_MAX_MEMORY "PS-RAM Memory" +#define D_PSR_FREE_MEMORY "PS-RAM free Memory" #define D_FREQUENCY "Συχνότητα" #define D_GAS "Αέριο" #define D_GATEWAY "Πύλη" diff --git a/tasmota/language/en_GB.h b/tasmota/language/en_GB.h index 072148a73..0396ca3e6 100644 --- a/tasmota/language/en_GB.h +++ b/tasmota/language/en_GB.h @@ -98,6 +98,8 @@ #define D_FILE "File" #define D_FLOW_RATE "Flow rate" #define D_FREE_MEMORY "Free Memory" +#define D_PSR_MAX_MEMORY "PS-RAM Memory" +#define D_PSR_FREE_MEMORY "PS-RAM free Memory" #define D_FREQUENCY "Frequency" #define D_GAS "Gas" #define D_GATEWAY "Gateway" diff --git a/tasmota/language/es_ES.h b/tasmota/language/es_ES.h index 2d82250ec..0602c3634 100644 --- a/tasmota/language/es_ES.h +++ b/tasmota/language/es_ES.h @@ -98,6 +98,8 @@ #define D_FILE "Archivo" #define D_FLOW_RATE "Caudal" #define D_FREE_MEMORY "Memoria Libre" +#define D_PSR_MAX_MEMORY "PS-RAM Memory" +#define D_PSR_FREE_MEMORY "PS-RAM free Memory" #define D_FREQUENCY "Frecuencia" #define D_GAS "Gas" #define D_GATEWAY "Gateway" diff --git a/tasmota/language/fr_FR.h b/tasmota/language/fr_FR.h index 342dcef80..c620572ca 100644 --- a/tasmota/language/fr_FR.h +++ b/tasmota/language/fr_FR.h @@ -98,6 +98,8 @@ #define D_FILE "Fichier" #define D_FLOW_RATE "Débit" #define D_FREE_MEMORY "Mémoire libre" +#define D_PSR_MAX_MEMORY "PS-RAM Memory" +#define D_PSR_FREE_MEMORY "PS-RAM free Memory" #define D_FREQUENCY "Fréquence" #define D_GAS "Gaz" #define D_GATEWAY "Passerelle" diff --git a/tasmota/language/he_HE.h b/tasmota/language/he_HE.h index 9402c722b..4802b529e 100644 --- a/tasmota/language/he_HE.h +++ b/tasmota/language/he_HE.h @@ -98,6 +98,8 @@ #define D_FILE "קובץ" #define D_FLOW_RATE "Flow rate" #define D_FREE_MEMORY "זכרון פנוי" +#define D_PSR_MAX_MEMORY "PS-RAM Memory" +#define D_PSR_FREE_MEMORY "PS-RAM free Memory" #define D_FREQUENCY "תדר" #define D_GAS "גז" #define D_GATEWAY "שער" diff --git a/tasmota/language/hu_HU.h b/tasmota/language/hu_HU.h index 9ef7d57c2..ee45ae083 100644 --- a/tasmota/language/hu_HU.h +++ b/tasmota/language/hu_HU.h @@ -98,6 +98,8 @@ #define D_FILE "Fájl" #define D_FLOW_RATE "Flow rate" #define D_FREE_MEMORY "Szabad memória" +#define D_PSR_MAX_MEMORY "PS-RAM Memory" +#define D_PSR_FREE_MEMORY "PS-RAM free Memory" #define D_FREQUENCY "Frekvencia" #define D_GAS "Gáz" #define D_GATEWAY "Átjáró" diff --git a/tasmota/language/it_IT.h b/tasmota/language/it_IT.h index c9710ef01..88acefc92 100644 --- a/tasmota/language/it_IT.h +++ b/tasmota/language/it_IT.h @@ -98,6 +98,8 @@ #define D_FILE "File" #define D_FLOW_RATE "Flusso dati" #define D_FREE_MEMORY "Memoria Libera" +#define D_PSR_MAX_MEMORY "PS-RAM Memory" +#define D_PSR_FREE_MEMORY "PS-RAM free Memory" #define D_FREQUENCY "Frequenza" #define D_GAS "Gas" #define D_GATEWAY "Gateway" diff --git a/tasmota/language/ko_KO.h b/tasmota/language/ko_KO.h index 18633f373..3e3bd17e0 100644 --- a/tasmota/language/ko_KO.h +++ b/tasmota/language/ko_KO.h @@ -98,6 +98,8 @@ #define D_FILE "파일" #define D_FLOW_RATE "Flow rate" #define D_FREE_MEMORY "남은 메모리" +#define D_PSR_MAX_MEMORY "PS-RAM Memory" +#define D_PSR_FREE_MEMORY "PS-RAM free Memory" #define D_FREQUENCY "Frequency" #define D_GAS "가스" #define D_GATEWAY "게이트웨이" diff --git a/tasmota/language/nl_NL.h b/tasmota/language/nl_NL.h index b0ae25e7b..49efcb622 100644 --- a/tasmota/language/nl_NL.h +++ b/tasmota/language/nl_NL.h @@ -98,6 +98,8 @@ #define D_FILE "Bestand" #define D_FLOW_RATE "Debiet" #define D_FREE_MEMORY "Vrij geheugen" +#define D_PSR_MAX_MEMORY "PS-RAM Memory" +#define D_PSR_FREE_MEMORY "PS-RAM free Memory" #define D_FREQUENCY "Frequentie" #define D_GAS "Gas" #define D_GATEWAY "Gateway" diff --git a/tasmota/language/pl_PL.h b/tasmota/language/pl_PL.h index 2c6e38e7c..d9d05fbeb 100644 --- a/tasmota/language/pl_PL.h +++ b/tasmota/language/pl_PL.h @@ -98,6 +98,8 @@ #define D_FILE "Plik" #define D_FLOW_RATE "Przepływ" #define D_FREE_MEMORY "Wolna pamięć" +#define D_PSR_MAX_MEMORY "PS-RAM Memory" +#define D_PSR_FREE_MEMORY "PS-RAM free Memory" #define D_FREQUENCY "Częstotliwość" #define D_GAS "Gas" #define D_GATEWAY "Brama" diff --git a/tasmota/language/pt_BR.h b/tasmota/language/pt_BR.h index d1e51a077..4fb48c04d 100644 --- a/tasmota/language/pt_BR.h +++ b/tasmota/language/pt_BR.h @@ -98,6 +98,8 @@ #define D_FILE "Arquivo" #define D_FLOW_RATE "Quociente de vazão" #define D_FREE_MEMORY "Memória livre" +#define D_PSR_MAX_MEMORY "PS-RAM Memory" +#define D_PSR_FREE_MEMORY "PS-RAM free Memory" #define D_FREQUENCY "Frequência" #define D_GAS "Gás" #define D_GATEWAY "Gateway" diff --git a/tasmota/language/pt_PT.h b/tasmota/language/pt_PT.h index 1227a738a..232b7494d 100644 --- a/tasmota/language/pt_PT.h +++ b/tasmota/language/pt_PT.h @@ -98,6 +98,8 @@ #define D_FILE "Ficheiro" #define D_FLOW_RATE "Taxa de Fluxo" #define D_FREE_MEMORY "Memoria Livre" +#define D_PSR_MAX_MEMORY "PS-RAM Memory" +#define D_PSR_FREE_MEMORY "PS-RAM free Memory" #define D_FREQUENCY "Frequência" #define D_GAS "Gás" #define D_GATEWAY "Gateway" diff --git a/tasmota/language/ro_RO.h b/tasmota/language/ro_RO.h index 616e1d9b1..79c66d779 100644 --- a/tasmota/language/ro_RO.h +++ b/tasmota/language/ro_RO.h @@ -98,6 +98,8 @@ #define D_FILE "Fișier" #define D_FLOW_RATE "Debit" #define D_FREE_MEMORY "Memorie Liberă" +#define D_PSR_MAX_MEMORY "PS-RAM Memory" +#define D_PSR_FREE_MEMORY "PS-RAM free Memory" #define D_FREQUENCY "Frecvență" #define D_GAS "Gaz" #define D_GATEWAY "Gateway" diff --git a/tasmota/language/ru_RU.h b/tasmota/language/ru_RU.h index 7a46a56db..b7d8adcb6 100644 --- a/tasmota/language/ru_RU.h +++ b/tasmota/language/ru_RU.h @@ -98,6 +98,8 @@ #define D_FILE "Файл" #define D_FLOW_RATE "Flow rate" #define D_FREE_MEMORY "Свободная память" +#define D_PSR_MAX_MEMORY "PS-RAM Memory" +#define D_PSR_FREE_MEMORY "PS-RAM free Memory" #define D_FREQUENCY "Frequency" #define D_GAS "Газ" #define D_GATEWAY "Шлюз" diff --git a/tasmota/language/sk_SK.h b/tasmota/language/sk_SK.h index 3bd5e2ff8..9db574bf8 100644 --- a/tasmota/language/sk_SK.h +++ b/tasmota/language/sk_SK.h @@ -98,6 +98,8 @@ #define D_FALSE "Nepravda" #define D_FILE "Súbor" #define D_FREE_MEMORY "Voľná pamäť" +#define D_PSR_MAX_MEMORY "PS-RAM Memory" +#define D_PSR_FREE_MEMORY "PS-RAM free Memory" #define D_FREQUENCY "Frekvencia" #define D_GAS "Plyn" #define D_GATEWAY "Predvolená brána" diff --git a/tasmota/language/sv_SE.h b/tasmota/language/sv_SE.h index d5ad82e6f..da8355215 100644 --- a/tasmota/language/sv_SE.h +++ b/tasmota/language/sv_SE.h @@ -98,6 +98,8 @@ #define D_FILE "Fil" #define D_FLOW_RATE "Flow rate" #define D_FREE_MEMORY "Ledigt minne" +#define D_PSR_MAX_MEMORY "PS-RAM Memory" +#define D_PSR_FREE_MEMORY "PS-RAM free Memory" #define D_FREQUENCY "Frekvens" #define D_GAS "Gas" #define D_GATEWAY "Gateway" diff --git a/tasmota/language/tr_TR.h b/tasmota/language/tr_TR.h index abbc68dbf..9b205954b 100644 --- a/tasmota/language/tr_TR.h +++ b/tasmota/language/tr_TR.h @@ -98,6 +98,8 @@ #define D_FILE "Dosya" #define D_FLOW_RATE "Flow rate" #define D_FREE_MEMORY "Boş Hafıza" +#define D_PSR_MAX_MEMORY "PS-RAM Memory" +#define D_PSR_FREE_MEMORY "PS-RAM free Memory" #define D_FREQUENCY "Frekans" #define D_GAS "Gas" #define D_GATEWAY "Geçit" diff --git a/tasmota/language/uk_UA.h b/tasmota/language/uk_UA.h index 915925d1d..8c566eac3 100644 --- a/tasmota/language/uk_UA.h +++ b/tasmota/language/uk_UA.h @@ -98,6 +98,8 @@ #define D_FILE "Файл" #define D_FLOW_RATE "Потік" #define D_FREE_MEMORY "Вільна память" +#define D_PSR_MAX_MEMORY "PS-RAM Memory" +#define D_PSR_FREE_MEMORY "PS-RAM free Memory" #define D_FREQUENCY "Частота" #define D_GAS "Газ" #define D_GATEWAY "Шлюз" diff --git a/tasmota/language/zh_CN.h b/tasmota/language/zh_CN.h index 5e76e6069..143e49aec 100644 --- a/tasmota/language/zh_CN.h +++ b/tasmota/language/zh_CN.h @@ -98,6 +98,8 @@ #define D_FILE "文件:" #define D_FLOW_RATE "Flow rate" #define D_FREE_MEMORY "空闲内存" +#define D_PSR_MAX_MEMORY "PS-RAM Memory" +#define D_PSR_FREE_MEMORY "PS-RAM free Memory" #define D_FREQUENCY "频率" #define D_GAS "气体" #define D_GATEWAY "网关" diff --git a/tasmota/language/zh_TW.h b/tasmota/language/zh_TW.h index e04296c5a..5c96ec688 100644 --- a/tasmota/language/zh_TW.h +++ b/tasmota/language/zh_TW.h @@ -98,6 +98,8 @@ #define D_FILE "文件:" #define D_FLOW_RATE "Flow rate" #define D_FREE_MEMORY "可用記憶體" +#define D_PSR_MAX_MEMORY "PS-RAM Memory" +#define D_PSR_FREE_MEMORY "PS-RAM free Memory" #define D_FREQUENCY "Frequency" #define D_GAS "氣體" #define D_GATEWAY "網關" diff --git a/tasmota/xdrv_01_webserver.ino b/tasmota/xdrv_01_webserver.ino index e7a94893d..75f309569 100644 --- a/tasmota/xdrv_01_webserver.ino +++ b/tasmota/xdrv_01_webserver.ino @@ -2284,6 +2284,12 @@ void HandleInformation(void) WSContentSend_P(PSTR("}1" D_PROGRAM_SIZE "}2%dkB"), ESP_getSketchSize() / 1024); WSContentSend_P(PSTR("}1" D_FREE_PROGRAM_SPACE "}2%dkB"), ESP.getFreeSketchSpace() / 1024); WSContentSend_P(PSTR("}1" D_FREE_MEMORY "}2%dkB"), freeMem / 1024); +#ifdef ESP32 + if (psramFound()) { + WSContentSend_P(PSTR("}1" D_PSR_MAX_MEMORY "}2%dkB"), ESP.getPsramSize() / 1024); + WSContentSend_P(PSTR("}1" D_PSR_FREE_MEMORY "}2%dkB"), ESP.getFreePsram() / 1024); + } +#endif WSContentSend_P(PSTR("")); WSContentSend_P(HTTP_SCRIPT_INFO_END);