payton/nt9856x
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.4G标识优化

Browse Source
This commit is contained in:
payton 2023-11-14 19:21:44 +08:00
parent d7e783bdc6
commit 4a7e905855
1 changed files with 31 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
code/application/source/sf_app/code/source/4gMng/sf_eg91_sim.c
View File

@ -42,7 +42,7 @@ BOOL GprsNetWorkReady = FALSE;
time_t sendStartTime; time_t sendStartTime;
UINT8 gprs_search_process = GPRS_SEARCH_STEP_IDLE; UINT8 gprs_search_process = GPRS_SEARCH_STEP_IDLE;
extern SF_PARA_TIME_S rtcTime; extern SF_PARA_TIME_S rtcTime;
CHAR netGeneration = SF_NET_NO;
// SF_PARA_TIME_S nowDate = { 0, 0, 0, 0, 0, 0}; // SF_PARA_TIME_S nowDate = { 0, 0, 0, 0, 0, 0};
typedef struct sf_cimi_id typedef struct sf_cimi_id
@ -3696,7 +3696,8 @@ SINT32 sf_net_regist_manual(void)
{ {
if(strstr((const char *)gsmPara, "No Service")) if(strstr((const char *)gsmPara, "No Service"))
{ {
puiPara->NetGeneration = 2; //puiPara->NetGeneration = 2;
netGeneration = 2;
} }
else if(NULL != strtok((char *)(char *)gsmPara, "\"")) else if(NULL != strtok((char *)(char *)gsmPara, "\""))
{ {
@ -3705,24 +3706,31 @@ SINT32 sf_net_regist_manual(void)
if((strstr((const char *)netStr, "DD") != NULL)) if((strstr((const char *)netStr, "DD") != NULL))
{ {
puiPara->NetGeneration = 4; //puiPara->NetGeneration = 4;
netGeneration = 4;
} }
else if(strstr((const char *)netStr, "CDMA") != NULL || strstr((const char *)netStr, "HDR") != NULL || strstr((const char *)netStr, "HSUPA") != NULL else if(strstr((const char *)netStr, "CDMA") != NULL || strstr((const char *)netStr, "HDR") != NULL || strstr((const char *)netStr, "HSUPA") != NULL
|| strstr((const char *)netStr, "HSDPA") != NULL || (strstr((const char *)netStr, "HSPA+") != NULL)) || strstr((const char *)netStr, "HSDPA") != NULL || (strstr((const char *)netStr, "HSPA+") != NULL))
{ {
puiPara->NetGeneration = 3; //puiPara->NetGeneration = 3;
netGeneration = 3;
} }
else if(strstr((const char *)netStr, "CMDA") != NULL || strstr((const char *)netStr, "G") != NULL) else if(strstr((const char *)netStr, "CMDA") != NULL || strstr((const char *)netStr, "G") != NULL)
{ {
puiPara->NetGeneration = 2; //puiPara->NetGeneration = 2;
netGeneration = 2;
} }
else else
{ {
puiPara->NetGeneration = 2; // puiPara->NetGeneration = 2;
netGeneration = 2;
} }
} }
if(puiPara->NetGeneration != netGeneration)
if(puiPara->NetGeneration == 4) {
puiPara->NetGeneration = netGeneration;
}
if(netGeneration == 4)
{ {
eNetRegLocation = QUECTEL_NETREG_QCSQ; eNetRegLocation = QUECTEL_NETREG_QCSQ;
strcpy((char *)gsmPara, "AT+QCSQ\r"); strcpy((char *)gsmPara, "AT+QCSQ\r");
@ -4311,7 +4319,8 @@ SINT32 sf_auto_net_reg(void)
{ {
if(strstr((const char *)gsmPara, "No Service")) if(strstr((const char *)gsmPara, "No Service"))
{ {
puiPara->NetGeneration = 2; //puiPara->NetGeneration = 2;
netGeneration = 2;
} }
else if(NULL != strtok((char *)(char *)gsmPara, "\"")) else if(NULL != strtok((char *)(char *)gsmPara, "\""))
{ {
@ -4320,24 +4329,31 @@ SINT32 sf_auto_net_reg(void)
if((strstr((const char *)netStr, "DD") != NULL)) if((strstr((const char *)netStr, "DD") != NULL))
{ {
puiPara->NetGeneration = 4; // puiPara->NetGeneration = 4;
netGeneration = 4;
} }
else if(strstr((const char *)netStr, "CDMA") != NULL || strstr((const char *)netStr, "HDR") != NULL || strstr((const char *)netStr, "HSUPA") != NULL else if(strstr((const char *)netStr, "CDMA") != NULL || strstr((const char *)netStr, "HDR") != NULL || strstr((const char *)netStr, "HSUPA") != NULL
|| strstr((const char *)netStr, "HSDPA") != NULL || (strstr((const char *)netStr, "HSPA+") != NULL)) || strstr((const char *)netStr, "HSDPA") != NULL || (strstr((const char *)netStr, "HSPA+") != NULL))
{ {
puiPara->NetGeneration = 3; // puiPara->NetGeneration = 3;
netGeneration = 3;
} }
else if(strstr((const char *)netStr, "CMDA") != NULL || strstr((const char *)netStr, "G") != NULL) else if(strstr((const char *)netStr, "CMDA") != NULL || strstr((const char *)netStr, "G") != NULL)
{ {
puiPara->NetGeneration = 2; // puiPara->NetGeneration = 2;
netGeneration = 2;
} }
else else
{ {
puiPara->NetGeneration = 2; // puiPara->NetGeneration = 2;
netGeneration = 2;
} }
} }
if(puiPara->NetGeneration != netGeneration)
if(puiPara->NetGeneration == 4) {
puiPara->NetGeneration = netGeneration;
}
if(netGeneration == 4)
{ {
eNetRegLocation = QUECTEL_NETREG_QCSQ; eNetRegLocation = QUECTEL_NETREG_QCSQ;
strcpy((char *)gsmPara, "AT+QCSQ\r"); strcpy((char *)gsmPara, "AT+QCSQ\r");