Diff: LoRaMac.cpp

Branch:

SenetNetTool

Revision:

31:930f949fdd9e

Parent:

30:0926a366a2c5

Child:

43:eed39925bade

Child:

49:8b9e6442a02a

--- a/LoRaMac.cpp	Tue Dec 13 21:44:00 2016 +0000
+++ b/LoRaMac.cpp	Thu Aug 03 14:51:24 2017 -0400
@@ -2268,21 +2268,8 @@
 
 static int8_t LimitTxPower( int8_t txPower )
 {
-    int8_t resultTxPower = txPower;
-#if defined( USE_BAND_915 ) || defined( USE_BAND_915_HYBRID )
-    if( ( ChannelsDatarate == DR_4 ) ||
-        ( ( ChannelsDatarate >= DR_8 ) && ( ChannelsDatarate <= DR_13 ) ) )
-    {// Limit tx power to max 26dBm
-        resultTxPower =  MAX( txPower, TX_POWER_26_DBM );
-    }
-    else
-    {
-        if( CountNbEnabled125kHzChannels( ChannelsMask ) < FRQ_HOP_CHNLS_MIN )
-        {// Limit tx power to max 21dBm
-            resultTxPower = MAX( txPower, TX_POWER_20_DBM );
-        }
-    }
-#endif
+    int8_t resultTxPower =  MAX( txPower, TX_POWER_30_DBM );
+
     return resultTxPower;
 }