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

properly route messages to phone again

Browse Source
This commit is contained in:
Kevin Hester
2021-02-23 14:35:34 +08:00
parent aa8b86c6b2
commit f8d8dc25c0
7 changed files with 31 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/mesh/Channels.cpp
View File

@@ -28,9 +28,8 @@ int16_t Channels::generateHash(ChannelIndex channelNum)
if (k.length < 0)
return -1; // invalid
else {
Channel &c = getByIndex(channelNum);
uint8_t h = xorHash((const uint8_t *)c.settings.name, strlen(c.settings.name));
const char *name = getName(channelNum);
uint8_t h = xorHash((const uint8_t *) name, strlen(name));
h ^= xorHash(k.bytes, k.length);
@@ -253,7 +252,7 @@ const char *Channels::getPrimaryName()
static char buf[32];
char suffix;
auto channelSettings = getPrimary();
// auto channelSettings = getPrimary();
// if (channelSettings.psk.size != 1) {
// We have a standard PSK, so generate a letter based hash.
uint8_t code = getHash(primaryIndex);
@@ -263,7 +262,7 @@ const char *Channels::getPrimaryName()
suffix = '0' + channelSettings.psk.bytes[0];
} */
snprintf(buf, sizeof(buf), "#%s-%c", channelSettings.name, suffix);
snprintf(buf, sizeof(buf), "#%s-%c", getName(primaryIndex), suffix);
return buf;
}