mirror of
https://github.com/meshtastic/firmware.git
synced 2025-02-02 02:39:57 +00:00
Merge branch 'master' into prefer-repeaters-too
This commit is contained in:
commit
27bd4fa32e
@ -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
|
||||||
|
Loading…
Reference in New Issue
Block a user