diff options
| author | Shlomo Hecht <shlomo@twine-s.com> | 2019-07-09 17:14:59 +0300 |
|---|---|---|
| committer | Shlomo Hecht <shlomo@twine-s.com> | 2019-07-09 17:14:59 +0300 |
| commit | 1dfd14ae3fbf868e8992420127a9cf3e6318e5ff (patch) | |
| tree | 361fd92aa85a41f13d4d4e832b0ed712ccf50e82 /Software/Embedded_SW/Embedded/Common | |
| parent | 8f947838ae3802043ba60223431b9603dffd34fb (diff) | |
| download | Tango-1dfd14ae3fbf868e8992420127a9cf3e6318e5ff.tar.gz Tango-1dfd14ae3fbf868e8992420127a9cf3e6318e5ff.zip | |
Version 1.4.2.0 - infrastructure for IFS, improved flash handling, thread unloading
Diffstat (limited to 'Software/Embedded_SW/Embedded/Common')
| -rw-r--r-- | Software/Embedded_SW/Embedded/Common/SWUpdate/FirmwareUpgrade.c | 2 | ||||
| -rw-r--r-- | Software/Embedded_SW/Embedded/Common/SW_Info/SW_Info.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Software/Embedded_SW/Embedded/Common/SWUpdate/FirmwareUpgrade.c b/Software/Embedded_SW/Embedded/Common/SWUpdate/FirmwareUpgrade.c index 273dfb49d..77056213f 100644 --- a/Software/Embedded_SW/Embedded/Common/SWUpdate/FirmwareUpgrade.c +++ b/Software/Embedded_SW/Embedded/Common/SWUpdate/FirmwareUpgrade.c @@ -120,7 +120,6 @@ uint32_t ActivateVersionRequestFunc(MessageContainer* requestContainer) } for (File_i = 0;File_i<VersionPackage->n_filedescriptors;File_i++) { - CurrentRunningFile = 0; CurrentFileSize = -1; vme_index = 0; switch(VersionPackage->filedescriptors[File_i]->destination) @@ -156,6 +155,7 @@ uint32_t ActivateVersionRequestFunc(MessageContainer* requestContainer) usnprintf(FullPath, 50, "%s%s%s", request->path,"/", VersionPackage->filedescriptors[File_i]->filename); Fresult = f_unlink("//SYSINFO//ALARMPRM.CFG"); Fresult |= f_rename (FullPath, "//SYSINFO//ALARMPRM.CFG"); + AlarmHandlingLoadFile(); CurrentRunningFile++; break; case VERSION_FILE_DESTINATION__GeneralHWConfigParams: diff --git a/Software/Embedded_SW/Embedded/Common/SW_Info/SW_Info.c b/Software/Embedded_SW/Embedded/Common/SW_Info/SW_Info.c index ba601e283..ad0191ab4 100644 --- a/Software/Embedded_SW/Embedded/Common/SW_Info/SW_Info.c +++ b/Software/Embedded_SW/Embedded/Common/SW_Info/SW_Info.c @@ -20,7 +20,7 @@ typedef struct } TangoVersion_t; -TangoVersion_t _gTangoVersion = {1,4,1,1}; +TangoVersion_t _gTangoVersion = {1,4,2,0}; #define BUILD_DATE __DATE__ char Dat[50] = BUILD_DATE; char _gTangoName [MAX_STRING_LEN] = "Tango01 ";//d |