pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-08-13 08:45:04 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

make default power level radio chipset specific

Browse Source
This commit is contained in:
geeksville 2020-09-15 17:55:33 -07:00
parent 313cee9a3f
commit 31fc8fafec
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/mesh/RF95Interface.cpp
View File

@ -6,6 +6,8 @@
#define MAX_POWER 17 #define MAX_POWER 17
// if we use 20 we are limited to 1% duty cycle or hw might overheat. For continuous operation set a limit of 17 // if we use 20 we are limited to 1% duty cycle or hw might overheat. For continuous operation set a limit of 17
#define POWER_DEFAULT 17 // How much power to use if the user hasn't set a power level
RF95Interface::RF95Interface(RADIOLIB_PIN_TYPE cs, RADIOLIB_PIN_TYPE irq, RADIOLIB_PIN_TYPE rst, SPIClass &spi) RF95Interface::RF95Interface(RADIOLIB_PIN_TYPE cs, RADIOLIB_PIN_TYPE irq, RADIOLIB_PIN_TYPE rst, SPIClass &spi)
: RadioLibInterface(cs, irq, rst, 0, spi) : RadioLibInterface(cs, irq, rst, 0, spi)
{ {
@ -32,6 +34,10 @@ bool RF95Interface::init()
RadioLibInterface::init(); RadioLibInterface::init();
applyModemConfig(); applyModemConfig();
if (power == 0)
power = POWER_DEFAULT;
if (power > MAX_POWER) // This chip has lower power limits than some if (power > MAX_POWER) // This chip has lower power limits than some
power = MAX_POWER; power = MAX_POWER;

4
src/mesh/RadioInterface.cpp
View File

@ -118,8 +118,6 @@ unsigned long hash(char *str)
return hash; return hash;
} }
#define POWER_DEFAULT 17
/** /**
* Pull our channel settings etc... from protobufs to the dumb interface settings * Pull our channel settings etc... from protobufs to the dumb interface settings
*/ */
@ -129,8 +127,6 @@ void RadioInterface::applyModemConfig()
// No Sync Words in LORA mode // No Sync Words in LORA mode
power = channelSettings.tx_power; power = channelSettings.tx_power;
if (power == 0)
power = POWER_DEFAULT;
// If user has manually specified a channel num, then use that, otherwise generate one by hashing the name // If user has manually specified a channel num, then use that, otherwise generate one by hashing the name
int channel_num = (channelSettings.channel_num ? channelSettings.channel_num - 1 : hash(channelSettings.name)) % NUM_CHANNELS; int channel_num = (channelSettings.channel_num ? channelSettings.channel_num - 1 : hash(channelSettings.name)) % NUM_CHANNELS;

4
src/mesh/SX1262Interface.cpp
View File

@ -37,6 +37,10 @@ bool SX1262Interface::init()
bool useRegulatorLDO = false; // Seems to depend on the connection to pin 9/DCC_SW - if an inductor DCDC? bool useRegulatorLDO = false; // Seems to depend on the connection to pin 9/DCC_SW - if an inductor DCDC?
applyModemConfig(); applyModemConfig();
if (power == 0)
power = 22;
if (power > 22) // This chip has lower power limits than some if (power > 22) // This chip has lower power limits than some
power = 22; power = 22;
int res = lora.begin(freq, bw, sf, cr, syncWord, power, currentLimit, preambleLength, tcxoVoltage, useRegulatorLDO); int res = lora.begin(freq, bw, sf, cr, syncWord, power, currentLimit, preambleLength, tcxoVoltage, useRegulatorLDO);