rbxii3/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-12-20 17:52:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix for DM threading

Browse Source
This commit is contained in:
HarukiToreda
2025-09-22 21:07:52 -04:00
parent 8040bb20b4
commit 4e61016a44
4 changed files with 41 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/graphics/draw/MessageRenderer.cpp
View File

@@ -192,12 +192,12 @@ void resetScrollState()
didReset = false; // <-- now valid
}
// --- Current thread state ---
// Current thread state
static ThreadMode currentMode = ThreadMode::ALL;
static int currentChannel = -1;
static uint32_t currentPeer = 0;
// --- Registry of seen threads for manual toggle ---
// Registry of seen threads for manual toggle
static std::vector<int> seenChannels;
static std::vector<uint32_t> seenPeers;
@@ -270,7 +270,7 @@ void drawTextMessageFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16
include = true;
break;
case ThreadMode::DIRECT:
if (m.type == MessageType::DM_TO_US && m.sender == currentPeer)
if (m.type == MessageType::DM_TO_US && (m.sender == currentPeer || m.dest == currentPeer))
include = true;
break;
}
@@ -344,7 +344,7 @@ void drawTextMessageFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16
for (auto it = filtered.rbegin(); it != filtered.rend(); ++it) {
const auto &m = *it;
// --- Build header line for this message ---
// Build header line for this message
meshtastic_NodeInfoLite *node = nodeDB->getMeshNode(m.sender);
const char *sender = "???";
#if defined(M5STACK_UNITC6L)
@@ -408,7 +408,7 @@ void drawTextMessageFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16
isMine.push_back(mine);
isHeader.push_back(true);
// --- Split message text into wrapped lines ---
// Split message text into wrapped lines
std::vector<std::string> wrapped = generateLines(display, "", m.text.c_str(), textWidth);
for (auto &ln : wrapped) {
allLines.push_back(ln);