Merge branch 'master' into develop

Author: mluis1

src/mac/LoRaMacCommands.c

@@ -443,8 +443,6 @@ LoRaMacCommandStatus_t LoRaMacCommandsRemoveNoneStickyCmds( void )
         }
     }
 
-    NvmCtxCallback( );
-
     return LORAMAC_COMMANDS_SUCCESS;
 }
 
@@ -467,8 +465,6 @@ LoRaMacCommandStatus_t LoRaMacCommandsRemoveStickyAnsCmds( void )
         curElement = nexElement;
     }
 
-    NvmCtxCallback( );
-
     return LORAMAC_COMMANDS_SUCCESS;
 }
 

src/mac/region/RegionAU915.h

@@ -88,7 +88,7 @@ extern "C"
 /*!
  * Maximal Rx1 receive datarate offset
  */
-#define AU915_MAX_RX1_DR_OFFSET                     6
+#define AU915_MAX_RX1_DR_OFFSET                     5
 
 /*!
  * Minimal Tx output power that can be used by the node

src/mac/region/RegionCommon.c

@@ -337,7 +337,7 @@ TimerTime_t RegionCommonUpdateBandTimeOff( bool joined, Band_t* bands,
         // when the duty cycle is off, or the TimeCredits of the band
         // is higher than the credit costs for the transmission.
         if( ( bands[i].TimeCredits > creditCosts ) ||
-            ( dutyCycleEnabled == false ) )
+            ( ( dutyCycleEnabled == false ) && ( joined == true ) ) )
         {
             bands[i].ReadyForTransmission = true;
             // This band is a potential candidate for an
@@ -350,24 +350,22 @@ TimerTime_t RegionCommonUpdateBandTimeOff( bool joined, Band_t* bands,
             // for the next transmission.
             bands[i].ReadyForTransmission = false;
 
-            // Differentiate the calculation if the device is joined or not.
-            if( joined == true )
+            if( bands[i].MaxTimeCredits > creditCosts )
             {
-                if( bands[i].MaxTimeCredits > creditCosts )
-                {
-                    // The band can only be taken into account, if the maximum credits
-                    // of the band are higher than the credit costs.
-                    // We calculate the minTimeToWait among the bands which are not
-                    // ready for transmission and which are potentially available
-                    // for a transmission in the future.
-                    minTimeToWait = MIN( minTimeToWait, ( creditCosts - bands[i].TimeCredits ) );
-                    // This band is a potential candidate for an
-                    // upcoming transmission (even if its time credits are not enough
-                    // at the moment), so increase the counter.
-                    validBands++;
-                }
+                // The band can only be taken into account, if the maximum credits
+                // of the band are higher than the credit costs.
+                // We calculate the minTimeToWait among the bands which are not
+                // ready for transmission and which are potentially available
+                // for a transmission in the future.
+                minTimeToWait = MIN( minTimeToWait, ( creditCosts - bands[i].TimeCredits ) );
+                // This band is a potential candidate for an
+                // upcoming transmission (even if its time credits are not enough
+                // at the moment), so increase the counter.
+                validBands++;
             }
-            else
+
+            // Apply a special calculation if the device is not joined.
+            if( joined == false )
             {
                 SysTime_t backoffTimeRange = {
                     .Seconds    = 0,