pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-10-27 15:02:41 +00:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

remove memory usage debug

Browse Source
This commit is contained in:
HarukiToreda 2025-10-14 10:18:49 -04:00
parent c180f23026
commit aaf4a7e59e
2 changed files with 10 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
src/MessageStore.cpp
View File

@ -47,17 +47,6 @@ template <typename T> static inline void pushWithLimit(std::deque<T> &queue, T &
queue.emplace_back(std::move(msg)); queue.emplace_back(std::move(msg));
} }
void MessageStore::logMemoryUsage(const char *context) const
{
size_t total = 0;
for (const auto &m : messages) {
total += getMessageSize(m);
}
LOG_DEBUG("MessageStore[%s]: %u messages, est %u bytes (~%u KB)", context, (unsigned)messages.size(), (unsigned)total,
(unsigned)(total / 1024));
}
MessageStore::MessageStore(const std::string &label) MessageStore::MessageStore(const std::string &label)
{ {
filename = "/Messages_" + label + ".msgs"; filename = "/Messages_" + label + ".msgs";
@ -87,48 +76,27 @@ void MessageStore::addMessage(const StoredMessage &msg)
const StoredMessage &MessageStore::addFromPacket(const meshtastic_MeshPacket &packet) const StoredMessage &MessageStore::addFromPacket(const meshtastic_MeshPacket &packet)
{ {
StoredMessage sm; StoredMessage sm;
// Always use our local time (helper handles RTC vs boot time) assignTimestamp(sm); // set timestamp (RTC or boot-relative)
assignTimestamp(sm);
sm.channelIndex = packet.channel; sm.channelIndex = packet.channel;
// Text from packet → std::string (fast, no extra copies)
sm.text = std::string(reinterpret_cast<const char *>(packet.decoded.payload.bytes)); sm.text = std::string(reinterpret_cast<const char *>(packet.decoded.payload.bytes));
if (packet.from == 0) { if (packet.from == 0) {
// Phone-originated (outgoing) // Outgoing (phone-originated)
sm.sender = nodeDB->getNodeNum(); // our node ID sm.sender = nodeDB->getNodeNum();
if (packet.decoded.dest == 0 || packet.decoded.dest == NODENUM_BROADCAST) { sm.dest = (packet.decoded.dest == 0) ? NODENUM_BROADCAST : packet.decoded.dest;
sm.dest = NODENUM_BROADCAST; sm.type = (sm.dest == NODENUM_BROADCAST) ? MessageType::BROADCAST : MessageType::DM_TO_US;
sm.type = MessageType::BROADCAST;
} else {
sm.dest = packet.decoded.dest;
sm.type = MessageType::DM_TO_US;
}
// Outgoing messages start as NONE until ACK/NACK arrives
sm.ackStatus = AckStatus::NONE; sm.ackStatus = AckStatus::NONE;
} else { } else {
// Normal incoming // Incoming
sm.sender = packet.from; sm.sender = packet.from;
if (packet.to == NODENUM_BROADCAST || packet.decoded.dest == NODENUM_BROADCAST) { sm.dest = packet.decoded.dest;
sm.dest = NODENUM_BROADCAST; sm.type = (sm.dest == NODENUM_BROADCAST) ? MessageType::BROADCAST
sm.type = MessageType::BROADCAST; : (sm.dest == nodeDB->getNodeNum()) ? MessageType::DM_TO_US
} else if (packet.to == nodeDB->getNodeNum()) { : MessageType::BROADCAST;
sm.dest = nodeDB->getNodeNum(); // DM to us
sm.type = MessageType::DM_TO_US;
} else {
sm.dest = NODENUM_BROADCAST; // fallback
sm.type = MessageType::BROADCAST;
}
// Received messages don’t wait for ACK mark as ACKED
sm.ackStatus = AckStatus::ACKED; sm.ackStatus = AckStatus::ACKED;
} }
addLiveMessage(sm); addLiveMessage(sm);
// Return reference to the most recently stored message
return liveMessages.back(); return liveMessages.back();
} }
@ -195,8 +163,6 @@ void MessageStore::saveToFlash()
f.close(); f.close();
// Debug after saving
logMemoryUsage("saveToFlash");
#else #else
// Filesystem not available, skip persistence // Filesystem not available, skip persistence
#endif #endif
@ -275,8 +241,6 @@ void MessageStore::loadFromFlash()
} }
f.close(); f.close();
// Debug after loading
logMemoryUsage("loadFromFlash");
#endif #endif
} }
#else #else

3
src/graphics/draw/DrawRenderers.h
View File

@ -11,7 +11,6 @@
#include "graphics/draw/CompassRenderer.h" #include "graphics/draw/CompassRenderer.h"
#include "graphics/draw/DebugRenderer.h" #include "graphics/draw/DebugRenderer.h"
#include "graphics/draw/NodeListRenderer.h" #include "graphics/draw/NodeListRenderer.h"
#include "graphics/draw/ScreenRenderer.h"
#include "graphics/draw/UIRenderer.h" #include "graphics/draw/UIRenderer.h"
namespace graphics namespace graphics
@ -30,8 +29,6 @@ using namespace ClockRenderer;
using namespace CompassRenderer; using namespace CompassRenderer;
using namespace DebugRenderer; using namespace DebugRenderer;
using namespace NodeListRenderer; using namespace NodeListRenderer;
using namespace ScreenRenderer;
using namespace UIRenderer;
} // namespace DrawRenderers } // namespace DrawRenderers