1.优化发送流程:自动模式下B启动和Instant时无需执行模块init,直接进行注网流程

2.8和a启动无线进行usb net初始化
3.优化ip检测代码加快检测频率
This commit is contained in:
payton 2023-11-29 14:59:27 +08:00
parent abb834c296
commit 2271f29b65

View File

@ -230,7 +230,7 @@ void sf_usb_net_init(void)
sprintf(cmdStr, "/usr/bin/quectel-CM-EG91 -n %d&", E_PDP_INDEX); sprintf(cmdStr, "/usr/bin/quectel-CM-EG91 -n %d&", E_PDP_INDEX);
} }
system(cmdStr); system(cmdStr);
sleep(3); //sleep(3);
} }
return; return;
@ -289,10 +289,10 @@ SINT32 sf_USB_net_init(void)
} }
else else
{ {
sleep(1); sf_sleep_ms(500);
} }
} }
sf_net_dns_ck(); //sf_net_dns_ck();
return ret; return ret;
} }
@ -1618,9 +1618,11 @@ static SINT32 app_Register_Net_startup_mode(SF_FN_PARAM_S *pfnParam)
if (pCustomerParam->QLogSwitch == 1) if (pCustomerParam->QLogSwitch == 1)
sf_app_qlog_start(); sf_app_qlog_start();
#endif #endif
if (pCustomerParam->GprsMode != 1)
s32ret = sf_4G_sim_init(pfnParam); {
SF_APPCOMM_CHECK_RETURN(s32ret, SF_APP_ERROR_REQUEST); s32ret = sf_4G_sim_init(pfnParam);
SF_APPCOMM_CHECK_RETURN(s32ret, SF_APP_ERROR_REQUEST);
}
s32ret = sf_4G_register_net_auto(pfnParam); s32ret = sf_4G_register_net_auto(pfnParam);
if (s32ret != SF_SUCCESS) { if (s32ret != SF_SUCCESS) {
@ -1677,9 +1679,9 @@ static SINT32 app_Register_Net_startup_mode(SF_FN_PARAM_S *pfnParam)
// } // }
SF_APPCOMM_CHECK_RETURN(s32ret, SF_APP_ERROR_REQUEST); SF_APPCOMM_CHECK_RETURN(s32ret, SF_APP_ERROR_REQUEST);
sf_4G_usb_net_apn_cfg(pfnParam); // sf_4G_usb_net_apn_cfg(pfnParam);
set_at_parament(); // set_at_parament();
sf_USB_net_init(); // sf_USB_net_init();
s32ret = sf_get_utc(); s32ret = sf_get_utc();
@ -1814,9 +1816,9 @@ static SINT32 app_Register_Net_startup_mode(SF_FN_PARAM_S *pfnParam)
pCustomerParam->NetWorkNeedSearch = 0; pCustomerParam->NetWorkNeedSearch = 0;
} }
SF_APPCOMM_CHECK_RETURN(s32ret, SF_APP_ERROR_REQUEST); SF_APPCOMM_CHECK_RETURN(s32ret, SF_APP_ERROR_REQUEST);
sf_4G_usb_net_apn_cfg(pfnParam); // sf_4G_usb_net_apn_cfg(pfnParam);
set_at_parament(); // set_at_parament();
sf_USB_net_init(); // sf_USB_net_init();
s32ret = sf_get_utc(); s32ret = sf_get_utc();
@ -1844,8 +1846,13 @@ static SINT32 app_Register_Net_startup_mode(SF_FN_PARAM_S *pfnParam)
sf_app_qlog_start(); sf_app_qlog_start();
#endif #endif
s32ret = sf_4G_sim_init(pfnParam);
SF_APPCOMM_CHECK_RETURN(s32ret, SF_APP_ERROR_REQUEST); // if (pCustomerParam->GprsMode != 1)
// {
// s32ret = sf_4G_sim_init(pfnParam);
// SF_APPCOMM_CHECK_RETURN(s32ret, SF_APP_ERROR_REQUEST);
// }
s32ret = sf_4G_register_net_auto(pfnParam); s32ret = sf_4G_register_net_auto(pfnParam);
SF_APPCOMM_CHECK_RETURN(s32ret, SF_APP_ERROR_REQUEST); SF_APPCOMM_CHECK_RETURN(s32ret, SF_APP_ERROR_REQUEST);