diff --git a/modules/hl7802/cellular_hl7802.c b/modules/hl7802/cellular_hl7802.c index e86d3ee1..5622ce8b 100644 --- a/modules/hl7802/cellular_hl7802.c +++ b/modules/hl7802/cellular_hl7802.c @@ -35,9 +35,8 @@ /*-----------------------------------------------------------*/ -#define ENBABLE_MODULE_UE_RETRY_COUNT ( 3U ) -#define ENBABLE_MODULE_UE_RETRY_TIMEOUT ( 5000U ) -#define HL7802_MAX_BAND_CFG ( 21U ) +#define ENBABLE_MODULE_UE_RETRY_COUNT ( 3U ) +#define HL7802_MAX_BAND_CFG ( 21U ) /*-----------------------------------------------------------*/ @@ -51,7 +50,8 @@ typedef struct Hl7802BandConfig /*-----------------------------------------------------------*/ static CellularError_t sendAtCommandWithRetryTimeout( CellularContext_t * pContext, - const CellularAtReq_t * pAtReq ); + const CellularAtReq_t * pAtReq, + uint32_t timeoutMs ); static CellularError_t getBandCfg( CellularContext_t * pContext, Hl7802BandConfig_t * pBandCfg ); static CellularPktStatus_t recvFuncGetBandCfg( CellularContext_t * pContext, @@ -90,7 +90,8 @@ uint32_t CellularUrcTokenWoPrefixTableSize = 0; /*-----------------------------------------------------------*/ static CellularError_t sendAtCommandWithRetryTimeout( CellularContext_t * pContext, - const CellularAtReq_t * pAtReq ) + const CellularAtReq_t * pAtReq, + uint32_t timeoutMs ) { CellularError_t cellularStatus = CELLULAR_SUCCESS; CellularPktStatus_t pktStatus = CELLULAR_PKT_STATUS_OK; @@ -104,7 +105,7 @@ static CellularError_t sendAtCommandWithRetryTimeout( CellularContext_t * pConte { for( ; tryCount < ENBABLE_MODULE_UE_RETRY_COUNT; tryCount++ ) { - pktStatus = _Cellular_TimeoutAtcmdRequestWithCallback( pContext, *pAtReq, ENBABLE_MODULE_UE_RETRY_TIMEOUT ); + pktStatus = _Cellular_TimeoutAtcmdRequestWithCallback( pContext, *pAtReq, timeoutMs ); cellularStatus = _Cellular_TranslatePktStatus( pktStatus ); if( cellularStatus == CELLULAR_SUCCESS ) @@ -233,7 +234,8 @@ static CellularError_t getBandCfg( CellularContext_t * pContext, /* pContext and pBandCfg are checked in Cellular_ModuleEnableUe function. */ ( void ) memset( pBandCfg, 0, sizeof( Hl7802BandConfig_t ) ); - pktStatus = _Cellular_AtcmdRequestWithCallback( pContext, atReqGetBndCfg ); + pktStatus = _Cellular_TimeoutAtcmdRequestWithCallback( pContext, atReqGetBndCfg, + CELLULAR_HL7802_AT_TIMEOUT_2_SECONDS_MS ); if( pktStatus != CELLULAR_PKT_STATUS_OK ) { @@ -325,20 +327,23 @@ CellularError_t Cellular_ModuleEnableUE( CellularContext_t * pContext ) { /* Disable echo. */ atReqGetWithResult.pAtCmd = "ATE0"; - cellularStatus = sendAtCommandWithRetryTimeout( pContext, &atReqGetWithResult ); + cellularStatus = sendAtCommandWithRetryTimeout( pContext, &atReqGetWithResult, + CELLULAR_HL7802_AT_TIMEOUT_2_SECONDS_MS ); if( cellularStatus == CELLULAR_SUCCESS ) { /* Disable DTR function. */ atReqGetNoResult.pAtCmd = "AT&D0"; - cellularStatus = sendAtCommandWithRetryTimeout( pContext, &atReqGetNoResult ); + cellularStatus = sendAtCommandWithRetryTimeout( pContext, &atReqGetNoResult, + CELLULAR_HL7802_AT_TIMEOUT_2_SECONDS_MS ); } if( cellularStatus == CELLULAR_SUCCESS ) { /* Enable RTS/CTS hardware flow control. */ atReqGetNoResult.pAtCmd = "AT+IFC=2,2"; - cellularStatus = sendAtCommandWithRetryTimeout( pContext, &atReqGetNoResult ); + cellularStatus = sendAtCommandWithRetryTimeout( pContext, &atReqGetNoResult, + CELLULAR_HL7802_AT_TIMEOUT_2_SECONDS_MS ); } /* Set Radio Access Technology. */ @@ -349,7 +354,8 @@ CellularError_t Cellular_ModuleEnableUE( CellularContext_t * pContext ) * in the PRL if cell coverage is lost. If the PRL is empty, switch to * CAT-M1. To set the PRL, see AT+KSELACQ. */ atReqGetNoResult.pAtCmd = "AT+KSRAT=0"; - cellularStatus = sendAtCommandWithRetryTimeout( pContext, &atReqGetNoResult ); + cellularStatus = sendAtCommandWithRetryTimeout( pContext, &atReqGetNoResult, + CELLULAR_HL7802_AT_TIMEOUT_2_SECONDS_MS ); } /* Set Default Radio Access Technology. */ @@ -373,7 +379,8 @@ CellularError_t Cellular_ModuleEnableUE( CellularContext_t * pContext ) break; } - cellularStatus = sendAtCommandWithRetryTimeout( pContext, &atReqGetNoResult ); + cellularStatus = sendAtCommandWithRetryTimeout( pContext, &atReqGetNoResult, + CELLULAR_HL7802_AT_KSELACQ_TIMEOUT_MS ); } /* Set Configured LTE Band. */ @@ -389,7 +396,8 @@ CellularError_t Cellular_ModuleEnableUE( CellularContext_t * pContext ) LogInfo( ( "Cellular_ModuleEnableUE : CAT-M1 band desired %s actual %s", CELLULAR_CONFIG_HL7802_CATM1_BAND, bandCfg.catm1BandCfg ) ); atReqGetNoResult.pAtCmd = "AT+KBNDCFG=0,"CELLULAR_CONFIG_HL7802_CATM1_BAND; - cellularStatus = sendAtCommandWithRetryTimeout( pContext, &atReqGetNoResult ); + cellularStatus = sendAtCommandWithRetryTimeout( pContext, &atReqGetNoResult, + CELLULAR_HL7802_AT_TIMEOUT_2_SECONDS_MS ); } } @@ -400,7 +408,8 @@ CellularError_t Cellular_ModuleEnableUE( CellularContext_t * pContext ) LogInfo( ( "Cellular_ModuleEnableUE : NBIOT band desired %s actual %s", CELLULAR_CONFIG_HL7802_NBIOT_BAND, bandCfg.nbiotBandCfg ) ); atReqGetNoResult.pAtCmd = "AT+KBNDCFG=1,"CELLULAR_CONFIG_HL7802_NBIOT_BAND; - cellularStatus = sendAtCommandWithRetryTimeout( pContext, &atReqGetNoResult ); + cellularStatus = sendAtCommandWithRetryTimeout( pContext, &atReqGetNoResult, + CELLULAR_HL7802_AT_TIMEOUT_2_SECONDS_MS ); } } @@ -408,14 +417,16 @@ CellularError_t Cellular_ModuleEnableUE( CellularContext_t * pContext ) if( cellularStatus == CELLULAR_SUCCESS ) { atReqGetNoResult.pAtCmd = "AT+KSLEEP=2"; - cellularStatus = sendAtCommandWithRetryTimeout( pContext, &atReqGetNoResult ); + cellularStatus = sendAtCommandWithRetryTimeout( pContext, &atReqGetNoResult, + CELLULAR_HL7802_AT_TIMEOUT_2_SECONDS_MS ); } /* Force initialization of radio to consider new configured bands. */ if( cellularStatus == CELLULAR_SUCCESS ) { atReqGetNoResult.pAtCmd = "AT+CFUN=1,1"; - cellularStatus = sendAtCommandWithRetryTimeout( pContext, &atReqGetNoResult ); + cellularStatus = sendAtCommandWithRetryTimeout( pContext, &atReqGetNoResult, + CELLULAR_HL7802_AT_TIMEOUT_30_SECONDS_MS ); } Platform_Delay( CELLULAR_HL7802_RESET_DELAY_MS ); @@ -424,7 +435,8 @@ CellularError_t Cellular_ModuleEnableUE( CellularContext_t * pContext ) if( cellularStatus == CELLULAR_SUCCESS ) { atReqGetWithResult.pAtCmd = "ATE0"; - cellularStatus = sendAtCommandWithRetryTimeout( pContext, &atReqGetWithResult ); + cellularStatus = sendAtCommandWithRetryTimeout( pContext, &atReqGetWithResult, + CELLULAR_HL7802_AT_TIMEOUT_2_SECONDS_MS ); } } @@ -449,16 +461,20 @@ CellularError_t Cellular_ModuleEnableUrc( CellularContext_t * pContext ) }; atReqGetNoResult.pAtCmd = "AT+COPS=3,2"; - ( void ) _Cellular_AtcmdRequestWithCallback( pContext, atReqGetNoResult ); + ( void ) _Cellular_TimeoutAtcmdRequestWithCallback( pContext, atReqGetNoResult, + CELLULAR_HL7802_AT_TIMEOUT_120_SECONDS_MS ); atReqGetNoResult.pAtCmd = "AT+CREG=2"; - ( void ) _Cellular_AtcmdRequestWithCallback( pContext, atReqGetNoResult ); + ( void ) _Cellular_TimeoutAtcmdRequestWithCallback( pContext, atReqGetNoResult, + CELLULAR_HL7802_AT_TIMEOUT_2_SECONDS_MS ); atReqGetNoResult.pAtCmd = "AT+CEREG=2"; - ( void ) _Cellular_AtcmdRequestWithCallback( pContext, atReqGetNoResult ); + ( void ) _Cellular_TimeoutAtcmdRequestWithCallback( pContext, atReqGetNoResult, + CELLULAR_HL7802_AT_TIMEOUT_2_SECONDS_MS ); atReqGetNoResult.pAtCmd = "AT+CTZR=1"; - ( void ) _Cellular_AtcmdRequestWithCallback( pContext, atReqGetNoResult ); + ( void ) _Cellular_TimeoutAtcmdRequestWithCallback( pContext, atReqGetNoResult, + CELLULAR_HL7802_AT_TIMEOUT_2_SECONDS_MS ); return cellularStatus; } diff --git a/modules/hl7802/cellular_hl7802.h b/modules/hl7802/cellular_hl7802.h index e92b5902..03324e4a 100644 --- a/modules/hl7802/cellular_hl7802.h +++ b/modules/hl7802/cellular_hl7802.h @@ -32,15 +32,40 @@ #endif /* *INDENT-ON* */ -#define MIN_TCP_SESSION_ID ( 1U ) -#define MAX_TCP_SESSION_ID ( 6U ) -#define TCP_SESSION_TABLE_LEGNTH ( MAX_TCP_SESSION_ID + 1 ) +#define MIN_TCP_SESSION_ID ( 1U ) +#define MAX_TCP_SESSION_ID ( 6U ) +#define TCP_SESSION_TABLE_LEGNTH ( MAX_TCP_SESSION_ID + 1 ) -#define INVALID_SOCKET_INDEX ( UINT32_MAX ) -#define INVALID_SESSION_ID ( UINT32_MAX ) +#define INVALID_SOCKET_INDEX ( UINT32_MAX ) +#define INVALID_SESSION_ID ( UINT32_MAX ) /* Delay after AT+CFUN=1,1 commands. */ -#define CELLULAR_HL7802_RESET_DELAY_MS ( 3000U ) +#define CELLULAR_HL7802_RESET_DELAY_MS ( 3000U ) + +/* AT command recommended timeout value for HL7802. Reference HL7802 AT Commands + * Interface Guide to setup the timeout value for each AT commands. */ +#define CELLULAR_HL7802_AT_TIMEOUT_2_SECONDS_MS ( 2000U ) +#define CELLULAR_HL7802_AT_TIMEOUT_5_SECONDS_MS ( 5000U ) +#define CELLULAR_HL7802_AT_TIMEOUT_30_SECONDS_MS ( 30000U ) +#define CELLULAR_HL7802_AT_TIMEOUT_60_SECONDS_MS ( 60000U ) +#define CELLULAR_HL7802_AT_TIMEOUT_120_SECONDS_MS ( 120000U ) + +/* Define the following timeout value since they are content dependent or no recommended value. */ +#ifndef CELLULAR_HL7802_AT_KSELACQ_TIMEOUT_MS + #define CELLULAR_HL7802_AT_KSELACQ_TIMEOUT_MS CELLULAR_HL7802_AT_TIMEOUT_5_SECONDS_MS +#endif + +#ifndef CELLULAR_HL7802_AT_KEDRXCFG_TIMEOUT_MS + #define CELLULAR_HL7802_AT_KEDRXCFG_TIMEOUT_MS CELLULAR_HL7802_AT_TIMEOUT_5_SECONDS_MS +#endif + +#ifndef CELLULAR_HL7802_AT_KCNXUP_TIMEOUT_MS + #define CELLULAR_HL7802_AT_KCNXUP_TIMEOUT_MS CELLULAR_HL7802_AT_TIMEOUT_30_SECONDS_MS +#endif + +#ifndef CELLULAR_HL7802_AT_KCNXDOWN_TIMEOUT_MS + #define CELLULAR_HL7802_AT_KCNXDOWN_TIMEOUT_MS CELLULAR_HL7802_AT_TIMEOUT_30_SECONDS_MS +#endif /* Band configuration for HL7802. */ #ifndef CELLULAR_CONFIG_HL7802_CATM1_BAND diff --git a/modules/hl7802/cellular_hl7802_api.c b/modules/hl7802/cellular_hl7802_api.c index 493cedea..e467f6e6 100644 --- a/modules/hl7802/cellular_hl7802_api.c +++ b/modules/hl7802/cellular_hl7802_api.c @@ -44,22 +44,11 @@ /*-----------------------------------------------------------*/ -/* TODO : confirm the value. */ -#define PDN_ACT_PACKET_REQ_TIMEOUT_MS ( 10000UL ) - -#define SOCKET_CONNECT_PACKET_REQ_TIMEOUT_MS ( 27000U ) - #define CELLULAR_AT_CMD_TYPICAL_MAX_SIZE ( 32U ) -#define DATA_SEND_TIMEOUT_MS ( 10000U ) - -#define PACKET_REQ_TIMEOUT_MS ( 10000U ) - #define SOCKET_END_PATTERN "--EOF--Pattern--" #define SOCKET_END_PATTERN_LEN ( 16U ) -#define DATA_READ_TIMEOUT_MS ( 50000UL ) - #define SOCKET_DATA_CONNECT_TOKEN "CONNECT" #define SOCKET_DATA_CONNECT_TOKEN_LEN ( 7U ) @@ -350,7 +339,8 @@ static CellularError_t _Cellular_GetSocketStat( CellularHandle_t cellularHandle, /* Internal function. Caller checks parameters. */ ( void ) snprintf( cmdBuf, CELLULAR_AT_CMD_TYPICAL_MAX_SIZE, "AT+KTCPSTAT=%lu", sessionId ); - pktStatus = _Cellular_AtcmdRequestWithCallback( pContext, atReqSocketStat ); + pktStatus = _Cellular_TimeoutAtcmdRequestWithCallback( pContext, atReqSocketStat, + CELLULAR_HL7802_AT_TIMEOUT_2_SECONDS_MS ); cellularStatus = _Cellular_TranslatePktStatus( pktStatus ); @@ -686,7 +676,8 @@ static CellularError_t _Cellular_getTcpCfgSessionId( CellularHandle_t cellularHa if( cellularStatus == CELLULAR_SUCCESS ) { - pktStatus = _Cellular_AtcmdRequestWithCallback( pContext, atReqSocketConnect ); + pktStatus = _Cellular_TimeoutAtcmdRequestWithCallback( pContext, atReqSocketConnect, + CELLULAR_HL7802_AT_TIMEOUT_2_SECONDS_MS ); if( pktStatus != CELLULAR_PKT_STATUS_OK ) { @@ -1253,7 +1244,7 @@ CellularError_t Cellular_SocketRecv( CellularHandle_t cellularHandle, CellularError_t cellularStatus = CELLULAR_SUCCESS; CellularPktStatus_t pktStatus = CELLULAR_PKT_STATUS_OK; char cmdBuf[ CELLULAR_AT_CMD_TYPICAL_MAX_SIZE ] = { '\0' }; - uint32_t recvTimeout = DATA_READ_TIMEOUT_MS; + uint32_t recvTimeout = CELLULAR_HL7802_AT_TIMEOUT_60_SECONDS_MS; uint32_t recvLen = bufferLength; _socketDataRecv_t dataRecv = { @@ -1372,7 +1363,7 @@ CellularError_t Cellular_SocketSend( CellularHandle_t cellularHandle, CellularContext_t * pContext = ( CellularContext_t * ) cellularHandle; CellularError_t cellularStatus = CELLULAR_SUCCESS; CellularPktStatus_t pktStatus = CELLULAR_PKT_STATUS_OK; - uint32_t sendTimeout = DATA_SEND_TIMEOUT_MS; + uint32_t sendTimeout = CELLULAR_HL7802_AT_TIMEOUT_60_SECONDS_MS; char cmdBuf[ CELLULAR_AT_CMD_TYPICAL_MAX_SIZE ] = { '\0' }; CellularAtReq_t atReqSocketSend = { @@ -1456,7 +1447,7 @@ CellularError_t Cellular_SocketSend( CellularHandle_t cellularHandle, "AT+KTCPSND=", sessionId, atDataReqSocketSend.dataLen ); pktStatus = _Cellular_TimeoutAtcmdDataSendSuccessToken( pContext, atReqSocketSend, atDataReqSocketSend, - PACKET_REQ_TIMEOUT_MS, sendTimeout, + CELLULAR_HL7802_AT_TIMEOUT_60_SECONDS_MS, sendTimeout, _socketSendSuccesTokenTable, _socketSendSuccesTokenTableLength ); if( pktStatus != CELLULAR_PKT_STATUS_OK ) @@ -1538,7 +1529,8 @@ CellularError_t Cellular_SocketClose( CellularHandle_t cellularHandle, { ( void ) snprintf( cmdBuf, CELLULAR_AT_CMD_TYPICAL_MAX_SIZE, "%s%lu,1", "AT+KTCPCLOSE=", sessionId ); - pktStatus = _Cellular_AtcmdRequestWithCallback( pContext, atReqSocketClose ); + pktStatus = _Cellular_TimeoutAtcmdRequestWithCallback( pContext, atReqSocketClose, + CELLULAR_HL7802_AT_TIMEOUT_60_SECONDS_MS ); /* Delete the socket config. */ if( pktStatus != CELLULAR_PKT_STATUS_OK ) @@ -1553,7 +1545,8 @@ CellularError_t Cellular_SocketClose( CellularHandle_t cellularHandle, { ( void ) snprintf( cmdBuf, CELLULAR_AT_CMD_TYPICAL_MAX_SIZE, "%s%lu", "AT+KTCPDEL=", sessionId ); - pktStatus = _Cellular_AtcmdRequestWithCallback( pContext, atReqSocketClose ); + pktStatus = _Cellular_TimeoutAtcmdRequestWithCallback( pContext, atReqSocketClose, + CELLULAR_HL7802_AT_TIMEOUT_2_SECONDS_MS ); if( pktStatus != CELLULAR_PKT_STATUS_OK ) { @@ -1642,7 +1635,7 @@ CellularError_t Cellular_SocketConnect( CellularHandle_t cellularHandle, "AT+KTCPCNX=%u", sessionId ); pktStatus = _Cellular_TimeoutAtcmdRequestWithCallback( pContext, atReqSocketConnect, - SOCKET_CONNECT_PACKET_REQ_TIMEOUT_MS ); + CELLULAR_HL7802_AT_TIMEOUT_30_SECONDS_MS ); if( pktStatus != CELLULAR_PKT_STATUS_OK ) { @@ -1752,7 +1745,8 @@ CellularError_t Cellular_DeactivatePdn( CellularHandle_t cellularHandle, if( cellularStatus == CELLULAR_SUCCESS ) { ( void ) snprintf( cmdBuf, CELLULAR_AT_CMD_MAX_SIZE, "%s=%u", "AT+KCNXDOWN", contextId ); - pktStatus = _Cellular_TimeoutAtcmdRequestWithCallback( pContext, atReqDeactPdn, PDN_ACT_PACKET_REQ_TIMEOUT_MS ); + pktStatus = _Cellular_TimeoutAtcmdRequestWithCallback( pContext, atReqDeactPdn, + CELLULAR_HL7802_AT_KCNXDOWN_TIMEOUT_MS ); if( pktStatus != CELLULAR_PKT_STATUS_OK ) { @@ -1847,7 +1841,8 @@ static CellularError_t _Cellular_GetPacketSwitchStatus( CellularHandle_t cellula }; /* Internal function. Callee check parameters. */ - pktStatus = _Cellular_TimeoutAtcmdRequestWithCallback( pContext, atReqPacketSwitchStatus, PDN_ACT_PACKET_REQ_TIMEOUT_MS ); + pktStatus = _Cellular_TimeoutAtcmdRequestWithCallback( pContext, atReqPacketSwitchStatus, + CELLULAR_HL7802_AT_TIMEOUT_60_SECONDS_MS ); cellularStatus = _Cellular_TranslatePktStatus( pktStatus ); return cellularStatus; @@ -1893,7 +1888,8 @@ CellularError_t Cellular_ActivatePdn( CellularHandle_t cellularHandle, { LogError( ( "Activate Packet switch" ) ); ( void ) snprintf( cmdBuf, CELLULAR_AT_CMD_MAX_SIZE, "%s", "AT+CGATT=1" ); - pktStatus = _Cellular_TimeoutAtcmdRequestWithCallback( pContext, atReqActPdn, PDN_ACT_PACKET_REQ_TIMEOUT_MS ); + pktStatus = _Cellular_TimeoutAtcmdRequestWithCallback( pContext, atReqActPdn, + CELLULAR_HL7802_AT_TIMEOUT_60_SECONDS_MS ); } else if( cellularStatus != CELLULAR_SUCCESS ) { @@ -1909,7 +1905,8 @@ CellularError_t Cellular_ActivatePdn( CellularHandle_t cellularHandle, if( pktStatus == CELLULAR_PKT_STATUS_OK ) { ( void ) snprintf( cmdBuf, CELLULAR_AT_CMD_MAX_SIZE, "%s=%u", "AT+KCNXUP", contextId ); - pktStatus = _Cellular_TimeoutAtcmdRequestWithCallback( pContext, atReqActPdn, PDN_ACT_PACKET_REQ_TIMEOUT_MS ); + pktStatus = _Cellular_TimeoutAtcmdRequestWithCallback( pContext, atReqActPdn, + CELLULAR_HL7802_AT_KCNXUP_TIMEOUT_MS ); } if( pktStatus != CELLULAR_PKT_STATUS_OK ) @@ -2226,7 +2223,8 @@ CellularError_t Cellular_GetPdnStatus( CellularHandle_t cellularHandle, } else { - pktStatus = _Cellular_AtcmdRequestWithCallback( pContext, atReqGetPdnStatus ); + pktStatus = _Cellular_TimeoutAtcmdRequestWithCallback( pContext, atReqGetPdnStatus, + CELLULAR_HL7802_AT_TIMEOUT_2_SECONDS_MS ); cellularStatus = _Cellular_TranslatePktStatus( pktStatus ); } @@ -2292,7 +2290,8 @@ CellularError_t Cellular_GetEidrxSettings( CellularHandle_t cellularHandle, { ( void ) memset( pEidrxSettingsList, 0, sizeof( CellularEidrxSettingsList_t ) ); /* Query the pEidrxSettings from the network. */ - pktStatus = _Cellular_AtcmdRequestWithCallback( pContext, atReqGetEidrx ); + pktStatus = _Cellular_TimeoutAtcmdRequestWithCallback( pContext, atReqGetEidrx, + CELLULAR_HL7802_AT_KEDRXCFG_TIMEOUT_MS ); if( pktStatus != CELLULAR_PKT_STATUS_OK ) { @@ -2350,7 +2349,8 @@ CellularError_t Cellular_SetEidrxSettings( CellularHandle_t cellularHandle, pEidrxSettings->requestedEdrxVaue, pEidrxSettings->pagingTimeWindow ); LogDebug( ( "Eidrx setting: %s ", cmdBuf ) ); - pktStatus = _Cellular_AtcmdRequestWithCallback( pContext, atReqSetEidrx ); + pktStatus = _Cellular_TimeoutAtcmdRequestWithCallback( pContext, atReqSetEidrx, + CELLULAR_HL7802_AT_KEDRXCFG_TIMEOUT_MS ); if( pktStatus != CELLULAR_PKT_STATUS_OK ) { @@ -2434,7 +2434,8 @@ CellularError_t Cellular_SetRatPriority( CellularHandle_t cellularHandle, if( cellularStatus == CELLULAR_SUCCESS ) { - pktStatus = _Cellular_AtcmdRequestWithCallback( pContext, atReqSetRatPriority ); + pktStatus = _Cellular_TimeoutAtcmdRequestWithCallback( pContext, atReqSetRatPriority, + CELLULAR_HL7802_AT_KSELACQ_TIMEOUT_MS ); cellularStatus = _Cellular_TranslatePktStatus( pktStatus ); } @@ -2480,7 +2481,8 @@ CellularError_t Cellular_GetRatPriority( CellularHandle_t cellularHandle, } else { - pktStatus = _Cellular_AtcmdRequestWithCallback( pContext, atReqSetRatPriority ); + pktStatus = _Cellular_TimeoutAtcmdRequestWithCallback( pContext, atReqSetRatPriority, + CELLULAR_HL7802_AT_KSELACQ_TIMEOUT_MS ); if( pktStatus == CELLULAR_PKT_STATUS_OK ) { @@ -2547,7 +2549,8 @@ CellularError_t Cellular_GetSignalInfo( CellularHandle_t cellularHandle, pSignalInfo->ber = CELLULAR_INVALID_SIGNAL_VALUE; pSignalInfo->bars = CELLULAR_INVALID_SIGNAL_BAR_VALUE; - pktStatus = _Cellular_AtcmdRequestWithCallback( pContext, atReqQuerySignalInfo ); + pktStatus = _Cellular_TimeoutAtcmdRequestWithCallback( pContext, atReqQuerySignalInfo, + CELLULAR_HL7802_AT_TIMEOUT_2_SECONDS_MS ); if( pktStatus == CELLULAR_PKT_STATUS_OK ) { @@ -2593,8 +2596,8 @@ CellularError_t Cellular_SetPdnConfig( CellularHandle_t cellularHandle, pPdnConfig->apnName ); LogDebug( ( "cmd %s", cmdBuf ) ); - pktStatus = _Cellular_AtcmdRequestWithCallback( pContext, - atGprsConnectionConfighReq ); + pktStatus = _Cellular_TimeoutAtcmdRequestWithCallback( pContext, atGprsConnectionConfighReq, + CELLULAR_HL7802_AT_TIMEOUT_2_SECONDS_MS ); if( pktStatus != CELLULAR_PKT_STATUS_OK ) { @@ -2643,8 +2646,8 @@ CellularError_t Cellular_SetPsmSettings( CellularHandle_t cellularHandle, ( void ) snprintf( cmdBuf, CELLULAR_AT_CMD_MAX_SIZE, "AT+KSLEEP=2" ); } - pktStatus = _Cellular_AtcmdRequestWithCallback( pContext, - atKsleepReq ); + pktStatus = _Cellular_TimeoutAtcmdRequestWithCallback( pContext, atKsleepReq, + CELLULAR_HL7802_AT_TIMEOUT_2_SECONDS_MS ); if( pktStatus != CELLULAR_PKT_STATUS_OK ) {