Senet / LoRaWAN-lib

Fork of Semtech LoRaWAN stack

Fork of LoRaWAN-lib by canuck lehead

Files at this revision

API Documentation at this revision

Revision 31:930f949fdd9e, committed 2017-08-03

Comitter:
Shaun Nelson
Date:
Thu Aug 03 14:51:24 2017 -0400
Branch:
SenetNetTool
Parent:
30:0926a366a2c5
Child:
36:fc9baa35ae1a
Commit message:
Removed Tx Power limits for Senet Network tool

Changed in this revision

LoRaMac-board.h Show annotated file Show diff for this revision Revisions of this file
LoRaMac.cpp Show annotated file Show diff for this revision Revisions of this file 
--- a/LoRaMac-board.h	Tue Dec 13 21:44:00 2016 +0000
+++ b/LoRaMac-board.h	Thu Aug 03 14:51:24 2017 -0400
@@ -432,7 +432,7 @@
 /*!
  * Default Tx output power used by the node
  */
-#define LORAMAC_DEFAULT_TX_POWER                    TX_POWER_20_DBM
+#define LORAMAC_DEFAULT_TX_POWER                    TX_POWER_30_DBM
 
 /*!
  * LoRaMac TxPower definition

--- 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;
 }