Merge branch 'master' into prefer-repeaters-too

This commit is contained in:
Ben Meadors 2023-01-30 10:53:44 -06:00 committed by GitHub
commit 27bd4fa32e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -106,9 +106,6 @@ ErrorCode RadioLibInterface::send(meshtastic_MeshPacket *p)
#ifndef DISABLE_WELCOME_UNSET
if (config.lora.region != meshtastic_Config_LoRaConfig_RegionCode_UNSET) {
if (disabled || !config.lora.tx_enabled) {
if (config.lora.region != meshtastic_Config_LoRaConfig_RegionCode_UNSET) {
if (disabled || !config.lora.tx_enabled) {
LOG_WARN("send - !config.lora.tx_enabled\n");
@ -121,8 +118,6 @@ ErrorCode RadioLibInterface::send(meshtastic_MeshPacket *p)
packetPool.release(p);
return ERRNO_DISABLED;
}
}
}
#else