Skip to content

Update HL7802 AT command timeout #77

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chinglee-iot merged 19 commits into from
Jan 7, 2022
Merged

Update HL7802 AT command timeout #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
210a55c
Update cellular library to MIT license
chinglee-iot Mar 29, 2021
298ae4c
Merge branch 'FreeRTOS:main' into main
chinglee-iot Jun 30, 2021
21ea9bc
Merge branch 'FreeRTOS:main' into main
chinglee-iot Jul 16, 2021
6690f3b
Merge branch 'FreeRTOS:main' into main
chinglee-iot Jul 23, 2021
4a58d89
Merge branch 'FreeRTOS:main' into main
chinglee-iot Aug 24, 2021
955ebc0
Merge branch 'FreeRTOS:main' into main
chinglee-iot Oct 25, 2021
bba8adf
Merge branch 'FreeRTOS:main' into main
chinglee-iot Nov 4, 2021
440bec9
Merge branch 'FreeRTOS:main' into main
chinglee-iot Nov 9, 2021
a0fb7c7
Merge branch 'FreeRTOS:main' into main
chinglee-iot Nov 16, 2021
b28ed63
Merge branch 'FreeRTOS:main' into main
chinglee-iot Nov 24, 2021
b40cb10
Merge branch 'FreeRTOS:main' into main
chinglee-iot Dec 1, 2021
ca024c6
Merge branch 'FreeRTOS:main' into main
chinglee-iot Dec 1, 2021
277d8b7
Merge branch 'FreeRTOS:main' into main
chinglee-iot Dec 15, 2021
06402e9
Merge branch 'FreeRTOS:main' into main
chinglee-iot Dec 21, 2021
a993410
Merge branch 'FreeRTOS:main' into main
chinglee-iot Dec 21, 2021
45b9bcd
Merge branch 'FreeRTOS:main' into main
chinglee-iot Dec 27, 2021
cacbf87
Merge branch 'FreeRTOS:main' into main
chinglee-iot Jan 6, 2022
66d3d8f
Update AT command timeout for HL7802
chinglee-iot Jan 7, 2022
4d37281
Fix typo
chinglee-iot Jan 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 37 additions & 21 deletions modules/hl7802/cellular_hl7802.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 )

/*-----------------------------------------------------------*/

Expand All @@ -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,
Expand Down Expand Up @@ -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;
Expand All @@ -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 )
Expand Down Expand Up @@ -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 )
{
Expand Down Expand Up @@ -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. */
Expand All @@ -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. */
Expand All @@ -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. */
Expand All @@ -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 );
}
}

Expand All @@ -400,22 +408,25 @@ 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 );
}
}

/* Disable standalone sleep mode. */
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 );
Expand All @@ -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 );
}
}

Expand All @@ -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;
}
Expand Down
37 changes: 31 additions & 6 deletions modules/hl7802/cellular_hl7802.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading