1.优化utc、ntp
This commit is contained in:
parent
badd2638c8
commit
c5f3229efe
|
@ -4728,8 +4728,9 @@ SINT32 sf_get_utc(VOID)
|
||||||
strcpy((char *)gsmPara, "AT+QLTS=2\r");
|
strcpy((char *)gsmPara, "AT+QLTS=2\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.cmp = "+QLTS:";
|
||||||
ttyData.len = 48;
|
ttyData.len = 48;
|
||||||
|
sf_sleep_ms(200);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -4800,6 +4801,8 @@ SINT32 sf_get_ntp(SINT32 value, SF_PARA_TIME_S *current_time)
|
||||||
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 = 3, .lenMax = (GPRS_INFO_LINE_MAX-1), .cmp = "OK", .cmperr = "ERROR", .data = gsmPara};
|
||||||
|
|
||||||
SF_DEBUG("Sim4gApn=%s", pPara->Sim4gApn);
|
SF_DEBUG("Sim4gApn=%s", pPara->Sim4gApn);
|
||||||
|
|
||||||
|
sf_hal_ttyusb2_read(gsmPara, 200);//clean uart read buff
|
||||||
sf_gsm_para_buff_clear();
|
sf_gsm_para_buff_clear();
|
||||||
|
|
||||||
pdpIndex = sf_get_pdp_index();
|
pdpIndex = sf_get_pdp_index();
|
||||||
|
@ -4937,7 +4940,7 @@ SINT32 sf_get_ntp(SINT32 value, SF_PARA_TIME_S *current_time)
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
if(calltime > 350)
|
if(calltime > 50)
|
||||||
{
|
{
|
||||||
ret = SF_SIM_ERROR_NTP;
|
ret = SF_SIM_ERROR_NTP;
|
||||||
sprintf((char *)logStr, "[%s:%d]Error Code:0x%08X;gsmPara:%s", __FUNCTION__, __LINE__, ret, strstr((const char *)gsmPara, "ERROR"));
|
sprintf((char *)logStr, "[%s:%d]Error Code:0x%08X;gsmPara:%s", __FUNCTION__, __LINE__, ret, strstr((const char *)gsmPara, "ERROR"));
|
||||||
|
@ -4971,7 +4974,7 @@ SINT32 sf_get_ntp(SINT32 value, SF_PARA_TIME_S *current_time)
|
||||||
|
|
||||||
case SMS_SIM_INIT_EXIT:
|
case SMS_SIM_INIT_EXIT:
|
||||||
|
|
||||||
if(strstr((const char *)gsmPara, "OK") || (calltime > 300))
|
if(strstr((const char *)gsmPara, "OK") || (calltime > 100))
|
||||||
{
|
{
|
||||||
goto SF_GEN_NTP_END;
|
goto SF_GEN_NTP_END;
|
||||||
}
|
}
|
||||||
|
@ -4993,7 +4996,7 @@ SINT32 sf_get_ntp(SINT32 value, SF_PARA_TIME_S *current_time)
|
||||||
|
|
||||||
time++;
|
time++;
|
||||||
|
|
||||||
if(time > 800)
|
if(time > 200)
|
||||||
{
|
{
|
||||||
SLOGE(gsmPara);
|
SLOGE(gsmPara);
|
||||||
sprintf((char *)logStr, "[%s:%d]Wait Init Timeout.", __FUNCTION__, __LINE__);
|
sprintf((char *)logStr, "[%s:%d]Wait Init Timeout.", __FUNCTION__, __LINE__);
|
||||||
|
|
Loading…
Reference in New Issue
Block a user