diff options
| author | Shlomo Hecht <shlomo@twine-s.com> | 2020-02-02 14:44:38 +0200 |
|---|---|---|
| committer | Shlomo Hecht <shlomo@twine-s.com> | 2020-02-02 14:44:38 +0200 |
| commit | 6eab4de02492bac0afdc371c03cf062fad2ad28c (patch) | |
| tree | c1c2d422186fdb87d18bb7cd86b8090fff31fc98 /Software/Embedded_SW/Embedded/Common | |
| parent | fe2b5f331db1dced991517ea6b03787608a5a252 (diff) | |
| parent | b60ab925b3d2d24a86f6db51f9880364165767e1 (diff) | |
| download | Tango-6eab4de02492bac0afdc371c03cf062fad2ad28c.tar.gz Tango-6eab4de02492bac0afdc371c03cf062fad2ad28c.zip | |
merge
Diffstat (limited to 'Software/Embedded_SW/Embedded/Common')
3 files changed, 4 insertions, 3 deletions
diff --git a/Software/Embedded_SW/Embedded/Common/SWUpdate/FirmwareUpgrade.c b/Software/Embedded_SW/Embedded/Common/SWUpdate/FirmwareUpgrade.c index 067466f74..d7388a64b 100644 --- a/Software/Embedded_SW/Embedded/Common/SWUpdate/FirmwareUpgrade.c +++ b/Software/Embedded_SW/Embedded/Common/SWUpdate/FirmwareUpgrade.c @@ -157,7 +157,7 @@ uint32_t ActivateVersionRequestFunc(MessageContainer* requestContainer) 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"); - LoadConfigurationParamsFromFile(); + LoadConfigurationParamsFromFile(true); CurrentRunningFile++; break; case VERSION_FILE_DESTINATION__ProcessParams: 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 4032db82f..ec3bc602e 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,6,6}; +TangoVersion_t _gTangoVersion = {1,4,6,7}; #define BUILD_DATE __DATE__ char Dat[50] = BUILD_DATE; char _gTangoName [MAX_STRING_LEN] = "Tango01 ";//d diff --git a/Software/Embedded_SW/Embedded/Common/report/reportInit.c b/Software/Embedded_SW/Embedded/Common/report/reportInit.c index 4fbae36bf..a7d7c17ef 100644 --- a/Software/Embedded_SW/Embedded/Common/report/reportInit.c +++ b/Software/Embedded_SW/Embedded/Common/report/reportInit.c @@ -94,8 +94,9 @@ uint32_t OpenLogFile(void) uint32_t CloseLogFile(void) { /* perform default error output */ - //f_close(LogFileHandle); + //LogFresult = f_close(LogFileHandle); + return LogFresult; } uint32_t LogToFile(char *message, /* The formatted message */ char *FileName, |