From 945ef2f1b0f2e8118ad1ec32f89a9ece0013df8f Mon Sep 17 00:00:00 2001 From: MichaelDvP Date: Sat, 24 Dec 2022 12:06:27 +0100 Subject: [PATCH] rename setting to "max buffer size", show used buffer in info --- interface/src/i18n/de/index.ts | 3 +-- interface/src/i18n/en/index.ts | 2 +- interface/src/i18n/fr/index.ts | 2 +- interface/src/i18n/nl/index.ts | 2 +- interface/src/i18n/no/index.ts | 2 +- interface/src/i18n/pl/index.ts | 2 +- interface/src/i18n/se/index.ts | 2 +- src/system.cpp | 23 ++++++++++++----------- src/web/WebLogService.cpp | 4 ++++ src/web/WebLogService.h | 1 + 10 files changed, 24 insertions(+), 19 deletions(-) diff --git a/interface/src/i18n/de/index.ts b/interface/src/i18n/de/index.ts index 6095ccea3..babf748e9 100644 --- a/interface/src/i18n/de/index.ts +++ b/interface/src/i18n/de/index.ts @@ -3,7 +3,6 @@ import type { Translation } from '../i18n-types'; /* eslint-disable */ const de: Translation = { -// ...en as Translation, LANGUAGE: 'Sprache', RETRY: 'Neuer Versuch', LOADING: 'Laden', @@ -205,7 +204,7 @@ const de: Translation = { FLASH: 'Flash Speicher (Größe / Geschwindigkeit)', APPSIZE: 'Programm (Genutzt / Frei)', FILESYSTEM: 'Dateisystem (Genutzt / Frei)', - BUFFER_SIZE: 'Puffergröße', + BUFFER_SIZE: 'max. Puffergröße', COMPACT: 'Kompakte Darstellung', ENABLE_OTA: 'OTA Updates verwenden', DOWNLOAD_CUSTOMIZATION_TEXT: 'Herunterladen der individuellen Entitätsanpassungen', diff --git a/interface/src/i18n/en/index.ts b/interface/src/i18n/en/index.ts index d28902ca1..421815f82 100644 --- a/interface/src/i18n/en/index.ts +++ b/interface/src/i18n/en/index.ts @@ -204,7 +204,7 @@ const en: Translation = { FLASH: 'Flash Chip (Size / Speed)', APPSIZE: 'Application (Used / Free)', FILESYSTEM: 'File System (Used / Free)', - BUFFER_SIZE: 'Buffer Size', + BUFFER_SIZE: 'Max Buffer Size', COMPACT: 'Compact', ENABLE_OTA: 'Enable OTA Updates', DOWNLOAD_CUSTOMIZATION_TEXT: 'Download the entity customizations', diff --git a/interface/src/i18n/fr/index.ts b/interface/src/i18n/fr/index.ts index 9954e43a9..0ab81a625 100644 --- a/interface/src/i18n/fr/index.ts +++ b/interface/src/i18n/fr/index.ts @@ -204,7 +204,7 @@ const fr: Translation = { FLASH: 'Flash Chip (Taille / Vitesse)', APPSIZE: 'Application (Utilisée / Libre)', FILESYSTEM: 'File System (Utilisée / Libre)', - BUFFER_SIZE: 'Taille du buffer', + BUFFER_SIZE: 'Max taille du buffer', COMPACT: 'Compact', ENABLE_OTA: 'Activer les updates OTA', DOWNLOAD_CUSTOMIZATION_TEXT: 'Télécharger les personnalisations d\'entités', diff --git a/interface/src/i18n/nl/index.ts b/interface/src/i18n/nl/index.ts index c75472a9d..d3c992a11 100644 --- a/interface/src/i18n/nl/index.ts +++ b/interface/src/i18n/nl/index.ts @@ -204,7 +204,7 @@ const nl: Translation = { FLASH: 'Flash Chip (Size / Speed)', APPSIZE: 'Application (Used / Free)', FILESYSTEM: 'File System (Used / Free)', - BUFFER_SIZE: 'Buffer Size', + BUFFER_SIZE: 'Max Buffer Size', COMPACT: 'Compact', ENABLE_OTA: 'Acitveer OTA Updates', DOWNLOAD_CUSTOMIZATION_TEXT: 'Download alle custom instellingen', diff --git a/interface/src/i18n/no/index.ts b/interface/src/i18n/no/index.ts index 796b6ee0d..4151a3128 100644 --- a/interface/src/i18n/no/index.ts +++ b/interface/src/i18n/no/index.ts @@ -204,7 +204,7 @@ const no: Translation = { FLASH: 'Flash Chip (Størrelse / Hastighet)', APPSIZE: 'Applikasjon (Brukt / Ledig)', FILESYSTEM: 'File System (Brukt / Ledig)', - BUFFER_SIZE: 'Buffer Størrelse', + BUFFER_SIZE: 'Max Buffer Størrelse', COMPACT: 'Komprimere', ENABLE_OTA: 'Aktiviser OTA oppdateringer', DOWNLOAD_CUSTOMIZATION_TEXT: 'Last ned objektstilpasninger', diff --git a/interface/src/i18n/pl/index.ts b/interface/src/i18n/pl/index.ts index 4f7151273..201148f86 100644 --- a/interface/src/i18n/pl/index.ts +++ b/interface/src/i18n/pl/index.ts @@ -204,7 +204,7 @@ const pl: BaseTranslation = { FLASH: 'Flash (rozmiar / taktowanie)', APPSIZE: 'Aplikacja (wykorzystane / wolne)', FILESYSTEM: 'System plików (wykorzystane / wolne)', - BUFFER_SIZE: 'Rozmiar bufora', + BUFFER_SIZE: 'maksymalny rozmiar bufora', COMPACT: 'Kompaktowy', ENABLE_OTA: 'Aktywuj aktualizacje OTA', DOWNLOAD_CUSTOMIZATION_TEXT: 'Pobierz personalizacje', diff --git a/interface/src/i18n/se/index.ts b/interface/src/i18n/se/index.ts index d822e1e5c..a175273be 100644 --- a/interface/src/i18n/se/index.ts +++ b/interface/src/i18n/se/index.ts @@ -204,7 +204,7 @@ const se: Translation = { FLASH: 'Flashminne (Storlek / Hastighet)', APPSIZE: 'Applikationer (Använt / Ledigt)', FILESYSTEM: 'Filsystem (Använt / Ledigt)', - BUFFER_SIZE: 'Bufferstorlek', + BUFFER_SIZE: 'Max Bufferstorlek', COMPACT: 'Komprimera', ENABLE_OTA: 'Aktivera OTA-uppdateringar', DOWNLOAD_CUSTOMIZATION_TEXT: 'Ladda ner entitetsanpassningar', diff --git a/src/system.cpp b/src/system.cpp index d86961433..78cf34789 100644 --- a/src/system.cpp +++ b/src/system.cpp @@ -1255,17 +1255,18 @@ bool System::command_info(const char * value, const int8_t id, JsonObject & outp node["pbutton gpio"] = settings.pbutton_gpio; node["led gpio"] = settings.led_gpio; } - node["hide led"] = settings.hide_led; - node["notoken api"] = settings.notoken_api; - node["readonly mode"] = settings.readonly_mode; - node["fahrenheit"] = settings.fahrenheit; - node["dallas parasite"] = settings.dallas_parasite; - node["bool format"] = settings.bool_format; - node["bool dashboard"] = settings.bool_dashboard; - node["enum format"] = settings.enum_format; - node["analog enabled"] = settings.analog_enabled; - node["telnet enabled"] = settings.telnet_enabled; - node["web log buffer"] = settings.weblog_buffer; + node["hide led"] = settings.hide_led; + node["notoken api"] = settings.notoken_api; + node["readonly mode"] = settings.readonly_mode; + node["fahrenheit"] = settings.fahrenheit; + node["dallas parasite"] = settings.dallas_parasite; + node["bool format"] = settings.bool_format; + node["bool dashboard"] = settings.bool_dashboard; + node["enum format"] = settings.enum_format; + node["analog enabled"] = settings.analog_enabled; + node["telnet enabled"] = settings.telnet_enabled; + node["max web log buffer"] = settings.weblog_buffer; + node["web log buffered"] = EMSESP::webLogService.num_log_messages(); }); // Devices - show EMS devices if we have any diff --git a/src/web/WebLogService.cpp b/src/web/WebLogService.cpp index 3c85b0b99..39c34df27 100644 --- a/src/web/WebLogService.cpp +++ b/src/web/WebLogService.cpp @@ -74,6 +74,10 @@ void WebLogService::log_level(uuid::log::Level level) { uuid::log::Logger::register_handler(this, level); } +size_t WebLogService::num_log_messages() const { + return log_messages_.size(); +} + size_t WebLogService::maximum_log_messages() const { return maximum_log_messages_; } diff --git a/src/web/WebLogService.h b/src/web/WebLogService.h index de23fafa2..b224d17b3 100644 --- a/src/web/WebLogService.h +++ b/src/web/WebLogService.h @@ -37,6 +37,7 @@ class WebLogService : public uuid::log::Handler { uuid::log::Level log_level() const; void log_level(uuid::log::Level level); size_t maximum_log_messages() const; + size_t num_log_messages() const; void maximum_log_messages(size_t count); bool compact() const; void compact(bool compact);