rbxii3/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2026-01-07 02:18:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add channel name instead of channel slot

Browse Source
This commit is contained in:
HarukiToreda
2025-09-22 20:10:05 -04:00
parent abcc166f3a
commit 3d8b4a68b8
4 changed files with 28 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/modules/CannedMessageModule.cpp
View File

@@ -198,13 +198,13 @@ void CannedMessageModule::drawHeader(OLEDDisplay *display, int16_t x, int16_t y,
{
if (graphics::isHighResolution) {
if (this->dest == NODENUM_BROADCAST) {
display->drawStringf(x, y, buffer, "To: Broadcast@%s", channels.getName(this->channel));
display->drawStringf(x, y, buffer, "To: Broadcast#%s", channels.getName(this->channel));
} else {
display->drawStringf(x, y, buffer, "To: %s", getNodeName(this->dest));
}
} else {
if (this->dest == NODENUM_BROADCAST) {
display->drawStringf(x, y, buffer, "To: Broadc@%.5s", channels.getName(this->channel));
display->drawStringf(x, y, buffer, "To: Broadc#%.5s", channels.getName(this->channel));
} else {
display->drawStringf(x, y, buffer, "To: %s", getNodeName(this->dest));
}
@@ -645,7 +645,7 @@ bool CannedMessageModule::handleMessageSelectorInput(const InputEvent *event, bo
if (osk_found && screen) {
char headerBuffer[64];
if (this->dest == NODENUM_BROADCAST) {
snprintf(headerBuffer, sizeof(headerBuffer), "To: Broadcast@%s", channels.getName(this->channel));
snprintf(headerBuffer, sizeof(headerBuffer), "To: Broadcast#%s", channels.getName(this->channel));
} else {
snprintf(headerBuffer, sizeof(headerBuffer), "To: %s", getNodeName(this->dest));
}
@@ -1562,7 +1562,7 @@ void CannedMessageModule::drawDestinationSelectionScreen(OLEDDisplay *display, O
// Draw Channels First
if (itemIndex < numActiveChannels) {
uint8_t channelIndex = this->activeChannelIndices[itemIndex];
snprintf(entryText, sizeof(entryText), "@%s", channels.getName(channelIndex));
snprintf(entryText, sizeof(entryText), "#%s", channels.getName(channelIndex));
}
// Then Draw Nodes
else {