pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-10-27 15:02:41 +00:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Merge 0be6b2d127 into 35fa418739

Browse Source
This commit is contained in:
Tom Fifield 2025-10-23 13:46:36 -04:00 committed by GitHub
commit 1b52ca7e42
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/mesh/Channels.cpp
View File

@ -134,7 +134,11 @@ void Channels::initDefaultChannel(ChannelIndex chIndex)
channelSettings.psk.bytes[0] = defaultpskIndex;
channelSettings.psk.size = 1;
strncpy(channelSettings.name, "", sizeof(channelSettings.name));
if (config.device.role == meshtastic_Config_DeviceConfig_Role_LOST_AND_FOUND) {
channelSettings.module_settings.position_precision = 32; // lost and found defaults to full precision
} else {
channelSettings.module_settings.position_precision = 13; // default to sending location on the primary channel
}
channelSettings.has_module_settings = true;
ch.has_settings = true;

3
src/mesh/FloodingRouter.cpp
View File

@ -118,6 +118,7 @@ void FloodingRouter::perhapsCancelDupe(const meshtastic_MeshPacket *p)
bool FloodingRouter::isRebroadcaster()
{
return config.device.role != meshtastic_Config_DeviceConfig_Role_CLIENT_MUTE &&
config.device.role != meshtastic_Config_DeviceConfig_Role_LOST_AND_FOUND &&
config.device.rebroadcast_mode != meshtastic_Config_DeviceConfig_RebroadcastMode_NONE;
}
@ -148,7 +149,7 @@ void FloodingRouter::perhapsRebroadcast(const meshtastic_MeshPacket *p)
// Note: we are careful to resend using the original senders node id
send(tosend);
} else {
LOG_DEBUG("No rebroadcast: Role = CLIENT_MUTE or Rebroadcast Mode = NONE");
LOG_DEBUG("No rebroadcast: CLIENT_MUTE/LOST_AND_FOUND or Rebroadcast Mode = NONE");
}
} else {
LOG_DEBUG("Ignore 0 id broadcast");