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

@ -108,20 +108,15 @@ ErrorCode RadioLibInterface::send(meshtastic_MeshPacket *p)
if (config.lora.region != meshtastic_Config_LoRaConfig_RegionCode_UNSET) { if (config.lora.region != meshtastic_Config_LoRaConfig_RegionCode_UNSET) {
if (disabled || !config.lora.tx_enabled) { if (disabled || !config.lora.tx_enabled) {
LOG_WARN("send - !config.lora.tx_enabled\n");
if (config.lora.region != meshtastic_Config_LoRaConfig_RegionCode_UNSET) { packetPool.release(p);
if (disabled || !config.lora.tx_enabled) { return ERRNO_DISABLED;
LOG_WARN("send - !config.lora.tx_enabled\n");
packetPool.release(p);
return ERRNO_DISABLED;
}
} else {
LOG_WARN("send - lora tx disable because RegionCode_Unset\n");
packetPool.release(p);
return ERRNO_DISABLED;
}
} }
} else {
LOG_WARN("send - lora tx disable because RegionCode_Unset\n");
packetPool.release(p);
return ERRNO_DISABLED;
} }
#else #else