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

Fix erroneous limiting of power in Ham Mode

Browse Source 
Ham Mode ignores region regulatory limits, so regardless of whether
we set a single TX_GAIN_LORA or an array with a non-linear PA,
we shouldn't limit the power.
This commit is contained in:
Tom Fifield 2025-10-13 09:16:07 +11:00
parent 7537d28419
commit 653c1876e6
No known key found for this signature in database
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/mesh/RadioInterface.cpp
View File

@ -647,23 +647,24 @@ void RadioInterface::limitPower(int8_t loraMaxPower)
} }
#ifndef NUM_PA_POINTS #ifndef NUM_PA_POINTS
if (TX_GAIN_LORA > 0) { if (TX_GAIN_LORA > 0 && !devicestate.owner.is_licensed) {
LOG_INFO("Requested Tx power: %d dBm; Device LoRa Tx gain: %d dB", power, TX_GAIN_LORA); LOG_INFO("Requested Tx power: %d dBm; Device LoRa Tx gain: %d dB", power, TX_GAIN_LORA);
power -= TX_GAIN_LORA; power -= TX_GAIN_LORA;
} }
#else #else
// we have an array of PA gain values. Find the highest power setting that works. if (!devicestate.owner.is_licensed) {
const uint16_t tx_gain[NUM_PA_POINTS] = {TX_GAIN_LORA}; // we have an array of PA gain values. Find the highest power setting that works.
for (int radio_dbm = 0; radio_dbm < NUM_PA_POINTS; radio_dbm++) { const uint16_t tx_gain[NUM_PA_POINTS] = {TX_GAIN_LORA};
if (((radio_dbm + tx_gain[radio_dbm]) > power) || for (int radio_dbm = 0; radio_dbm < NUM_PA_POINTS; radio_dbm++) {
((radio_dbm == (NUM_PA_POINTS - 1)) && ((radio_dbm + tx_gain[radio_dbm]) <= power))) { if (((radio_dbm + tx_gain[radio_dbm]) > power) ||
// we've exceeded the power limit, or hit the max we can do ((radio_dbm == (NUM_PA_POINTS - 1)) && ((radio_dbm + tx_gain[radio_dbm]) <= power))) {
LOG_INFO("Requested Tx power: %d dBm; Device LoRa Tx gain: %d dB", power, tx_gain[radio_dbm]); // we've exceeded the power limit, or hit the max we can do
power -= tx_gain[radio_dbm]; LOG_INFO("Requested Tx power: %d dBm; Device LoRa Tx gain: %d dB", power, tx_gain[radio_dbm]);
break; power -= tx_gain[radio_dbm];
break;
}
} }
} }
#endif #endif
if (power > loraMaxPower) // Clamp power to maximum defined level if (power > loraMaxPower) // Clamp power to maximum defined level
power = loraMaxPower; power = loraMaxPower;