From bdb2ae480c0616dff10deabaa7c8cbb6fa16ffff Mon Sep 17 00:00:00 2001
From: Shlomo Hecht <shlomo@twine-s.com>
Date: Thu, 30 Jan 2020 16:47:22 +0200
Subject: Version 1.4.6.7 : beginning of removing the #ifdefs. Sylco head and
 arc head temperature control fixed. new events (version 18),

---
 Software/Embedded_SW/Embedded/Common/SWUpdate/FirmwareUpgrade.c | 2 +-
 Software/Embedded_SW/Embedded/Common/SW_Info/SW_Info.c          | 2 +-
 Software/Embedded_SW/Embedded/Common/report/reportInit.c        | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'Software/Embedded_SW/Embedded/Common')

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,
-- 
cgit v1.3.1