1.优化注网代码;2.去掉一些log

This commit is contained in:
payton 2023-11-29 14:50:43 +08:00
parent 6c3a10fe9d
commit abb834c296
2 changed files with 11 additions and 13 deletions

View File

@ -2419,9 +2419,7 @@ 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.
ttyData.len = 21;
//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"))
{ {
@ -2434,13 +2432,13 @@ SINT32 sf_module_complete_init(void)
} }
else else
{ {
sf_sleep_ms(800); //sf_sleep_ms(800);
strcpy((char *)gsmPara, "ATE1\r"); strcpy((char *)gsmPara, "ATE1\r");
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 = "ATE1"; //ttyData.cmp = "ATE1";
ttyData.len = strlen(gsmPara) + 2; ttyData.len = 255;//Must wait for OK or error.
} }
break; break;
@ -2486,7 +2484,7 @@ SINT32 sf_module_complete_init(void)
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.cmp = "Revision";
ttyData.len = 20; ttyData.len = 255;//Must wait for OK or error.
} }
else else
{ {
@ -2545,7 +2543,7 @@ SINT32 sf_module_complete_init(void)
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.cmp = "OK";
ttyData.len = strlen(gsmPara) + 2; ttyData.len = 255;//Must wait for OK or error.
} }
else else
{ {
@ -2594,7 +2592,7 @@ 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.cmp = "OK";
ttyData.len = strlen(gsmPara) + 2; ttyData.len = 255;//Must wait for OK or error.
} }
else else
{ {
@ -2618,7 +2616,7 @@ 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 = strlen(gsmPara) + 2; ttyData.len = 255;//Must wait for OK or error.
} }
else else
{ {
@ -2678,7 +2676,7 @@ 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; 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")))
{ {
@ -4033,7 +4031,7 @@ SINT32 sf_auto_net_reg(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);
eNetRegLocation = QUECTEL_NETREG_QSIMSTAT; eNetRegLocation = QUECTEL_NETREG_QSIMSTAT;
ttyData.len = strlen(gsmPara) + 2; ttyData.len = 255;//Must wait for OK or error.
} }
else if(strstr((const char *)gsmPara, "ERROR")) else if(strstr((const char *)gsmPara, "ERROR"))
{ {
@ -4048,7 +4046,7 @@ SINT32 sf_auto_net_reg(void)
strcpy((char *)gsmPara, "ATE1\r"); strcpy((char *)gsmPara, "ATE1\r");
ttyRet = sf_hal_ttyusb2_write(gsmPara, strlen((const char *)gsmPara)); ttyRet = sf_hal_ttyusb2_write(gsmPara, strlen((const char *)gsmPara));
SF_CHECK_RETURN(ttyRet, SF_GPRS_MODULE_ERROR_WRITE); SF_CHECK_RETURN(ttyRet, SF_GPRS_MODULE_ERROR_WRITE);
ttyData.len = strlen(gsmPara) + 2; ttyData.len = 255;//Must wait for OK or error.
} }
break; break;
@ -5280,6 +5278,7 @@ void sf_4g_module_sleep(void)
} }
sf_sim_qsclk(1); sf_sim_qsclk(1);
sf_usb_mux_s(0);
return; return;
} }

View File

@ -2214,7 +2214,6 @@ SINT32 sf_low_power_warn_send_ftp(void)
if(SUCCESS != sf_create_low_power_warn_file()) if(SUCCESS != sf_create_low_power_warn_file())
{ {
MLOGD("err\n");
return SF_FAILURE; return SF_FAILURE;
} }
MLOGD("start\n"); MLOGD("start\n");