Merge pull request #3 from meshtastic/master

Update from meshtastic main

src/mesh/RF95Interface.cpp

@@ -3,9 +3,11 @@
 #include "RadioLibRF95.h"
 #include <configuration.h>
 
-#define MAX_POWER 17
+#define MAX_POWER 20
 // 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)
     : RadioLibInterface(cs, irq, rst, 0, spi)
 {
@@ -32,6 +34,10 @@ bool RF95Interface::init()
     RadioLibInterface::init();
 
     applyModemConfig();
+
+    if (power == 0)
+        power = POWER_DEFAULT;
+
     if (power > MAX_POWER) // This chip has lower power limits than some
         power = MAX_POWER;
 

src/mesh/RadioInterface.cpp

@@ -118,8 +118,6 @@ unsigned long hash(char *str)
     return hash;
 }
 
-#define POWER_DEFAULT 17
-
 /**
  * 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
 
     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
     int channel_num = (channelSettings.channel_num ? channelSettings.channel_num - 1 : hash(channelSettings.name)) % NUM_CHANNELS;

src/mesh/SX1262Interface.cpp

@@ -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?
 
     applyModemConfig();
+
+    if (power == 0)
+        power = 22;
+
     if (power > 22) // This chip has lower power limits than some
         power = 22;
     int res = lora.begin(freq, bw, sf, cr, syncWord, power, currentLimit, preambleLength, tcxoVoltage, useRegulatorLDO);