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

Fix for "has default channel" with empty channel name (#4430)

Browse Source
This commit is contained in:
GUVWAF
2024-08-09 22:26:22 +02:00
committed by GitHub
parent 3878e025e4
commit debf4b934f
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/mesh/Channels.cpp
View File

@@ -309,12 +309,14 @@ const char *Channels::getName(size_t chIndex)
return channelName;
}
bool Channels::isDefaultChannel(const meshtastic_Channel &ch)
bool Channels::isDefaultChannel(ChannelIndex chIndex)
{
const auto &ch = getByIndex(chIndex);
if (ch.settings.psk.size == 1 && ch.settings.psk.bytes[0] == 1) {
const char *name = getName(chIndex);
const char *presetName = DisplayFormatters::getModemPresetDisplayName(config.lora.modem_preset, false);
// Check if the name is the default derived from the modem preset
if (strcmp(ch.settings.name, presetName) == 0)
if (strcmp(name, presetName) == 0)
return true;
}
return false;
@@ -327,8 +329,7 @@ bool Channels::hasDefaultChannel()
return false;
// Check if any of the channels are using the default name and PSK
for (size_t i = 0; i < getNumChannels(); i++) {
const auto &ch = getByIndex(i);
if (isDefaultChannel(ch))
if (isDefaultChannel(i))
return true;
}
return false;