sundp
/
STM32CubeWL
mirror of https://github.com/STMicroelectronics/STM32CubeWL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add return status for LmHandlerJoin function

This commit is contained in:
Maxime JOURDAN 2023-04-03 19:08:05 +02:00
parent 2ccbb7479f
commit 78bc3c4a6d
2 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Middlewares/Third_Party/LoRaWAN/LmHandler/LmHandler.c vendored
View File

@ -589,8 +589,10 @@ TimerTime_t LmHandlerGetDutyCycleWaitTime( void )
return DutyCycleWaitTime; return DutyCycleWaitTime;
} }
void LmHandlerJoin( ActivationType_t mode, bool forceRejoin ) LmHandlerErrorStatus_t LmHandlerJoin( ActivationType_t mode, bool forceRejoin )
{ {
LmHandlerErrorStatus_t lmhStatus = LORAMAC_HANDLER_ERROR;
LoRaMacStatus_t status;
MlmeReq_t mlmeReq; MlmeReq_t mlmeReq;
mlmeReq.Type = MLME_JOIN; mlmeReq.Type = MLME_JOIN;
@ -605,7 +607,12 @@ void LmHandlerJoin( ActivationType_t mode, bool forceRejoin )
LoRaMacStart(); LoRaMacStart();
#if (defined( LORAMAC_VERSION ) && ( LORAMAC_VERSION == 0x01000300 )) #if (defined( LORAMAC_VERSION ) && ( LORAMAC_VERSION == 0x01000300 ))
/* Starts the OTAA join procedure */ /* Starts the OTAA join procedure */
LoRaMacMlmeRequest( &mlmeReq ); status = LoRaMacMlmeRequest( &mlmeReq );
if( status == LORAMAC_STATUS_OK )
{
lmhStatus = LORAMAC_STATUS_OK;
}
#endif /* LORAMAC_VERSION */ #endif /* LORAMAC_VERSION */
} }
else else
@ -655,7 +662,7 @@ void LmHandlerJoin( ActivationType_t mode, bool forceRejoin )
{ {
LmHandlerCallbacks->OnJoinRequest( &JoinParams ); LmHandlerCallbacks->OnJoinRequest( &JoinParams );
} }
LmHandlerRequestClass( LmHandlerParams.DefaultClass ); lmhStatus = LmHandlerRequestClass( LmHandlerParams.DefaultClass );
#endif /* LORAMAC_VERSION */ #endif /* LORAMAC_VERSION */
} }
@ -663,10 +670,17 @@ void LmHandlerJoin( ActivationType_t mode, bool forceRejoin )
if( ( CtxRestoreDone == false ) || ( forceRejoin == true ) ) if( ( CtxRestoreDone == false ) || ( forceRejoin == true ) )
{ {
/* Starts the join procedure */ /* Starts the join procedure */
LoRaMacMlmeRequest( &mlmeReq ); status = LoRaMacMlmeRequest( &mlmeReq );
if( status == LORAMAC_STATUS_OK )
{
lmhStatus = LORAMAC_STATUS_OK;
}
} }
DutyCycleWaitTime = mlmeReq.ReqReturn.DutyCycleWaitTime; DutyCycleWaitTime = mlmeReq.ReqReturn.DutyCycleWaitTime;
#endif /* LORAMAC_VERSION */ #endif /* LORAMAC_VERSION */
return lmhStatus;
} }
LmHandlerFlagStatus_t LmHandlerJoinStatus( void ) LmHandlerFlagStatus_t LmHandlerJoinStatus( void )

6
Middlewares/Third_Party/LoRaWAN/LmHandler/LmHandler.h vendored
View File

@ -363,8 +363,12 @@ TimerTime_t LmHandlerGetDutyCycleWaitTime( void );
* *
* \param [in] mode Activation mode (OTAA or ABP) * \param [in] mode Activation mode (OTAA or ABP)
* \param [in] forceRejoin Flag to force the rejoin even if LoRaWAN context can be restored * \param [in] forceRejoin Flag to force the rejoin even if LoRaWAN context can be restored
*
* \retval status Returns \ref LORAMAC_HANDLER_SUCCESS if request has been
* processed else if device not yet joined a network \ref LORAMAC_HANDLER_NO_NETWORK_JOINED
* else \ref LORAMAC_HANDLER_ERROR
*/ */
void LmHandlerJoin( ActivationType_t mode, bool forceRejoin ); LmHandlerErrorStatus_t LmHandlerJoin( ActivationType_t mode, bool forceRejoin );
/*! /*!
* Check whether the Device is joined to the network * Check whether the Device is joined to the network