Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango

4 files changed, 27 insertions, 16 deletions

diff --git a/Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c b/Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c
index f3d42b01a..17c1f164b 100644
--- a/Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c
+++ b/Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c
@@ -566,20 +566,12 @@ uint32_t    DeleteRequestFunc(MessageContainer* requestContainer)
     //int NumOfFiles = 0;
     FRESULT Fresult = FR_OK;
 
-    if (1)//(Semaphore_pend(FFS_Sem, BIOS_NO_WAIT))
-    {
-        Fresult = f_unlink(request->path);
-        Semaphore_post(FFS_Sem);
-    }
-    else
-    {
-        Fresult = FR_DENIED;
-        Report("Semaphore_pend failed", __FILE__, __LINE__, 4, RpWarning,   (int)0, 0);
-    }
+    Fresult = f_unlink(request->path);
+    Semaphore_post(FFS_Sem);
 
     REPORT_MSG(Fresult, "File Delete");
     responseContainer = createContainer(MESSAGE_TYPE__DeleteResponse,  requestContainer->token, false, &response, &delete_response__pack, &delete_response__get_packed_size);
-    if (Fresult!= OK)
+    if ((Fresult!= FR_OK)&&(Fresult!= FR_NO_FILE))
     {
         //usnprintf(ErrorMsg, 100, "File Operation failed error code %d",Fresult);
         responseContainer.has_error = true;
@@ -794,8 +786,11 @@ FRESULT FileWrite(void * buffer, uint16_t size,char *path, uint32_t timeout)
                     {
                         LOG_ERROR (Fresult,"fwrite error");
                     }
-                    //LOG_ERROR (Bytes,"f_write ok no of bytes");
-                     Report("f_write ok no of bytes", __FILE__, __LINE__, Bytes, RpWarning,   (int)size, 0);
+                    else
+                    {
+                        //LOG_ERROR (Bytes,"f_write ok no of bytes");
+                         Report("f_write ok no of bytes", __FILE__, __LINE__, Bytes, RpWarning,   (int)size, 0);
+                    }
                     f_close(FileHandle);
                 }
                 else
@@ -875,12 +870,14 @@ FRESULT FileRead(char *path, uint32_t *Size, void **Buffer)
         }
         else
         {
-            LOG_ERROR (Fresult,"malloc error");
+            Report("malloc error", __FILE__, __LINE__, Fresult, RpWarning,   (int)fno->fsize, 0);
+            Fresult = FR_DENIED;
         }
     }
     else
     {
-        LOG_ERROR (Fresult,"f_stat error");
+        Report("f_stat error", __FILE__, __LINE__, Fresult, RpWarning,   (int)0, 0);
+        Fresult = FR_DENIED;
     }
     my_free(fno);
     return Fresult;
diff --git a/Software/Embedded_SW/Embedded/Common/SWUpdate/FirmwareUpgrade.c b/Software/Embedded_SW/Embedded/Common/SWUpdate/FirmwareUpgrade.c
index 078055920..a404ca8ee 100644
--- a/Software/Embedded_SW/Embedded/Common/SWUpdate/FirmwareUpgrade.c
+++ b/Software/Embedded_SW/Embedded/Common/SWUpdate/FirmwareUpgrade.c
@@ -31,6 +31,7 @@
 #include "Modules/Control/Control.h"
 #include "Modules/AlarmHandling/AlarmHandling.h"
 #include "modules/General/process.h"
+#include "Modules/heaters/heaters_ex.h"
 
 
 int NumberOfFiles = 0,CurrentRunningFile;
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 3b88982c2..5392a415e 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,5,3,2};
+TangoVersion_t _gTangoVersion = {1,5,3,4};
 #define BUILD_DATE __DATE__
 char Dat[50] = BUILD_DATE; 
 
diff --git a/Software/Embedded_SW/Embedded/Common/report/reportInit.c b/Software/Embedded_SW/Embedded/Common/report/reportInit.c
index a11f9db73..2850f666e 100644
--- a/Software/Embedded_SW/Embedded/Common/report/reportInit.c
+++ b/Software/Embedded_SW/Embedded/Common/report/reportInit.c
@@ -85,6 +85,7 @@ bool isReportActive(void)
 }
 uint32_t OpenLogFile(void)
 {
+#ifdef STORE_DEBUG_LOGS
     int len;
     uint32_t Bytes = 0;
     LogFileHandle = my_malloc(sizeof(FIL));
@@ -106,10 +107,13 @@ uint32_t OpenLogFile(void)
         LogFresult = FR_INT_ERR;
 
     return LogFresult;
+#endif	
+    return OK;
 }
 uint32_t CloseLogFile(void)
 {
     /* perform default error output */
+#ifdef STORE_DEBUG_LOGS
     int len;
     uint32_t Bytes = 0;
     len = usnprintf(RepMessage, 80, "Closing Log File %s %s",__DATE__, __TIME__);
@@ -117,6 +121,9 @@ uint32_t CloseLogFile(void)
     LogFresult = f_close(LogFileHandle);
     LogFileHandle = NULL;
     return LogFresult;
+#endif	
+    return OK;
+
 }
 uint32_t LogToFile(char *message,       /* The formatted message                */
                    char *FileName,
@@ -127,6 +134,7 @@ uint32_t LogToFile(char *message,       /* The formatted message
 {
 
         /* print user supplied error code */
+#ifdef STORE_DEBUG_LOGS
     uint32_t Bytes = 0;
     int len;
     if (LogFileHandle == NULL)
@@ -134,8 +142,13 @@ uint32_t LogToFile(char *message,       /* The formatted message
 
     len = usnprintf(RepMessage, 300, "\r\nfile %s\t  line %d\t code %d\t sev %d,\tparam %d,\t %s",FileName, LineNumber,errorCode, Severity, parameter,message);
     LogFresult = f_write(LogFileHandle,RepMessage,len,&Bytes );
+    if (LogFileHandle->fsize > 100000)
+        f_lseek(LogFileHandle, 0);
 
     return LogFresult;
+#endif	
+    return OK;
+
 }
 int ReportResponseFunc(char *message,       /* The formatted message                */
                        char *FileName,