From 2d36ca07a6b43cf997aea3a987ed97cd3afcb655 Mon Sep 17 00:00:00 2001
From: Shlomo Hecht <shlomo@twine-s.com>
Date: Tue, 27 Oct 2020 12:04:23 +0200
Subject: fix flash writing (parameters. now causes reset!), improve logs
 saving on errfile.txt, prevent motor alarms after hw configuration

---
 .../Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c   | 17 -----------------
 .../Embedded/Common/SWUpdate/FirmwareUpgrade.c          |  6 +++++-
 .../Embedded_SW/Embedded/Common/report/reportInit.c     |  5 +++++
 3 files changed, 10 insertions(+), 18 deletions(-)

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

diff --git a/Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c b/Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c
index 56888b742..10f33c62b 100644
--- a/Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c
+++ b/Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c
@@ -662,15 +662,6 @@ uint32_t    GetFilesRequestFunc(MessageContainer* requestContainer)
     FRESULT Fresult = FR_OK;
     FileInfo **FilesInfo = (FileInfo**)my_malloc(sizeof(FileInfo *)*(MAX_NUM_OF_FILES));
     FileInfo Data[MAX_NUM_OF_FILES];
-    /*
-    time_t t;
-    struct tm *ltm;
-    char *curTime;
-    t = time(NULL);
-    ltm = localtime(&t);
-    curTime = asctime(ltm);
-    Report(curTime, __FILE__, ltm->tm_hour,ltm->tm_min , RpWarning,  ltm->tm_sec, 0);
-     */
 
     if (1)//(Semaphore_pend(FFS_Sem, BIOS_NO_WAIT))
     {
@@ -727,14 +718,6 @@ uint32_t    GetFilesRequestFunc(MessageContainer* requestContainer)
            Data[i].lastmodifieddate = fno[i]->fdate;
            Data[i].has_lastmodifiedtime = true;
            Data[i].lastmodifiedtime = fno[i]->ftime;
-           /*
-           t = (fno[i]->fdate<<16)+fno[i]->ftime;
-           ltm = localtime(&t);
-           curTime = asctime(ltm);
-           usnprintf(&Datestr, 100, "File info %s %s",fno[i]->fname, curTime);
-           Report(Datestr, __FILE__, __LINE__, t, RpWarning,   (int)Data[i].lastmodifiedtime, 0);
-           Task_sleep(50);
-            */
 
            if (i==0)
                usnprintf(&FullPath[i], 50,  "%s", request->path);
diff --git a/Software/Embedded_SW/Embedded/Common/SWUpdate/FirmwareUpgrade.c b/Software/Embedded_SW/Embedded/Common/SWUpdate/FirmwareUpgrade.c
index dbbe47ddb..2d39d25ec 100644
--- a/Software/Embedded_SW/Embedded/Common/SWUpdate/FirmwareUpgrade.c
+++ b/Software/Embedded_SW/Embedded/Common/SWUpdate/FirmwareUpgrade.c
@@ -165,6 +165,8 @@ uint32_t    ActivateVersionRequestFunc(MessageContainer* requestContainer)
                     usnprintf(FullPath, 50,  "%s%s%s", request->path,"/", VersionPackage->filedescriptors[File_i]->filename);
                     FFresult = f_unlink("//SYSINFO//EMBPARAM.CFG");
                     FFresult |= f_rename (FullPath, "//SYSINFO//EMBPARAM.CFG");
+                    FlashInit();
+                    Reboot = true;
                     LoadConfigurationParamsFromFile(true);
                     Report("ConfigParams",__FILE__,FFresult,(int)NumberOfFiles,RpWarning,CurrentRunningFile,0);
                     CurrentRunningFile++;
@@ -173,7 +175,9 @@ uint32_t    ActivateVersionRequestFunc(MessageContainer* requestContainer)
                     usnprintf(FullPath, 50,  "%s%s%s", request->path,"/", VersionPackage->filedescriptors[File_i]->filename);
                     FFresult = f_unlink("//SYSINFO//PROCESSP.CFG");
                     FFresult |= f_rename (FullPath, "//SYSINFO//PROCESSP.CFG");
-                    LoadProcessParamsFromFile();
+                    //LoadProcessParamsFromFile();
+                    FlashInit();
+                    Reboot = true;
                     Report("ProcessParams",__FILE__,FFresult,(int)NumberOfFiles,RpWarning,CurrentRunningFile,0);
                     CurrentRunningFile++;
                 break;
diff --git a/Software/Embedded_SW/Embedded/Common/report/reportInit.c b/Software/Embedded_SW/Embedded/Common/report/reportInit.c
index 8890fa8b9..2778943f3 100644
--- a/Software/Embedded_SW/Embedded/Common/report/reportInit.c
+++ b/Software/Embedded_SW/Embedded/Common/report/reportInit.c
@@ -109,6 +109,10 @@ uint32_t OpenLogFile(void)
 uint32_t CloseLogFile(void)
 {
     /* perform default error output */
+    int len;
+    uint32_t Bytes = 0;
+    len = usnprintf(RepMessage, 80, "Closing Log File %s %s",__DATE__, __TIME__);
+    LogFresult = f_write(LogFileHandle,RepMessage,len,&Bytes );
     LogFresult = f_close(LogFileHandle);
     LogFileHandle = NULL;
     return LogFresult;
@@ -329,6 +333,7 @@ uint32_t ReportInitMessage(MessageContainer* requestContainer)
 //    ReportInitParams InitParams;
 
     StartDebugLogRequest* request = start_debug_log_request__unpack(NULL, requestContainer->data.len, requestContainer->data.data);
+    Report("==============Saving file=================", __FILE__, __LINE__, _gTangoVersion.m_patch, RpWarning, _gTangoVersion.m_build, 0);
     ustrncpy (protobufToken, requestContainer->token,36);
     if (LogFileHandle != NULL)
 		f_sync(LogFileHandle);
-- 
cgit v1.3.1