Skip to content

Commit 28f16a8

Browse files
committed
feat: set boot log level
1 parent c8fc74a commit 28f16a8

4 files changed

Lines changed: 8 additions & 1 deletion

File tree

main/ConfigManager.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,9 @@ ConfigManager::ConfigManager() : m_isInitialized(false) {
8585
{"ethActivePreset", &m_miscConfig.ethActivePreset},
8686
{"ethPhyType", &m_miscConfig.ethPhyType},
8787
{"ethRmiiConfig", &m_miscConfig.ethRmiiConfig},
88-
{"ethSpiConfig", &m_miscConfig.ethSpiConfig}}
88+
{"ethSpiConfig", &m_miscConfig.ethSpiConfig},
89+
{"logLevel", &m_miscConfig.logLevel}
90+
}
8991
},
9092
{
9193
"actions", {

main/WebServerManager.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1307,6 +1307,8 @@ esp_err_t WebServerManager::handleWebSocketMessage(httpd_req_t *req,
13071307
if(level_item && cJSON_IsNumber(level_item)) {
13081308
esp_log_level_t level = esp_log_level_t(level_item->valueint > 0 && level_item->valueint < 6 ? level_item->valueint : ESP_LOG_WARN);
13091309
esp_log_level_set("*", level);
1310+
m_configManager.updateFromJson<espConfig::misc_config_t>("{\"logLevel\":" + std::to_string(level) + "}");
1311+
m_configManager.saveConfig<espConfig::misc_config_t>();
13101312
}
13111313
} else {
13121314
cJSON *unknown = cJSON_CreateObject();

main/include/config.hpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
#include <map>
55
#include <array>
66
#include "defaults.h"
7+
#include "esp_log_level.h"
78
#include "fmt/format.h"
89
#include "esp_mac.h"
910

@@ -115,6 +116,7 @@ namespace espConfig
115116
uint8_t ethPhyType = ETH_PHY_TYPE;
116117
std::array<uint8_t, 5> ethRmiiConfig = {ETH_RMII_CONF_PHY_ADDR, ETH_RMII_CONF_MDC_PIN, ETH_RMII_CONF_MDIO_PIN, ETH_RMII_CONF_POWER_PIN, ETH_RMII_CONF_RMII_CLOCK_MODE};
117118
std::array<uint8_t, 7> ethSpiConfig = {ETH_SPI_CONF_SPI_FREQ_MHZ, ETH_SPI_CONF_PIN_CS, ETH_SPI_CONF_PIN_IRQ, ETH_SPI_CONF_PIN_RST, ETH_SPI_CONF_PIN_SCK, ETH_SPI_CONF_PIN_MISO, ETH_SPI_CONF_PIN_MOSI};
119+
uint8_t logLevel = ESP_LOG_INFO;
118120
};
119121
struct actions_config_t {
120122
enum colorMap

main/main.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ void setup() {
5555
readerDataManager = new ReaderDataManager;
5656
configManager = new ConfigManager;
5757
configManager->begin();
58+
esp_log_level_set("*", static_cast<esp_log_level_t>(configManager->getConfig<espConfig::misc_config_t>().logLevel));
5859
webServerManager = new WebServerManager(*configManager, *readerDataManager);
5960
distributor.add_sinker(std::make_shared<loggable::WebSocketLogSinker>(webServerManager));
6061
hardwareManager = new HardwareManager(configManager->getConfig<espConfig::actions_config_t>());

0 commit comments

Comments
 (0)