fix flash writing (parameters. now causes reset!), improve logs saving on errfile.txt, prevent motor alarms after hw configuration

2 files changed, 5 insertions, 18 deletions

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;