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

1.优化注网代码

Browse Source
This commit is contained in:
payton 2023-12-11 19:17:12 +08:00
parent 8470cd9d5f
commit 3bf5f784e0
1 changed files with 95 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2394,7 +2394,7 @@ SINT32 sf_module_complete_init(void)
UINT8 strSave[21] = { 0 }; UINT8 strSave[21] = { 0 };
UINT8 strNow[21] = { 0 }; UINT8 strNow[21] = { 0 };
UINT8 strtmp[12][70] = { { 0 } }; UINT8 strtmp[12][70] = { { 0 } };
SF_TTY_DATA_TYPE_S ttyData = { .waitMs = 1000, .len = 3, .lenMax = (GPRS_INFO_LINE_MAX-1), .cmp = "OK", .cmperr = "ERROR", .data = gsmPara}; SF_TTY_DATA_TYPE_S ttyData = { .waitMs = 1000, .len = 255/*Must wait for OK or error.*/, .lenMax = (GPRS_INFO_LINE_MAX-1), .cmp = "OK", .cmperr = "ERROR", .data = gsmPara};
char *pTemp = NULL; char *pTemp = NULL;
char *delim = NULL; char *delim = NULL;
@ -2419,8 +2419,6 @@ SINT32 sf_module_complete_init(void)
ttyRet = sf_hal_ttyusb2_write(gsmPara, strlen(gsmPara)); ttyRet = sf_hal_ttyusb2_write(gsmPara, strlen(gsmPara));
SF_CHECK_RETURN(ttyRet, SF_GPRS_MODULE_ERROR_WRITE); SF_CHECK_RETURN(ttyRet, SF_GPRS_MODULE_ERROR_WRITE);
callTime = 0; callTime = 0;
ttyData.cmp = "OK";
ttyData.len = 255;//Must wait for OK or error.
sf_sleep_ms(50); sf_sleep_ms(50);
} }
else if(strstr((const char *)gsmPara, "CME ERROR: SIM not inserted")) else if(strstr((const char *)gsmPara, "CME ERROR: SIM not inserted"))
@ -2439,8 +2437,6 @@ SINT32 sf_module_complete_init(void)
ttyRet = sf_hal_ttyusb2_write(gsmPara, strlen(gsmPara)); ttyRet = sf_hal_ttyusb2_write(gsmPara, strlen(gsmPara));
//printf("ttyRet:%d\n", ttyRet); //printf("ttyRet:%d\n", ttyRet);
SF_CHECK_RETURN(ttyRet, SF_GPRS_MODULE_ERROR_WRITE); SF_CHECK_RETURN(ttyRet, SF_GPRS_MODULE_ERROR_WRITE);
ttyData.cmp = "OK";
ttyData.len = 255;//Must wait for OK or error.
} }
break; break;
@ -2485,8 +2481,6 @@ SINT32 sf_module_complete_init(void)
ttyRet = sf_hal_ttyusb2_write(gsmPara, strlen(gsmPara)); ttyRet = sf_hal_ttyusb2_write(gsmPara, strlen(gsmPara));
SF_CHECK_RETURN(ttyRet, SF_GPRS_MODULE_ERROR_WRITE); SF_CHECK_RETURN(ttyRet, SF_GPRS_MODULE_ERROR_WRITE);
callTime = 0; callTime = 0;
ttyData.cmp = "Revision";
ttyData.len = 255;//Must wait for OK or error.
} }
else else
{ {
@ -2506,8 +2500,6 @@ SINT32 sf_module_complete_init(void)
strcpy(gsmPara, "AT+GSN\r"); strcpy(gsmPara, "AT+GSN\r");
ttyRet = sf_hal_ttyusb2_write(gsmPara, strlen(gsmPara)); ttyRet = sf_hal_ttyusb2_write(gsmPara, strlen(gsmPara));
SF_CHECK_RETURN(ttyRet, SF_GPRS_MODULE_ERROR_WRITE); SF_CHECK_RETURN(ttyRet, SF_GPRS_MODULE_ERROR_WRITE);
ttyData.cmp = "OK";
ttyData.len = 255;//Must wait for OK or error.
sf_sleep_ms(50); sf_sleep_ms(50);
} }
if(callTime > 10) if(callTime > 10)
@ -2552,8 +2544,6 @@ SINT32 sf_module_complete_init(void)
ttyRet = sf_hal_ttyusb2_write(gsmPara, strlen(gsmPara)); ttyRet = sf_hal_ttyusb2_write(gsmPara, strlen(gsmPara));
SF_CHECK_RETURN(ttyRet, SF_GPRS_MODULE_ERROR_WRITE); SF_CHECK_RETURN(ttyRet, SF_GPRS_MODULE_ERROR_WRITE);
callTime = 0; callTime = 0;
ttyData.cmp = "OK";
ttyData.len = 255;//Must wait for OK or error.
} }
else else
{ {
@ -2601,8 +2591,6 @@ SINT32 sf_module_complete_init(void)
} }
ttyRet = sf_hal_ttyusb2_write(gsmPara, strlen(gsmPara)); ttyRet = sf_hal_ttyusb2_write(gsmPara, strlen(gsmPara));
SF_CHECK_RETURN(ttyRet, SF_GPRS_MODULE_ERROR_WRITE); SF_CHECK_RETURN(ttyRet, SF_GPRS_MODULE_ERROR_WRITE);
ttyData.cmp = "OK";
ttyData.len = 255;//Must wait for OK or error.
} }
else else
{ {
@ -2616,6 +2604,9 @@ SINT32 sf_module_complete_init(void)
SLOGE(logStr); SLOGE(logStr);
goto SF_MODULE_END; goto SF_MODULE_END;
} }
strcpy((char *)gsmPara, "AT+QGMR\r");
ttyRet = sf_hal_ttyusb2_write(gsmPara, strlen(gsmPara));
SF_CHECK_RETURN(ttyRet, SF_GPRS_MODULE_ERROR_WRITE);
} }
break; break;
@ -2626,7 +2617,6 @@ SINT32 sf_module_complete_init(void)
strcpy((char *)gsmPara, "AT+QSIMSTAT?\r"); strcpy((char *)gsmPara, "AT+QSIMSTAT?\r");
ttyRet = sf_hal_ttyusb2_write(gsmPara, strlen(gsmPara)); ttyRet = sf_hal_ttyusb2_write(gsmPara, strlen(gsmPara));
SF_CHECK_RETURN(ttyRet, SF_GPRS_MODULE_ERROR_WRITE); SF_CHECK_RETURN(ttyRet, SF_GPRS_MODULE_ERROR_WRITE);
ttyData.len = 255;//Must wait for OK or error.
} }
else else
{ {
@ -2639,6 +2629,9 @@ SINT32 sf_module_complete_init(void)
SLOGE(logStr); SLOGE(logStr);
goto SF_MODULE_END; goto SF_MODULE_END;
} }
strcpy((char *)gsmPara, "AT+QSIMDET=0,1\r");
ttyRet = sf_hal_ttyusb2_write(gsmPara, strlen(gsmPara));
SF_CHECK_RETURN(ttyRet, SF_GPRS_MODULE_ERROR_WRITE);
} }
break; break;
case QUECTEL_NETREG_QSIMSTAT: case QUECTEL_NETREG_QSIMSTAT:
@ -2686,7 +2679,6 @@ SINT32 sf_module_complete_init(void)
ttyRet = sf_hal_ttyusb2_write(gsmPara, strlen(gsmPara)); ttyRet = sf_hal_ttyusb2_write(gsmPara, strlen(gsmPara));
SF_CHECK_RETURN(ttyRet, SF_GPRS_MODULE_ERROR_WRITE); SF_CHECK_RETURN(ttyRet, SF_GPRS_MODULE_ERROR_WRITE);
callTime = 0; callTime = 0;
ttyData.len = 255;//Must wait for OK or error.
} }
else if((strstr((const char *)gsmPara, "+QSIMSTAT: 0,2"))) else if((strstr((const char *)gsmPara, "+QSIMSTAT: 0,2")))
{ {
@ -2739,7 +2731,29 @@ SINT32 sf_module_complete_init(void)
ttyRet = sf_hal_ttyusb2_write(gsmPara, strlen(gsmPara)); ttyRet = sf_hal_ttyusb2_write(gsmPara, strlen(gsmPara));
SF_CHECK_RETURN(ttyRet, SF_GPRS_MODULE_ERROR_WRITE); SF_CHECK_RETURN(ttyRet, SF_GPRS_MODULE_ERROR_WRITE);
callTime = 0; callTime = 0;
ttyData.len = strlen(gsmPara) + 2; }
else
{
callTime++;
if(callTime > 10)
{
ret = SF_SIM_ERROR_AT_TIMEOUT;
SLOGE(gsmPara);
sprintf((char *)logStr, "Error Code:0x%08X\n", ret);
SLOGE(logStr);
goto SF_MODULE_END;
}
if(puiPara->QLogSwitch)
{
sprintf((char *)gsmPara, "at+qcfg=\"dbgctl\",0\r");
}
else
{
sprintf((char *)gsmPara, "at+qcfg=\"dbgctl\",1\r");
}
ttyRet = sf_hal_ttyusb2_write(gsmPara, strlen(gsmPara));
SF_CHECK_RETURN(ttyRet, SF_GPRS_MODULE_ERROR_WRITE);
} }
break; break;
@ -2751,9 +2765,22 @@ SINT32 sf_module_complete_init(void)
strcpy((char *)gsmPara, "AT+QURCCFG=\"urcport\",\"usbat\"\r"); strcpy((char *)gsmPara, "AT+QURCCFG=\"urcport\",\"usbat\"\r");
ttyRet = sf_hal_ttyusb2_write(gsmPara, strlen(gsmPara)); ttyRet = sf_hal_ttyusb2_write(gsmPara, strlen(gsmPara));
SF_CHECK_RETURN(ttyRet, SF_GPRS_MODULE_ERROR_WRITE); SF_CHECK_RETURN(ttyRet, SF_GPRS_MODULE_ERROR_WRITE);
ttyData.len = strlen(gsmPara) + 2;
} }
else
{
callTime++;
if(callTime > 10)
{
ret = SF_SIM_ERROR_AT_TIMEOUT;
SLOGE(gsmPara);
sprintf((char *)logStr, "Error Code:0x%08X\n", ret);
SLOGE(logStr);
goto SF_MODULE_END;
}
strcpy((char *)gsmPara, "AT+QCFG=\"ntp\",3,5\r");
ttyRet = sf_hal_ttyusb2_write(gsmPara, strlen(gsmPara));
SF_CHECK_RETURN(ttyRet, SF_GPRS_MODULE_ERROR_WRITE);
}
break; break;
case QUECTEL_NETREG_QURCCFG: case QUECTEL_NETREG_QURCCFG:
@ -2764,9 +2791,23 @@ SINT32 sf_module_complete_init(void)
strcpy((char *)gsmPara, "AT+QCFG=\"risignaltype\",\"physical\"\r"); strcpy((char *)gsmPara, "AT+QCFG=\"risignaltype\",\"physical\"\r");
ttyRet = sf_hal_ttyusb2_write(gsmPara, strlen(gsmPara)); ttyRet = sf_hal_ttyusb2_write(gsmPara, strlen(gsmPara));
SF_CHECK_RETURN(ttyRet, SF_GPRS_MODULE_ERROR_WRITE); SF_CHECK_RETURN(ttyRet, SF_GPRS_MODULE_ERROR_WRITE);
ttyData.len = strlen(gsmPara) + 2; callTime = 0;
}
else
{
callTime++;
if(callTime > 10)
{
ret = SF_SIM_ERROR_AT_TIMEOUT;
SLOGE(gsmPara);
sprintf((char *)logStr, "Error Code:0x%08X\n", ret);
SLOGE(logStr);
goto SF_MODULE_END;
}
strcpy((char *)gsmPara, "AT+QURCCFG=\"urcport\",\"usbat\"\r");
ttyRet = sf_hal_ttyusb2_write(gsmPara, strlen(gsmPara));
SF_CHECK_RETURN(ttyRet, SF_GPRS_MODULE_ERROR_WRITE);
} }
break; break;
case QUECTEL_NETREG_QCFG_RISIGNALTYPE: case QUECTEL_NETREG_QCFG_RISIGNALTYPE:
@ -2777,9 +2818,23 @@ SINT32 sf_module_complete_init(void)
strcpy((char *)gsmPara, "AT+QCFG=\"urc/ri/other\",\"off\"\r"); strcpy((char *)gsmPara, "AT+QCFG=\"urc/ri/other\",\"off\"\r");
ttyRet = sf_hal_ttyusb2_write(gsmPara, strlen(gsmPara)); ttyRet = sf_hal_ttyusb2_write(gsmPara, strlen(gsmPara));
SF_CHECK_RETURN(ttyRet, SF_GPRS_MODULE_ERROR_WRITE); SF_CHECK_RETURN(ttyRet, SF_GPRS_MODULE_ERROR_WRITE);
ttyData.len = strlen(gsmPara) + 2; callTime = 0;
}
else
{
callTime++;
if(callTime > 10)
{
ret = SF_SIM_ERROR_AT_TIMEOUT;
SLOGE(gsmPara);
sprintf((char *)logStr, "Error Code:0x%08X\n", ret);
SLOGE(logStr);
goto SF_MODULE_END;
}
strcpy((char *)gsmPara, "AT+QCFG=\"risignaltype\",\"physical\"\r");
ttyRet = sf_hal_ttyusb2_write(gsmPara, strlen(gsmPara));
SF_CHECK_RETURN(ttyRet, SF_GPRS_MODULE_ERROR_WRITE);
} }
break; break;
/*case QUECTEL_NETREG_USBNET_CHECK: /*case QUECTEL_NETREG_USBNET_CHECK:
@ -2892,25 +2947,27 @@ SINT32 sf_module_complete_init(void)
case QUECTEL_NETREG_CPIN: case QUECTEL_NETREG_CPIN:
if(SF_STRNCMP(puiPara->ModuleVer, GPRS_MODULE_TYPE_EG915Q, 6) == 0){ if(strstr((const char *)gsmPara, "ERROR") || strstr((const char *)gsmPara, "OK"))
if(strstr((const char *)gsmPara, "ERROR") || strstr((const char *)gsmPara, "OK")) {
{ eNetRegLocation = QUECTEL_NETREG_READY;
eNetRegLocation = QUECTEL_NETREG_READY; strcpy((char *)gsmPara, "AT+CPIN?\r");
strcpy((char *)gsmPara, "AT+CPIN?\r"); ttyRet = sf_hal_ttyusb2_write(gsmPara, strlen(gsmPara));
ttyRet = sf_hal_ttyusb2_write(gsmPara, strlen(gsmPara)); SF_CHECK_RETURN(ttyRet, SF_GPRS_MODULE_ERROR_WRITE);
SF_CHECK_RETURN(ttyRet, SF_GPRS_MODULE_ERROR_WRITE);
ttyData.len = strlen(gsmPara) + 2;
}
} }
else{ else
if(strstr((const char *)gsmPara, "ERROR") || strstr((const char *)gsmPara, "OK")) {
callTime++;
if(callTime > 10)
{ {
eNetRegLocation = QUECTEL_NETREG_READY; ret = SF_SIM_ERROR_AT_TIMEOUT;
strcpy((char *)gsmPara, "AT+CPIN?\r"); SLOGE(gsmPara);
ttyRet = sf_hal_ttyusb2_write(gsmPara, strlen(gsmPara)); sprintf((char *)logStr, "Error Code:0x%08X\n", ret);
SF_CHECK_RETURN(ttyRet, SF_GPRS_MODULE_ERROR_WRITE); SLOGE(logStr);
ttyData.len = strlen(gsmPara) + 2; goto SF_MODULE_END;
} }
strcpy((char *)gsmPara, "AT+QCFG=\"urc/ri/other\",\"off\"\r");
ttyRet = sf_hal_ttyusb2_write(gsmPara, strlen(gsmPara));
SF_CHECK_RETURN(ttyRet, SF_GPRS_MODULE_ERROR_WRITE);
} }
break; break;
@ -2926,8 +2983,6 @@ SINT32 sf_module_complete_init(void)
strcpy((char *)gsmPara, "AT+QCCID\r"); strcpy((char *)gsmPara, "AT+QCCID\r");
ttyRet = sf_hal_ttyusb2_write(gsmPara, strlen(gsmPara)); ttyRet = sf_hal_ttyusb2_write(gsmPara, strlen(gsmPara));
SF_CHECK_RETURN(ttyRet, SF_GPRS_MODULE_ERROR_WRITE); SF_CHECK_RETURN(ttyRet, SF_GPRS_MODULE_ERROR_WRITE);
ttyData.cmp = "+QCCID:";
ttyData.len = MODULE_ICCID_LEN;
} }
else else
{ {
@ -3063,7 +3118,6 @@ SINT32 sf_module_complete_init(void)
ttyRet = sf_hal_ttyusb2_write(gsmPara, strlen(gsmPara)); ttyRet = sf_hal_ttyusb2_write(gsmPara, strlen(gsmPara));
SF_CHECK_RETURN(ttyRet, SF_GPRS_MODULE_ERROR_WRITE); SF_CHECK_RETURN(ttyRet, SF_GPRS_MODULE_ERROR_WRITE);
callTime = 0; callTime = 0;
ttyData.len = strlen(gsmPara) + 2;
} }
break; break;
@ -3079,8 +3133,6 @@ SINT32 sf_module_complete_init(void)
ttyRet = sf_hal_ttyusb2_write(gsmPara, strlen(gsmPara)); ttyRet = sf_hal_ttyusb2_write(gsmPara, strlen(gsmPara));
SF_CHECK_RETURN(ttyRet, SF_GPRS_MODULE_ERROR_WRITE); SF_CHECK_RETURN(ttyRet, SF_GPRS_MODULE_ERROR_WRITE);
callTime = 0; callTime = 0;
ttyData.cmp = "+QCCID:";
ttyData.len = MODULE_ICCID_LEN;
} }
else else
{ {