Skip to content

Commit 0c8e5ba

Browse files
committed
Remove TX timeout and handle an occurrence the same way as any other failed transmission.
Allow re-transmissions in such a case. GitHub #606
1 parent f3f6560 commit 0c8e5ba

File tree

1 file changed

+0
-23
lines changed

1 file changed

+0
-23
lines changed

src/mac/LoRaMac.c

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -740,13 +740,6 @@ static void LoRaMacEnableRequests( LoRaMacRequestHandling_t requestState );
740740
*/
741741
static void LoRaMacCheckForRxAbort( void );
742742

743-
/*!
744-
* \brief This function verifies if a TX timeout occurred
745-
*
746-
*\retval 1: TX timeout, 0: no TX timeout
747-
*/
748-
static uint8_t LoRaMacCheckForTxTimeout( void );
749-
750743
/*!
751744
* \brief This function verifies if a beacon acquisition MLME
752745
* request was pending
@@ -1615,21 +1608,6 @@ static void LoRaMacHandleJoinRequest( void )
16151608
}
16161609
}
16171610

1618-
static uint8_t LoRaMacCheckForTxTimeout( void )
1619-
{
1620-
if( ( LoRaMacConfirmQueueGetStatusCmn( ) == LORAMAC_EVENT_INFO_STATUS_TX_TIMEOUT ) ||
1621-
( MacCtx.McpsConfirm.Status == LORAMAC_EVENT_INFO_STATUS_TX_TIMEOUT ) )
1622-
{
1623-
// Stop transmit cycle due to tx timeout
1624-
MacCtx.MacState &= ~LORAMAC_TX_RUNNING;
1625-
MacCtx.McpsConfirm.NbRetries = MacCtx.AckTimeoutRetriesCounter;
1626-
MacCtx.McpsConfirm.AckReceived = false;
1627-
MacCtx.McpsConfirm.TxTimeOnAir = 0;
1628-
return 0x01;
1629-
}
1630-
return 0x00;
1631-
}
1632-
16331611
static uint8_t LoRaMacCheckForBeaconAcquisition( void )
16341612
{
16351613
if( ( LoRaMacConfirmQueueIsCmdActive( MLME_BEACON_ACQUISITION ) == true ) &&
@@ -1671,7 +1649,6 @@ void LoRaMacProcess( void )
16711649
// An error occurs during transmitting
16721650
if( IsRequestPending( ) > 0 )
16731651
{
1674-
noTx |= LoRaMacCheckForTxTimeout( );
16751652
noTx |= LoRaMacCheckForBeaconAcquisition( );
16761653
}
16771654

0 commit comments

Comments
 (0)