Merge pull request #666 from thingsconnected/pullreq9

mluis1 · web-flow · commit de1640c62d97 · 2019-02-08T14:07:40.000+01:00
LoRaMacFCntHandler: changed initialization order
diff --git a/src/mac/LoRaMacFCntHandler.c b/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;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -106,12 +106,12 @@ static void NvmCtxChanged( void )`
`106`	`106`
`107`	`107`	`LoRaMacFCntHandlerStatus_t LoRaMacFCntHandlerInit( EventNvmCtxChanged fCntHandlerNvmCtxChanged )`
`108`	`108`	`{`
`109`		`- // Initialize with default`
`110`		`- LoRaMacResetFCnts( );`
`111`		`-`
`112`	`109`	`// Assign callback`
`113`	`110`	`FCntHandlerNvmCtxChanged = fCntHandlerNvmCtxChanged;`
`114`	`111`
	`112`	`+ // Initialize with default`
	`113`	`+ LoRaMacResetFCnts( );`
	`114`	`+`
`115`	`115`	`return LORAMAC_FCNT_HANDLER_SUCCESS;`
`116`	`116`	`}`
`117`	`117`