pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-08-18 11:13:29 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Trace

Browse Source
This commit is contained in:
Ben Meadors 2022-12-30 08:14:37 -06:00
parent 3eefd46ca1
commit 8193215294
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/DebugConfiguration.h
View File

@ -17,6 +17,7 @@
#define LOG_LEVEL_INFO "INFO " #define LOG_LEVEL_INFO "INFO "
#define LOG_LEVEL_WARN "WARN " #define LOG_LEVEL_WARN "WARN "
#define LOG_LEVEL_ERROR "ERROR" #define LOG_LEVEL_ERROR "ERROR"
#define LOG_LEVEL_TRACE "TRACE"
#include "SerialConsole.h" #include "SerialConsole.h"
@ -33,6 +34,7 @@
#define LOG_INFO(...) DEBUG_PORT.log(LOG_LEVEL_INFO, __VA_ARGS__) #define LOG_INFO(...) DEBUG_PORT.log(LOG_LEVEL_INFO, __VA_ARGS__)
#define LOG_WARN(...) DEBUG_PORT.log(LOG_LEVEL_WARN, __VA_ARGS__) #define LOG_WARN(...) DEBUG_PORT.log(LOG_LEVEL_WARN, __VA_ARGS__)
#define LOG_ERROR(...) DEBUG_PORT.log(LOG_LEVEL_ERROR, __VA_ARGS__) #define LOG_ERROR(...) DEBUG_PORT.log(LOG_LEVEL_ERROR, __VA_ARGS__)
#define LOG_TRACE(...) DEBUG_PORT.log(LOG_TRACE, __VA_ARGS__)
#else #else
#define LOG_DEBUG(...) #define LOG_DEBUG(...)
#define LOG_INFO(...) #define LOG_INFO(...)

20
src/mesh/NodeDB.cpp
View File

@ -203,7 +203,7 @@ void NodeDB::initConfigIntervals()
void NodeDB::installDefaultModuleConfig() void NodeDB::installDefaultModuleConfig()
{ {
LOG_DEBUG("Installing default ModuleConfig\n"); LOG_INFO("Installing default ModuleConfig\n");
memset(&moduleConfig, 0, sizeof(ModuleConfig)); memset(&moduleConfig, 0, sizeof(ModuleConfig));
moduleConfig.version = DEVICESTATE_CUR_VER; moduleConfig.version = DEVICESTATE_CUR_VER;
@ -230,7 +230,7 @@ void NodeDB::initModuleConfigIntervals()
void NodeDB::installDefaultChannels() void NodeDB::installDefaultChannels()
{ {
LOG_DEBUG("Installing default ChannelFile\n"); LOG_INFO("Installing default ChannelFile\n");
memset(&channelFile, 0, sizeof(ChannelFile)); memset(&channelFile, 0, sizeof(ChannelFile));
channelFile.version = DEVICESTATE_CUR_VER; channelFile.version = DEVICESTATE_CUR_VER;
} }
@ -244,7 +244,7 @@ void NodeDB::resetNodes()
void NodeDB::installDefaultDeviceState() void NodeDB::installDefaultDeviceState()
{ {
LOG_DEBUG("Installing default DeviceState\n"); LOG_INFO("Installing default DeviceState\n");
memset(&devicestate, 0, sizeof(DeviceState)); memset(&devicestate, 0, sizeof(DeviceState));
*numNodes = 0; *numNodes = 0;
@ -275,7 +275,7 @@ void NodeDB::installDefaultDeviceState()
void NodeDB::init() void NodeDB::init()
{ {
LOG_DEBUG("Initializing NodeDB\n"); LOG_INFO("Initializing NodeDB\n");
loadFromDisk(); loadFromDisk();
uint32_t devicestateCRC = crc32Buffer(&devicestate, sizeof(devicestate)); uint32_t devicestateCRC = crc32Buffer(&devicestate, sizeof(devicestate));
@ -383,7 +383,7 @@ bool NodeDB::loadProto(const char *filename, size_t protoSize, size_t objSize, c
memset(dest_struct, 0, objSize); memset(dest_struct, 0, objSize);
if (!pb_decode(&stream, fields, dest_struct)) { if (!pb_decode(&stream, fields, dest_struct)) {
LOG_DEBUG("Error: can't decode protobuf %s\n", PB_GET_ERROR(&stream)); LOG_ERROR("Error: can't decode protobuf %s\n", PB_GET_ERROR(&stream));
} else { } else {
okay = true; okay = true;
} }
@ -393,7 +393,7 @@ bool NodeDB::loadProto(const char *filename, size_t protoSize, size_t objSize, c
LOG_DEBUG("No %s preferences found\n", filename); LOG_DEBUG("No %s preferences found\n", filename);
} }
#else #else
LOG_DEBUG("ERROR: Filesystem not implemented\n"); LOG_ERROR("ERROR: Filesystem not implemented\n");
#endif #endif
return okay; return okay;
} }
@ -405,7 +405,7 @@ void NodeDB::loadFromDisk()
installDefaultDeviceState(); // Our in RAM copy might now be corrupt installDefaultDeviceState(); // Our in RAM copy might now be corrupt
} else { } else {
if (devicestate.version < DEVICESTATE_MIN_VER) { if (devicestate.version < DEVICESTATE_MIN_VER) {
LOG_DEBUG("Warn: devicestate %d is old, discarding\n", devicestate.version); LOG_WARN("Devicestate %d is old, discarding\n", devicestate.version);
factoryReset(); factoryReset();
} else { } else {
LOG_DEBUG("Loaded saved devicestate version %d\n", devicestate.version); LOG_DEBUG("Loaded saved devicestate version %d\n", devicestate.version);
@ -416,7 +416,7 @@ void NodeDB::loadFromDisk()
installDefaultConfig(); // Our in RAM copy might now be corrupt installDefaultConfig(); // Our in RAM copy might now be corrupt
} else { } else {
if (config.version < DEVICESTATE_MIN_VER) { if (config.version < DEVICESTATE_MIN_VER) {
LOG_DEBUG("Warn: config %d is old, discarding\n", config.version); LOG_WARN("config %d is old, discarding\n", config.version);
installDefaultConfig(); installDefaultConfig();
} else { } else {
LOG_DEBUG("Loaded saved config version %d\n", config.version); LOG_DEBUG("Loaded saved config version %d\n", config.version);
@ -427,7 +427,7 @@ void NodeDB::loadFromDisk()
installDefaultModuleConfig(); // Our in RAM copy might now be corrupt installDefaultModuleConfig(); // Our in RAM copy might now be corrupt
} else { } else {
if (moduleConfig.version < DEVICESTATE_MIN_VER) { if (moduleConfig.version < DEVICESTATE_MIN_VER) {
LOG_DEBUG("Warn: moduleConfig %d is old, discarding\n", moduleConfig.version); LOG_WARN("moduleConfig %d is old, discarding\n", moduleConfig.version);
installDefaultModuleConfig(); installDefaultModuleConfig();
} else { } else {
LOG_DEBUG("Loaded saved moduleConfig version %d\n", moduleConfig.version); LOG_DEBUG("Loaded saved moduleConfig version %d\n", moduleConfig.version);
@ -438,7 +438,7 @@ void NodeDB::loadFromDisk()
installDefaultChannels(); // Our in RAM copy might now be corrupt installDefaultChannels(); // Our in RAM copy might now be corrupt
} else { } else {
if (channelFile.version < DEVICESTATE_MIN_VER) { if (channelFile.version < DEVICESTATE_MIN_VER) {
LOG_DEBUG("Warn: channelFile %d is old, discarding\n", channelFile.version); LOG_WARN("channelFile %d is old, discarding\n", channelFile.version);
installDefaultChannels(); installDefaultChannels();
} else { } else {
LOG_DEBUG("Loaded saved channelFile version %d\n", channelFile.version); LOG_DEBUG("Loaded saved channelFile version %d\n", channelFile.version);