Skip to content

Add logging option for current log name #452

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nico-arnold wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add logging option for current log name #452

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions htmljs/src/locales/chinese.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 2 additions & 0 deletions htmljs/src/locales/english.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
1 change: 1 addition & 0 deletions htmljs/src/locales/italian.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
1 change: 1 addition & 0 deletions htmljs/src/locales/norwegian.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
1 change: 1 addition & 0 deletions htmljs/src/locales/portuguese-br.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
1 change: 1 addition & 0 deletions htmljs/src/locales/slovak.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
1 change: 1 addition & 0 deletions htmljs/src/locales/spanish.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
6 changes: 6 additions & 0 deletions htmljs/src/logging.tmpl.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -683,6 +683,12 @@ <h6 class="inline-header">
<td>
<%= log_pressure_reading %>
</td>
</tr>
<tr>
<th>%n</th>
<td>
<%= log_batch_name %>
</td>
</tr>
<tr>
<th>%H</th>
Expand Down
11 changes: 11 additions & 0 deletions src/LogFormatter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@
#if EnableHumidityControlSupport
#include "HumidityControl.h"
#endif
#include <BrewLogger.h>
extern BrewPiProxy brewPi;
extern BrewLogger brewLogger;



Expand Down Expand Up @@ -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
Expand Down