diff options
| author | Shlomo Hecht <shlomo@twine-s.com> | 2020-06-05 18:12:02 +0300 |
|---|---|---|
| committer | Shlomo Hecht <shlomo@twine-s.com> | 2020-06-05 18:12:02 +0300 |
| commit | 8da33fbc50ad0f44b83650ff84f1b73bf91bd58b (patch) | |
| tree | eac775ce12e0db3cb0b21206846382cd92422ecf /Software/Embedded_SW/Embedded/Common | |
| parent | 04ae63e2b4f59eb350890ad8ca508e61df074d68 (diff) | |
| download | Tango-8da33fbc50ad0f44b83650ff84f1b73bf91bd58b.tar.gz Tango-8da33fbc50ad0f44b83650ff84f1b73bf91bd58b.zip | |
release notes for 1.4.6.30
Diffstat (limited to 'Software/Embedded_SW/Embedded/Common')
| -rw-r--r-- | Software/Embedded_SW/Embedded/Common/SWUpdate/FirmwareUpgrade.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/Software/Embedded_SW/Embedded/Common/SWUpdate/FirmwareUpgrade.c b/Software/Embedded_SW/Embedded/Common/SWUpdate/FirmwareUpgrade.c index d6e391e87..f39f6a5eb 100644 --- a/Software/Embedded_SW/Embedded/Common/SWUpdate/FirmwareUpgrade.c +++ b/Software/Embedded_SW/Embedded/Common/SWUpdate/FirmwareUpgrade.c @@ -100,7 +100,7 @@ uint32_t ActivateVersionRequestFunc(MessageContainer* requestContainer) uint32_t Bytes = 0; char SWUpgradePath[100]; char FullPath[50]; - FRESULT Fresult = FR_OK; + FRESULT Fresult = FR_OK , FFresult = FR_OK; FILINFO* fno = 0; fno = my_malloc(sizeof(FILINFO)); @@ -157,25 +157,25 @@ uint32_t ActivateVersionRequestFunc(MessageContainer* requestContainer) break; case VERSION_FILE_DESTINATION__ConfigParams: usnprintf(FullPath, 50, "%s%s%s", request->path,"/", VersionPackage->filedescriptors[File_i]->filename); - Fresult = f_unlink("//SYSINFO//EMBPARAM.CFG"); - Fresult |= f_rename (FullPath, "//SYSINFO//EMBPARAM.CFG"); + FFresult = f_unlink("//SYSINFO//EMBPARAM.CFG"); + FFresult |= f_rename (FullPath, "//SYSINFO//EMBPARAM.CFG"); LoadConfigurationParamsFromFile(true); - Report("ConfigParams",__FILE__,Fresult,(int)NumberOfFiles,RpWarning,CurrentRunningFile,0); + Report("ConfigParams",__FILE__,FFresult,(int)NumberOfFiles,RpWarning,CurrentRunningFile,0); CurrentRunningFile++; break; case VERSION_FILE_DESTINATION__ProcessParams: usnprintf(FullPath, 50, "%s%s%s", request->path,"/", VersionPackage->filedescriptors[File_i]->filename); - Fresult = f_unlink("//SYSINFO//PROCESSP.CFG"); - Fresult |= f_rename (FullPath, "//SYSINFO//PROCESSP.CFG"); + FFresult = f_unlink("//SYSINFO//PROCESSP.CFG"); + FFresult |= f_rename (FullPath, "//SYSINFO//PROCESSP.CFG"); LoadProcessParamsFromFile(); - Report("ProcessParams",__FILE__,Fresult,(int)NumberOfFiles,RpWarning,CurrentRunningFile,0); + Report("ProcessParams",__FILE__,FFresult,(int)NumberOfFiles,RpWarning,CurrentRunningFile,0); CurrentRunningFile++; break; case VERSION_FILE_DESTINATION__AlarmParams: usnprintf(FullPath, 50, "%s%s%s", request->path,"/", VersionPackage->filedescriptors[File_i]->filename); - Fresult = f_unlink("//SYSINFO//ALARM.CFG"); - Fresult |= f_rename (FullPath, "//SYSINFO//ALARM.CFG"); - Report("AlarmParams",__FILE__,Fresult,(int)NumberOfFiles,RpWarning,CurrentRunningFile,0); + FFresult = f_unlink("//SYSINFO//ALARM.CFG"); + FFresult |= f_rename (FullPath, "//SYSINFO//ALARM.CFG"); + Report("AlarmParams",__FILE__,FFresult,(int)NumberOfFiles,RpWarning,CurrentRunningFile,0); //AlarmHandlingLoadFile(); FlashInit(); Reboot = true; @@ -183,9 +183,9 @@ uint32_t ActivateVersionRequestFunc(MessageContainer* requestContainer) break; case VERSION_FILE_DESTINATION__GeneralHWConfigParams: usnprintf(FullPath, 50, "%s%s%s", request->path,"/", VersionPackage->filedescriptors[File_i]->filename); - Fresult = f_unlink("//SYSINFO//GENHWCFG.CFG"); - Fresult |= f_rename (FullPath, "//SYSINFO//GENHWCFG.CFG"); - Report("GeneralHWConfigParams",__FILE__,Fresult,(int)NumberOfFiles,RpWarning,CurrentRunningFile,0); + FFresult = f_unlink("//SYSINFO//GENHWCFG.CFG"); + FFresult |= f_rename (FullPath, "//SYSINFO//GENHWCFG.CFG"); + Report("GeneralHWConfigParams",__FILE__,FFresult,(int)NumberOfFiles,RpWarning,CurrentRunningFile,0); HWConfigurationLoadFile(); CurrentRunningFile++; break; |