From abab770ea298bbb313aedea851f405ce3082846d Mon Sep 17 00:00:00 2001 From: nico-arnold <82146516+nico-arnold@users.noreply.github.com> Date: Tue, 11 Feb 2025 19:51:58 +0100 Subject: [PATCH] Add logging option for log name --- htmljs/src/locales/chinese.json | 1 + htmljs/src/locales/english.json | 2 ++ htmljs/src/locales/italian.json | 1 + htmljs/src/locales/norwegian.json | 1 + htmljs/src/locales/portuguese-br.json | 1 + htmljs/src/locales/slovak.json | 1 + htmljs/src/locales/spanish.json | 1 + htmljs/src/logging.tmpl.html | 6 ++++++ src/LogFormatter.cpp | 11 +++++++++++ 9 files changed, 25 insertions(+) diff --git a/htmljs/src/locales/chinese.json b/htmljs/src/locales/chinese.json index 3ba7c9e4..79b9f257 100644 --- a/htmljs/src/locales/chinese.json +++ b/htmljs/src/locales/chinese.json @@ -490,6 +490,7 @@ "log_mode_in_integer": "mode用整數表示", "log_mode_in_character": "mode用字元表示", "log_pressure_reading": "壓力PSI", + "log_batch_name": "記錄檔名", "gravity_change": "比重變化", "gravity_change_6h": "比重變化 6H", diff --git a/htmljs/src/locales/english.json b/htmljs/src/locales/english.json index c6db44f7..0e7978ff 100644 --- a/htmljs/src/locales/english.json +++ b/htmljs/src/locales/english.json @@ -493,6 +493,8 @@ "log_mode_in_integer": "mode in integer", "log_mode_in_character": "mode in character", "log_pressure_reading": "Pressure in PSI", + "log_batch_name": "current log name", + "gravity_change": "Gravity Change", "gravity_change_6h": "Gravity Change 6H", diff --git a/htmljs/src/locales/italian.json b/htmljs/src/locales/italian.json index c03938bc..ca7797da 100644 --- a/htmljs/src/locales/italian.json +++ b/htmljs/src/locales/italian.json @@ -491,6 +491,7 @@ "log_mode_in_integer": "modo numerico", "log_mode_in_character": "modo caratteri", "log_pressure_reading": "Pressione in PSI", + "log_batch_name": "nome log", "gravity_change": "Gravity Change", "gravity_change_6h": "Gravity Change 6H", "gravity_change_12h": "Gravity Change 12H", diff --git a/htmljs/src/locales/norwegian.json b/htmljs/src/locales/norwegian.json index 830dd9bd..1b3f9e38 100644 --- a/htmljs/src/locales/norwegian.json +++ b/htmljs/src/locales/norwegian.json @@ -490,6 +490,7 @@ "log_mode_in_integer": "modus i heltall", "log_mode_in_character": "modus i karakter", "log_pressure_reading": "Trykk i PSI", + "log_batch_name": "loggnavn", "gravity_change": "Gravity Change", "gravity_change_6h": "Gravity Change 6H", "gravity_change_12h": "Gravity Change 12H", diff --git a/htmljs/src/locales/portuguese-br.json b/htmljs/src/locales/portuguese-br.json index e4e92b2a..522c300a 100644 --- a/htmljs/src/locales/portuguese-br.json +++ b/htmljs/src/locales/portuguese-br.json @@ -491,6 +491,7 @@ "log_mode_in_integer": "modo em números inteiros", "log_mode_in_character": "modo em caracteres especiais", "log_pressure_reading": "Pressão em PSI", + "log_batch_name": "Nome do registro", "gravity_change": "Gravity Change", "gravity_change_6h": "Gravity Change 6H", "gravity_change_12h": "Gravity Change 12H", diff --git a/htmljs/src/locales/slovak.json b/htmljs/src/locales/slovak.json index 55dd8d4c..ceddc689 100644 --- a/htmljs/src/locales/slovak.json +++ b/htmljs/src/locales/slovak.json @@ -490,6 +490,7 @@ "log_mode_in_integer": "režim v celých číslach", "log_mode_in_character": "režim v znakoch", "log_pressure_reading": "Tlak v PSI", + "log_batch_name": "Názov záznamu", "gravity_change": "Gravity Change", "gravity_change_6h": "Gravity Change 6H", "gravity_change_12h": "Gravity Change 12H", diff --git a/htmljs/src/locales/spanish.json b/htmljs/src/locales/spanish.json index 1959e8eb..adc2af8f 100644 --- a/htmljs/src/locales/spanish.json +++ b/htmljs/src/locales/spanish.json @@ -490,6 +490,7 @@ "log_mode_in_integer": "mode in integer", "log_mode_in_character": "mode in character", "log_pressure_reading": "Pressure in PSI", + "log_batch_name": "Nombre del registro", "gravity_change": "Gravity Change", "gravity_change_6h": "Gravity Change 6H", "gravity_change_12h": "Gravity Change 12H", diff --git a/htmljs/src/logging.tmpl.html b/htmljs/src/logging.tmpl.html index 3ab270c6..d033c4f0 100644 --- a/htmljs/src/logging.tmpl.html +++ b/htmljs/src/logging.tmpl.html @@ -683,6 +683,12 @@
<%= log_pressure_reading %> + + + %n + + <%= log_batch_name %> + %H diff --git a/src/LogFormatter.cpp b/src/LogFormatter.cpp index 14ecacef..98b56d93 100644 --- a/src/LogFormatter.cpp +++ b/src/LogFormatter.cpp @@ -13,7 +13,9 @@ #if EnableHumidityControlSupport #include "HumidityControl.h" #endif +#include extern BrewPiProxy brewPi; +extern BrewLogger brewLogger; @@ -120,6 +122,15 @@ size_t dataSprintf(char *buffer,const char *format,const char* invalid) strcpy(buffer+d,invalid); d+= strlen(invalid); #endif + }else if(ch == 'n'){ + const char *logname; + if (brewLogger.currentLog() == NULL){ + logname = "Unnamed"; + }else{ + logname = brewLogger.currentLog(); + } + strcpy(buffer+d, logname); + d += strlen(logname); }else{ // wrong format //return 0; ignored