Merge pull request #3 from Lora-net/develop

attempt to get in sync

Author: mvds00

src/mac/LoRaMacFCntHandler.c

@@ -106,12 +106,12 @@ static void NvmCtxChanged( void )
 
 LoRaMacFCntHandlerStatus_t LoRaMacFCntHandlerInit( EventNvmCtxChanged fCntHandlerNvmCtxChanged )
 {
-    // Initialize with default
-    LoRaMacResetFCnts( );
-
     // Assign callback
     FCntHandlerNvmCtxChanged = fCntHandlerNvmCtxChanged;
 
+    // Initialize with default
+    LoRaMacResetFCnts( );
+
     return LORAMAC_FCNT_HANDLER_SUCCESS;
 }
 

src/mac/region/RegionAU915.h

@@ -292,7 +292,7 @@ static const int8_t DatarateOffsetsAU915[7][6] =
  * Maximum payload with respect to the datarate index. Cannot operate with repeater.
  * The table is valid for the dwell time configuration of 0 for uplinks.
  */
-static const uint8_t MaxPayloadOfDatarateDwell0AU915[] = { 51, 51, 51, 115, 242, 242, 242, 242, 0, 53, 129, 242, 242, 242, 242 };
+static const uint8_t MaxPayloadOfDatarateDwell0AU915[] = { 51, 51, 51, 115, 242, 242, 242, 0, 53, 129, 242, 242, 242, 242 };
 
 /*!
  * Maximum payload with respect to the datarate index. Can operate with repeater.
@@ -305,14 +305,14 @@ static const uint8_t MaxPayloadOfDatarateRepeaterDwell0AU915[] = { 51, 51, 51, 1
  * Maximum payload with respect to the datarate index. Cannot operate with repeater.
  * The table is valid for the dwell time configuration of 1 for uplinks.
  */
-static const uint8_t MaxPayloadOfDatarateDwell1AU915[] = { 0, 0, 11, 53, 125, 242, 242, 0, 53, 129, 129, 242, 242, 242, 242 };
+static const uint8_t MaxPayloadOfDatarateDwell1AU915[] = { 0, 0, 11, 53, 125, 242, 242, 0, 53, 129, 242, 242, 242, 242 };
 
 /*!
  * Maximum payload with respect to the datarate index. Can operate with repeater.
  * The table is valid for the dwell time configuration of 1 for uplinks. The table provides
  * repeater support.
  */
-static const uint8_t MaxPayloadOfDatarateRepeaterDwell1AU915[] = { 0, 0, 11, 53, 125, 242, 242, 0, 33, 119, 129, 242, 242, 242, 242 };
+static const uint8_t MaxPayloadOfDatarateRepeaterDwell1AU915[] = { 0, 0, 11, 53, 125, 242, 242, 0, 33, 109, 222, 222, 222, 222 };
 
 /*!
  * \brief The function gets a value of a specific phy attribute.

src/radio/sx126x/sx126x.c

@@ -632,7 +632,7 @@ void SX126xSetCadParams( RadioLoRaCadSymbols_t cadSymbolNum, uint8_t cadDetPeak,
     buf[4] = ( uint8_t )( ( cadTimeout >> 16 ) & 0xFF );
     buf[5] = ( uint8_t )( ( cadTimeout >> 8 ) & 0xFF );
     buf[6] = ( uint8_t )( cadTimeout & 0xFF );
-    SX126xWriteCommand( RADIO_SET_CADPARAMS, buf, 5 );
+    SX126xWriteCommand( RADIO_SET_CADPARAMS, buf, 7 );
     SX126xSetOperatingMode( MODE_CAD );
 }