From b7a94408685b28e42414bea486ad1523c5b48fdf Mon Sep 17 00:00:00 2001 From: James Date: Sat, 31 Dec 2022 16:46:48 +0000 Subject: [PATCH] decouple from settings --- src/logger.cpp | 15 ++++++++------- src/logger.h | 7 ++++--- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/src/logger.cpp b/src/logger.cpp index f6c970c..11f7e16 100644 --- a/src/logger.cpp +++ b/src/logger.cpp @@ -1,7 +1,8 @@ #include "logger.h" #define LOGGER_BUFFER_SIZE 4096 - -//Levels: 0none, 1error, 2warning, 3info, 4debug, 5verbose +//Default Levels: 0none, 1error, 2warning, 3info, 4debug, 5verbose +int logger_level_local=5; +int logger_level_remote=3; static char buffer[LOGGER_BUFFER_SIZE]=""; @@ -9,7 +10,7 @@ void add_to_buff(char *msg); void logger(byte level, const char* format, ...) { - if(level>settings.log_level_local && level>settings.log_level_remote){ + if(level>logger_level_local && level>logger_level_remote){ return; } static char msg[256]; @@ -19,12 +20,12 @@ void logger(byte level, const char* format, ...) va_end(argptr); static char tmp[256]; - snprintf(tmp,256,"%d[%d] (%d) %s\r\n",millis(),level,esp_get_free_heap_size(),msg); + snprintf(tmp,256,"%d[%d] %s\r\n",millis(),level,msg); - if(level<=settings.log_level_local){ + if(level<=logger_level_local){ Serial.print(tmp); } - if(level<=settings.log_level_remote){ + if(level<=logger_level_remote){ add_to_buff(tmp); } } @@ -35,7 +36,7 @@ void add_to_buff(char *msg){ log.print(buffer); log.close(); buffer[0]=0; - logger(3,"Log buffer full, written to SPIFFS"); + logger(4,"Log buffer full, written to SPIFFS"); } strcpy(buffer+strlen(buffer),msg); } diff --git a/src/logger.h b/src/logger.h index e129352..5b66dcc 100644 --- a/src/logger.h +++ b/src/logger.h @@ -1,9 +1,10 @@ #ifndef LOGGER_H #define LOGGER_H -#include -#include "filesystem.h" -#include "settings.h" +#include "SPIFFS.h" + +extern int logger_level_local; +extern int logger_level_remote; void logger(byte level, const char* format, ...); long logger_get_size();