From 24b0dae6598ebac518af79bc4f343594c9ce5b76 Mon Sep 17 00:00:00 2001 From: Thomas Basler Date: Fri, 18 Apr 2025 16:52:25 +0200 Subject: [PATCH] Use ESP Logging Macros for configuration --- src/Configuration.cpp | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/Configuration.cpp b/src/Configuration.cpp index 65375256..6b74c019 100644 --- a/src/Configuration.cpp +++ b/src/Configuration.cpp @@ -3,7 +3,6 @@ * Copyright (C) 2022-2025 Thomas Basler and others */ #include "Configuration.h" -#include "MessageOutput.h" #include "NetworkSettings.h" #include "Utils.h" #include "defaults.h" @@ -11,6 +10,9 @@ #include #include +#undef TAG +static const char* TAG = "configuration"; + CONFIG_T config; static std::condition_variable sWriterCv; @@ -157,7 +159,7 @@ bool ConfigurationClass::write() // Serialize JSON to file if (serializeJson(doc, f) == 0) { - MessageOutput.printf("Failed to write file\n"); + ESP_LOGE(TAG, "Failed to write file"); return false; } @@ -175,7 +177,7 @@ bool ConfigurationClass::read() // Deserialize the JSON document const DeserializationError error = deserializeJson(doc, f); if (error) { - MessageOutput.printf("Failed to read file, using default configuration\n"); + ESP_LOGW(TAG, "Failed to read file, using default configuration"); } if (!Utils::checkJsonAlloc(doc, __FUNCTION__, __LINE__)) { @@ -334,11 +336,11 @@ bool ConfigurationClass::read() const uint64_t dtuId = Utils::generateDtuSerial(); config.Dtu.Serial = dtuId; write(); - MessageOutput.printf("DTU serial check: Generated new serial based on ESP chip id: %0" PRIx32 "%08" PRIx32 "\n", + ESP_LOGI(TAG, "DTU serial check: Generated new serial based on ESP chip id: %0" PRIx32 "%08" PRIx32 "", static_cast((dtuId >> 32) & 0xFFFFFFFF), static_cast(dtuId & 0xFFFFFFFF)); } else { - MessageOutput.printf("DTU serial check: Using existing serial\n"); + ESP_LOGI(TAG, "DTU serial check: Using existing serial"); } return true; @@ -348,7 +350,7 @@ void ConfigurationClass::migrate() { File f = LittleFS.open(CONFIG_FILENAME, "r", false); if (!f) { - MessageOutput.printf("Failed to open file, cancel migration\n"); + ESP_LOGE(TAG, "Failed to open file, cancel migration"); return; } @@ -359,7 +361,7 @@ void ConfigurationClass::migrate() // Deserialize the JSON document const DeserializationError error = deserializeJson(doc, f); if (error) { - MessageOutput.printf("Failed to read file, cancel migration: %s\n", error.c_str()); + ESP_LOGE(TAG, "Failed to read file, cancel migration: %s", error.c_str()); return; }