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

Fix usbnet bug of new 4g module.

Browse Source
This commit is contained in:
xiaojiazhu 2023-08-21 16:05:56 +08:00
parent c22622fa07
commit 44f64bef68
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/application/sifarsdk

@ -1 +1 @@
Subproject commit c516fe9d7acf4384c84cace98339b5f3ffe228cf Subproject commit 16e808c3a97ba4c47dd683f1daa79b4459b20202

14
code/application/source/sf_app/code/source/app/sf_service.c
View File

@ -1305,6 +1305,7 @@ static SINT32 app_Register_Net_startup_mode(SF_FN_PARAM_S *pfnParam) {
s32ret = sf_get_ntp(s32ret, &current_time); s32ret = sf_get_ntp(s32ret, &current_time);
} }
sf_4G_usb_net_apn_cfg(pfnParam); sf_4G_usb_net_apn_cfg(pfnParam);
set_at_parament();
sf_USB_net_init(); sf_USB_net_init();
if ((SF_ON == pCustomerParam->GpsSwitch)) { if ((SF_ON == pCustomerParam->GpsSwitch)) {
s32ret = open_gps(s32ret); s32ret = open_gps(s32ret);
@ -1348,6 +1349,7 @@ static SINT32 app_Register_Net_startup_mode(SF_FN_PARAM_S *pfnParam) {
//sf_share_mem_customer_down(1); //sf_share_mem_customer_down(1);
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();
sf_USB_net_init(); sf_USB_net_init();
s32ret = sf_read_message(); s32ret = sf_read_message();
@ -1398,6 +1400,7 @@ static SINT32 app_Register_Net_startup_mode(SF_FN_PARAM_S *pfnParam) {
//sf_share_mem_customer_down(1); //sf_share_mem_customer_down(1);
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();
sf_USB_net_init(); sf_USB_net_init();
s32ret = sf_file_send_auto(); s32ret = sf_file_send_auto();
@ -1436,6 +1439,7 @@ 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();
sf_USB_net_init(); sf_USB_net_init();
s32ret = sf_get_utc(); s32ret = sf_get_utc();
@ -1482,6 +1486,7 @@ 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();
sf_USB_net_init(); sf_USB_net_init();
s32ret = sf_get_utc(); s32ret = sf_get_utc();
@ -1518,6 +1523,7 @@ static SINT32 app_Register_Net_startup_mode(SF_FN_PARAM_S *pfnParam) {
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);
sf_4G_usb_net_apn_cfg(pfnParam); sf_4G_usb_net_apn_cfg(pfnParam);
set_at_parament();
sf_USB_net_init(); sf_USB_net_init();
if ((SF_ON == pCustomerParam->GpsSwitch)) { if ((SF_ON == pCustomerParam->GpsSwitch)) {
@ -1768,6 +1774,12 @@ int sf_check_usb0(void)
return 0; return 0;
} }
void set_at_parament(void)
{
UIMenuStoreInfo *pCustomerParam = sf_app_ui_para_get();
set_at_param(pCustomerParam->Sim4gApn, pCustomerParam->Sim4gUsr, pCustomerParam->Sim4gPwd);
}
SINT32 open_gps(const SINT32 utc) SINT32 open_gps(const SINT32 utc)
{ {
UIMenuStoreInfo *pCustomerParam = sf_app_ui_para_get(); UIMenuStoreInfo *pCustomerParam = sf_app_ui_para_get();
@ -1779,7 +1791,7 @@ SINT32 open_gps(const SINT32 utc)
snprintf(ntp_time, NTP_TIME_LENGTH, "%04d/%02d/%02d,%02d:%02d:%02d", snprintf(ntp_time, NTP_TIME_LENGTH, "%04d/%02d/%02d,%02d:%02d:%02d",
current_time.Year, current_time.Mon, current_time.Day, current_time.Year, current_time.Mon, current_time.Day,
current_time.Hour, current_time.Min, current_time.Sec); current_time.Hour, current_time.Min, current_time.Sec);
gps_map_update(pCustomerParam->Sim4gApn, pCustomerParam->Sim4gUsr, pCustomerParam->Sim4gPwd, ntp_time); gps_map_update(ntp_time);
if (AT_MANAGER_SUCCEED == gps_open(ntp_time)) if (AT_MANAGER_SUCCEED == gps_open(ntp_time))
{ {
return SF_SUCCESS; return SF_SUCCESS;