Update implementation to restore the default channelsmask after a join request

Author: mluis1

src/mac/LoRaMac.c

@@ -2112,6 +2112,9 @@ static void ResetMacParameters( void )
     LoRaMacParams.MaxEirp = LoRaMacParamsDefaults.MaxEirp;
     LoRaMacParams.AntennaGain = LoRaMacParamsDefaults.AntennaGain;
 
+    // Reset to application defaults
+    RegionInitDefaults( LoRaMacRegion, INIT_TYPE_APP_DEFAULTS );
+
     NodeAckRequested = false;
     SrvAckRequested = false;
     MacCommandsInNextTx = false;

src/mac/region/Region.h

@@ -659,13 +659,19 @@ typedef enum ePhyAttribute
 typedef enum eInitType
 {
     /*!
-     * Performs an initialization and overwrites all existing data.
+     * Initializes the region specific data to defaults, according to the
+     * LoRaWAN specification.
      */
     INIT_TYPE_INIT,
     /*!
-     * Restores default channels only.
+     * Restores default channels defined by the LoRaWAN specification only.
      */
-    INIT_TYPE_RESTORE
+    INIT_TYPE_RESTORE,
+    /*!
+     * Initializes the region specific data to the defaults which were set by
+     * the application.
+     */
+    INIT_TYPE_APP_DEFAULTS
 }InitType_t;
 
 typedef enum eChannelsMask

src/mac/region/RegionAS923.c

@@ -363,6 +363,12 @@ void RegionAS923InitDefaults( InitType_t type )
             ChannelsMask[0] |= ChannelsDefaultMask[0];
             break;
         }
+        case INIT_TYPE_APP_DEFAULTS:
+        {
+            // Update the channels mask defaults
+            RegionCommonChanMaskCopy( ChannelsMask, ChannelsDefaultMask, 1 );
+            break;
+        }
         default:
         {
             break;

src/mac/region/RegionAU915.c

@@ -333,6 +333,15 @@ void RegionAU915InitDefaults( InitType_t type )
             }
             break;
         }
+        case INIT_TYPE_APP_DEFAULTS:
+        {
+            // Copy channels default mask
+            RegionCommonChanMaskCopy( ChannelsMask, ChannelsDefaultMask, 6 );
+
+            // Copy into channels mask remaining
+            RegionCommonChanMaskCopy( ChannelsMaskRemaining, ChannelsMask, 6 );
+            break;
+        }
         default:
         {
             break;

src/mac/region/RegionCN470.c

@@ -313,6 +313,12 @@ void RegionCN470InitDefaults( InitType_t type )
             RegionCommonChanMaskCopy( ChannelsMask, ChannelsDefaultMask, 6 );
             break;
         }
+        case INIT_TYPE_APP_DEFAULTS:
+        {
+            // Update the channels mask defaults
+            RegionCommonChanMaskCopy( ChannelsMask, ChannelsDefaultMask, 6 );
+            break;
+        }
         default:
         {
             break;

src/mac/region/RegionCN779.c

@@ -325,6 +325,12 @@ void RegionCN779InitDefaults( InitType_t type )
             ChannelsMask[0] |= ChannelsDefaultMask[0];
             break;
         }
+        case INIT_TYPE_APP_DEFAULTS:
+        {
+            // Update the channels mask defaults
+            RegionCommonChanMaskCopy( ChannelsMask, ChannelsDefaultMask, 1 );
+            break;
+        }
         default:
         {
             break;

src/mac/region/RegionEU433.c

@@ -325,6 +325,12 @@ void RegionEU433InitDefaults( InitType_t type )
             ChannelsMask[0] |= ChannelsDefaultMask[0];
             break;
         }
+        case INIT_TYPE_APP_DEFAULTS:
+        {
+            // Update the channels mask defaults
+            RegionCommonChanMaskCopy( ChannelsMask, ChannelsDefaultMask, 1 );
+            break;
+        }
         default:
         {
             break;

src/mac/region/RegionEU868.c

@@ -354,6 +354,12 @@ void RegionEU868InitDefaults( InitType_t type )
             ChannelsMask[0] |= ChannelsDefaultMask[0];
             break;
         }
+        case INIT_TYPE_APP_DEFAULTS:
+        {
+            // Update the channels mask defaults
+            RegionCommonChanMaskCopy( ChannelsMask, ChannelsDefaultMask, 1 );
+            break;
+        }
         default:
         {
             break;

src/mac/region/RegionIN865.c

@@ -329,6 +329,12 @@ void RegionIN865InitDefaults( InitType_t type )
             ChannelsMask[0] |= ChannelsDefaultMask[0];
             break;
         }
+        case INIT_TYPE_APP_DEFAULTS:
+        {
+            // Update the channels mask defaults
+            RegionCommonChanMaskCopy( ChannelsMask, ChannelsDefaultMask, 1 );
+            break;
+        }
         default:
         {
             break;

src/mac/region/RegionKR920.c

@@ -348,6 +348,12 @@ void RegionKR920InitDefaults( InitType_t type )
             ChannelsMask[0] |= ChannelsDefaultMask[0];
             break;
         }
+        case INIT_TYPE_APP_DEFAULTS:
+        {
+            // Update the channels mask defaults
+            RegionCommonChanMaskCopy( ChannelsMask, ChannelsDefaultMask, 1 );
+            break;
+        }
         default:
         {
             break;