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

1.ota升级修改

Browse Source
This commit is contained in:
payton 2024-02-05 15:57:53 +08:00
parent 37325778eb
commit 630cdaafda
2 changed files with 47 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/application/source/sf_app/code/source/4gMng/sf_ftp.c
View File

@ -1643,7 +1643,7 @@ SINT32 sf_camera_ota_ftp(void)
if(SF_TRUE == sf_file_IsExsit(tmp)){ if(SF_TRUE == sf_file_IsExsit(tmp)){
sf_file_remove(tmp); sf_file_remove(tmp);
} }
sleep(2);
ret = ftp_download_file(SF_CAM_UP_FILE,tmp,0); ret = ftp_download_file(SF_CAM_UP_FILE,tmp,0);
//if(SUCCESS == ret) //if(SUCCESS == ret)
{ {

86
code/application/source/sf_app/code/source/4gMng/sf_sms.c
View File

@ -2491,24 +2491,27 @@ SINT32 sf_power_off_module_ota(void)
/*instant, hybrid mode*/ /*instant, hybrid mode*/
if(CameraCmd.moduleUpdateOTA) if(CameraCmd.moduleUpdateOTA)
{ {
if(app_ttyusb_IsOpen() != SUCCESS) if(0 == sf_check_sd())
{ {
sf_cmd_camera_restart(1);//usb error,need restart if(app_ttyusb_IsOpen() != SUCCESS)
} {
else sf_cmd_camera_restart(1);//usb error,need restart
{ }
ret = sf_4g_module_ota_ftp();//need restart module else
{
//if(ret == OTA_UPDATED_ERROR || ret == OTA_SUCCESS || ret == OTA_VERTION_ERROR || ret == OTA_TIME_OUT) ret = sf_4g_module_ota_ftp();//need restart module
{
if(CameraCmd.setPara) //if(ret == OTA_UPDATED_ERROR || ret == OTA_SUCCESS || ret == OTA_VERTION_ERROR || ret == OTA_TIME_OUT)
pPara_sms_saved->NetWorkNeedSearch = 3; {
else if(CameraCmd.setPara)
puiPara->NetWorkNeedSearch = 3; pPara_sms_saved->NetWorkNeedSearch = 3;
else
sf_set_para_sava(); puiPara->NetWorkNeedSearch = 3;
}
} sf_set_para_sava();
}
}
}
} }
return ret; return ret;
} }
@ -2571,28 +2574,31 @@ SINT32 sf_power_off_module_sd_update(void)
/*instant, hybrid mode*/ /*instant, hybrid mode*/
if(CameraCmd.moduleUpdateOTA) if(CameraCmd.moduleUpdateOTA)
{ {
if(app_ttyusb_IsOpen() != SUCCESS) if(0 == sf_check_sd())
{ {
sf_cmd_camera_restart(1);//usb error,need restart if(app_ttyusb_IsOpen() != SUCCESS)
} {
else sf_cmd_camera_restart(1);//usb error,need restart
{ }
ret = OTA_NOUPDATE; else
if(sf_is_4g_module_usb_update_file_exist(updateFileName)) {
{ ret = OTA_NOUPDATE;
ret = sf_4g_module_sd_usb_update(updateFileName); if(sf_is_4g_module_usb_update_file_exist(updateFileName))
} {
ret = sf_4g_module_sd_usb_update(updateFileName);
if(ret == OTA_UPDATED_ERROR || ret == OTA_SUCCESS || ret == OTA_VERTION_ERROR || ret == OTA_TIME_OUT) }
{
if(CameraCmd.setPara) if(ret == OTA_UPDATED_ERROR || ret == OTA_SUCCESS || ret == OTA_VERTION_ERROR || ret == OTA_TIME_OUT)
pPara_sms_saved->NetWorkNeedSearch = 3; {
else if(CameraCmd.setPara)
puiPara->NetWorkNeedSearch = 3; pPara_sms_saved->NetWorkNeedSearch = 3;
else
sf_set_para_sava(); puiPara->NetWorkNeedSearch = 3;
}
} sf_set_para_sava();
}
}
}
} }
return 0; return 0;
} }
@ -2850,7 +2856,7 @@ SINT32 sf_power_off_check_fw_update(void)
if(CameraCmd.firmwareUpdateOTA) if(CameraCmd.firmwareUpdateOTA)
{ {
if(sf_in_card_exist() && sf_is_card()) if(0 == sf_check_sd())
{ {
if(app_ttyusb_IsOpen() != SUCCESS) if(app_ttyusb_IsOpen() != SUCCESS)