From 5b00cd578b762865ffd3cf43e954fa8c5d56f39e Mon Sep 17 00:00:00 2001 From: Eduardo Silva Date: Sun, 28 Dec 2025 01:21:26 +0000 Subject: [PATCH] Moved the logger into its own project --- platformio.ini | 6 ++- src/communication/walkieTalkie.cpp | 2 +- src/logger/logger.cpp | 48 ----------------- src/logger/logger.h | 82 ------------------------------ src/main.cpp | 19 +------ 5 files changed, 7 insertions(+), 150 deletions(-) delete mode 100644 src/logger/logger.cpp delete mode 100644 src/logger/logger.h diff --git a/platformio.ini b/platformio.ini index f67a096..99cefa2 100644 --- a/platformio.ini +++ b/platformio.ini @@ -24,4 +24,8 @@ build_unflags = -std=gnu++11 # -Ilib/u8g2/cppsrc board_build.arduino.memory_type = qio_opi -lib_deps = ../eslabsCurses/ +lib_deps = + ../lib/logger/ + ../lib/eslabsCurses/ + +lib_extra_dirs = ../lib diff --git a/src/communication/walkieTalkie.cpp b/src/communication/walkieTalkie.cpp index 49c912b..d20668d 100644 --- a/src/communication/walkieTalkie.cpp +++ b/src/communication/walkieTalkie.cpp @@ -1,6 +1,6 @@ #include "walkieTalkie.h" #include "HardwareSerial.h" -#include "logger/logger.h" +#include "logger.h" #include "communication/commands.h" #include "communication/communication.h" #include diff --git a/src/logger/logger.cpp b/src/logger/logger.cpp deleted file mode 100644 index 93a01f5..0000000 --- a/src/logger/logger.cpp +++ /dev/null @@ -1,48 +0,0 @@ -#include "logger.h" -#include "HardwareSerial.h" - -namespace Logger { - inline HardwareSerial& out() { - return Serial2; - } - - void WritePrefix(LogLevel lvl) { - switch (lvl) { - case Error: out().print(F("\r[ERR] ")); break; - case Warn: out().print(F("\r[WRN] ")); break; - case Info: out().print(F("\r[INF] ")); break; - case Debug: out().print(F("\r[DBG] ")); break; - case Trace: out().print(F("\r[TRC] ")); break; - } - } - - void VPrintf(const char* fmt, va_list args) { - char buffer[128]; - vsnprintf(buffer, sizeof(buffer), fmt, args); - out().print(buffer); - } - - void Printf(const char* fmt, ...) { - va_list args; - va_start(args, fmt); - VPrintf(fmt, args); - va_end(args); - } - - void Printf(const __FlashStringHelper* fmt, ...) { - char buffer[128]; - - va_list args; - va_start(args, fmt); - vsnprintf_P(buffer, sizeof(buffer), - reinterpret_cast(fmt), args); - va_end(args); - - out().print(buffer); - } - - void Initialize(int8_t rx, int8_t tx) { - Serial2.begin(115200, SERIAL_8N1, rx, tx); - Serial2.flush(); - } -}; diff --git a/src/logger/logger.h b/src/logger/logger.h deleted file mode 100644 index 0a29e99..0000000 --- a/src/logger/logger.h +++ /dev/null @@ -1,82 +0,0 @@ -#ifndef __LOGGER__ -#define __LOGGER__ - -#include -#include - -#define LOG_LEVEL_ERROR 0 -#define LOG_LEVEL_WARN 1 -#define LOG_LEVEL_INFO 2 -#define LOG_LEVEL_DEBUG 3 -#define LOG_LEVEL_TRACE 4 - -#define LOG_ENABLED(lvl) ((lvl) <= LOG_LEVEL) - -#if LOG_ENABLED(LOG_LEVEL_ERROR) - #define LOG_ERROR(fmt, ...) \ - do { \ - Logger::WritePrefix(Logger::Error); \ - Logger::Printf(fmt, ##__VA_ARGS__); \ - } while (0) -#else - #define LOG_ERROR(...) do {} while (0) -#endif - -#if LOG_ENABLED(LOG_LEVEL_WARN) - #define LOG_WARN(fmt, ...) \ - do { \ - Logger::WritePrefix(Logger::Warn); \ - Logger::Printf(fmt, ##__VA_ARGS__); \ - } while (0) -#else - #define LOG_WARN(...) do {} while (0) -#endif - -#if LOG_ENABLED(LOG_LEVEL_INFO) - #define LOG_INFO(fmt, ...) \ - do { \ - Logger::WritePrefix(Logger::Info); \ - Logger::Printf(fmt, ##__VA_ARGS__); \ - } while (0) -#else - #define LOG_INFO(...) do {} while (0) -#endif - -#if LOG_ENABLED(LOG_LEVEL_DEBUG) - #define LOG_DEBUG(fmt, ...) \ - do { \ - Logger::WritePrefix(Logger::Debug); \ - Logger::Printf(fmt, ##__VA_ARGS__); \ - } while (0) -#else - #define LOG_DEBUG(...) do {} while (0) -#endif - -#if LOG_ENABLED(LOG_LEVEL_TRACE) - #define LOG_TRACE(fmt, ...) \ - do { \ - Logger::WritePrefix(Logger::Trace); \ - Logger::Printf(fmt, ##__VA_ARGS__); \ - } while (0) -#else - #define LOG_TRACE(...) do {} while (0) -#endif - -namespace Logger { - enum LogLevel : uint8_t { - Error = LOG_LEVEL_ERROR, - Warn = LOG_LEVEL_WARN, - Info = LOG_LEVEL_INFO, - Debug = LOG_LEVEL_DEBUG, - Trace = LOG_LEVEL_TRACE - }; - - void Initialize(int8_t rx, int8_t tx); - - void WritePrefix(LogLevel lvl); - void VPrintf(const char* fmt, va_list args); - void Printf(const char* fmt, ...); - void Printf(const __FlashStringHelper* fmt, ...); -}; - -#endif diff --git a/src/main.cpp b/src/main.cpp index 2ac9dbd..d554a5d 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -16,7 +16,7 @@ to have more ways to run analytics #include "communication/commands.h" #include "communication/packets.h" #include "communication/walkieTalkie.h" -#include "logger/logger.h" +#include "logger.h" #include "values.h" #include "windowPool.h" // #include "UIDrawing.h" @@ -156,23 +156,6 @@ uint64_t lastDataRead = 0; bool gotAck = false; -// struct header { -// uint8_t StartMarker; -// Command Cmd; -// uint8_t EndMarker; -// }; - -// void PrintHeader(header *h) { -// Serial2.println("HEADER:"); -// Serial2.print(" StartMarker: "); -// Serial2.println(h->StartMarker); -// Serial2.print(" Command : "); -// Serial2.println(CommandToStr(h->Cmd)); -// Serial2.print(" EndMarker : "); -// Serial2.println(h->EndMarker); -// Serial2.println(); -// } - struct UIWindowPacket { uint8_t StartMarker; uint16_t x0;