mirror of
https://github.com/alexhopeoconnor/firmware.git
synced 2026-10-13 15:11:20 +10:00
* Right-size nRF52 heap tiers after 2.8.0 heap-exhaustion field reports Field reports on 2.8.0 show nRF52840 devices at 99% heap (114/115 KB) within minutes of boot; operator new asserts on OOM, so these devices are one allocation from a reboot. The 2.8.0 cache sizing ladders gave nRF52 the largest non-PSRAM tiers on the assumption that a BLE-only part has a roomy heap - the arena is actually ~125 KB shared with the FreeRTOS task stacks. Per-target retiers (nRF52840 unless noted): - Traffic Management cache 1000 -> 250 entries (10 KB -> 2.5 KB); the unclassified fallthrough drops 1000 -> 400 to match the classic-ESP32 tier (also affects RP2040/RP2350) - Warm node store 200 -> 100 entries (8 KB -> 4 KB); the non-XXAA fallthrough drops 320 -> 100 so an unclassified RAM-constrained part can't boot-allocate 12.8 KB - MESSAGE_HISTORY_LIMIT 20 -> 10 (text pool 4.4 KB -> 2.2 KB), the tier classic ESP32 already ships - MAX_RX_TOPHONE 32 -> 16, shrinking the static packet pool 70 -> 54 slots (~6.6 KB of .bss returned to the heap arena) - PacketHistory hash index off arch-wide (1 KB); O(n) over 240 records is negligible at LoRa packet rates - OLEDDISPLAY_REDUCE_MEMORY arch-wide (~1 KB OLED back buffer); the five TFT variants -U it because TFTDisplay.cpp needs buffer_back for dirty-window diffing - Drop the stale "for testing" 1024-entry TMM override on T1000-E Measured on rak4631: heap arena grows 124,572 -> 131,180 B and boot allocations drop ~15.7 KB, roughly +22 KB free heap on the field-report device class. Migration: the nRF52840 warm flash ring replays through place() (LRU), so the newest 100 identities survive the shrink; the file backend rejects oversized snapshots cleanly (new test covers this). Native suites pass (536/536 Docker, 13/13 native-macos warm store); rak4631, heltec-mesh-node-t114 (TFT) and tracker-t1000-e build green. * Drop stale OLEDDISPLAY_REDUCE_MEMORY -U on t114 / mesh-solar-tft Only USE_TFTDISPLAY variants (t1, t096, wismeshtap) compile TFTDisplay.cpp and need the lib's buffer_back; t114 and mesh-solar-tft render through the meshtastic-st7789 driver, which handles the reduced-memory configuration fine - as #10894 (merged from develop) already established by defining the flag there. Remove the -U guard and the per-variant -D (redundant with the arch-wide define in nrf52_base on this branch). Both variants verified building.
145 lines
5.7 KiB
C++
145 lines
5.7 KiB
C++
#pragma once
|
|
|
|
#if HAS_SCREEN || defined(MESHTASTIC_INCLUDE_NICHE_GRAPHICS)
|
|
|
|
// Disable debug logging entirely on release builds of HELTEC_MESH_SOLAR for space constraints
|
|
#if defined(HELTEC_MESH_SOLAR)
|
|
#define LOG_DEBUG(...)
|
|
#endif
|
|
|
|
// Enable or disable message persistence (flash storage)
|
|
// Define -DENABLE_MESSAGE_PERSISTENCE=0 in build_flags to disable it entirely
|
|
#ifndef ENABLE_MESSAGE_PERSISTENCE
|
|
#define ENABLE_MESSAGE_PERSISTENCE 1
|
|
#endif
|
|
|
|
#include "mesh/generated/meshtastic/mesh.pb.h"
|
|
#include <cstdint>
|
|
#include <deque>
|
|
#include <string>
|
|
|
|
// How many messages are stored (RAM + flash).
|
|
// Define -DMESSAGE_HISTORY_LIMIT=N in build_flags to control memory usage.
|
|
#ifndef MESSAGE_HISTORY_LIMIT
|
|
#if (defined(ARCH_ESP32) && \
|
|
!(defined(CONFIG_IDF_TARGET_ESP32C3) || defined(CONFIG_IDF_TARGET_ESP32S3) || defined(CONFIG_IDF_TARGET_ESP32S2))) || \
|
|
defined(NRF52840_XXAA)
|
|
// Baseline ESP32 (non-PSRAM variants) and nRF52840 (~115 KB heap arena shared with SoftDevice +
|
|
// FreeRTOS stacks; 2.8.0 field reports hit 99% use) have limited heap; reduce message history on
|
|
// resource-constrained builds. Override with -DMESSAGE_HISTORY_LIMIT=N if needed.
|
|
#define MESSAGE_HISTORY_LIMIT 10
|
|
#else
|
|
#define MESSAGE_HISTORY_LIMIT 20
|
|
#endif
|
|
#endif
|
|
|
|
// Internal alias used everywhere in code - do NOT redefine elsewhere.
|
|
#define MAX_MESSAGES_SAVED MESSAGE_HISTORY_LIMIT
|
|
|
|
// Maximum text payload size per message in bytes.
|
|
// This still defines the max message length, but we no longer reserve this space per message.
|
|
#define MAX_MESSAGE_SIZE 220
|
|
|
|
// Total shared text pool size for all messages combined.
|
|
// The text pool is RAM-only. Text is re-stored from flash into the pool on boot.
|
|
#ifndef MESSAGE_TEXT_POOL_SIZE
|
|
#define MESSAGE_TEXT_POOL_SIZE (MAX_MESSAGES_SAVED * MAX_MESSAGE_SIZE)
|
|
#endif
|
|
|
|
// Explicit message classification
|
|
enum class MessageType : uint8_t {
|
|
BROADCAST = 0, // broadcast message
|
|
DM_TO_US = 1 // direct message addressed to this node
|
|
};
|
|
|
|
// Delivery status for messages we sent
|
|
enum class AckStatus : uint8_t {
|
|
NONE = 0, // just sent, waiting (no symbol shown)
|
|
ACKED = 1, // got a valid ACK from destination
|
|
NACKED = 2, // explicitly failed
|
|
TIMEOUT = 3, // no ACK after retry window
|
|
RELAYED = 4 // got an ACK from relay, not destination
|
|
};
|
|
|
|
struct StoredMessage {
|
|
uint32_t timestamp; // When message was created (secs since boot or RTC)
|
|
uint32_t sender; // NodeNum of sender
|
|
uint8_t channelIndex; // Channel index used
|
|
uint32_t dest; // Destination node (broadcast or direct)
|
|
MessageType type; // Derived from dest (explicit classification)
|
|
bool isBootRelative; // true = millis()/1000 fallback; false = epoch/RTC absolute
|
|
AckStatus ackStatus; // Delivery status (only meaningful for our own sent messages)
|
|
|
|
// Text storage metadata - rebuilt from flash at boot
|
|
uint16_t textOffset; // Offset into global text pool (valid only after loadFromFlash())
|
|
uint16_t textLength; // Length of text in bytes
|
|
|
|
bool xeddsaSigned; // true if packet carried a verified XEdDSA signature
|
|
|
|
// Default constructor initializes all fields safely
|
|
StoredMessage()
|
|
: timestamp(0), sender(0), channelIndex(0), dest(0xffffffff), type(MessageType::BROADCAST), isBootRelative(false),
|
|
ackStatus(AckStatus::NONE), textOffset(0), textLength(0), xeddsaSigned(false)
|
|
{
|
|
}
|
|
};
|
|
|
|
class MessageStore
|
|
{
|
|
public:
|
|
explicit MessageStore(const std::string &label);
|
|
|
|
// Live RAM methods (always current, used by UI and runtime)
|
|
void addLiveMessage(StoredMessage &&msg);
|
|
void addLiveMessage(const StoredMessage &msg); // convenience overload
|
|
const std::deque<StoredMessage> &getLiveMessages() const { return liveMessages; }
|
|
|
|
// Add new messages from packets or manual input
|
|
const StoredMessage &addFromPacket(const meshtastic_MeshPacket &mp); // Incoming/outgoing → RAM only
|
|
void addFromString(uint32_t sender, uint8_t channelIndex, const std::string &text); // Manual add
|
|
|
|
// Persistence methods (used only on boot/shutdown)
|
|
void saveToFlash(); // Save messages to flash
|
|
void loadFromFlash(); // Load messages from flash
|
|
|
|
// Clear all messages (RAM + persisted queue + text pool)
|
|
void clearAllMessages();
|
|
|
|
// Delete helpers
|
|
void deleteOldestMessage(); // remove oldest from RAM (and flash on save)
|
|
void deleteOldestMessageInChannel(uint8_t channel);
|
|
void deleteOldestMessageWithPeer(uint32_t peer);
|
|
void deleteAllMessagesInChannel(uint8_t channel);
|
|
void deleteAllMessagesWithPeer(uint32_t peer);
|
|
|
|
// Unified accessor (for UI code, defaults to RAM buffer)
|
|
const std::deque<StoredMessage> &getMessages() const { return liveMessages; }
|
|
|
|
// Helper filters for future use
|
|
std::deque<StoredMessage> getChannelMessages(uint8_t channel) const; // Only broadcast messages on a channel
|
|
std::deque<StoredMessage> getDirectMessages() const; // Only direct messages
|
|
|
|
// Upgrade boot-relative timestamps once RTC is valid
|
|
void upgradeBootRelativeTimestamps();
|
|
|
|
// Retrieve the C-string text for a stored message
|
|
static const char *getText(const StoredMessage &msg);
|
|
|
|
// Allocate text into pool (used by sender-side code)
|
|
static uint16_t storeText(const char *src, size_t len);
|
|
|
|
private:
|
|
std::deque<StoredMessage> liveMessages; // Single in-RAM message buffer (also used for persistence)
|
|
std::string filename; // Flash filename for persistence
|
|
};
|
|
|
|
#if ENABLE_MESSAGE_PERSISTENCE
|
|
// Called periodically from main loop to trigger time based autosave
|
|
void messageStoreAutosaveTick();
|
|
#endif
|
|
|
|
// Global instance (defined in MessageStore.cpp)
|
|
extern MessageStore messageStore;
|
|
|
|
#endif
|