merge

3 files changed, 17 insertions, 7 deletions

diff --git a/Software/Embedded_SW/Embedded/Common/report/filter.c b/Software/Embedded_SW/Embedded/Common/report/filter.c
index 753123ee7..78e0ef7eb 100644
--- a/Software/Embedded_SW/Embedded/Common/report/filter.c
+++ b/Software/Embedded_SW/Embedded/Common/report/filter.c
@@ -333,7 +333,13 @@ void ReportSeveritySet(ErrorSeverity level)
    SeverityLevel = level;
 }
 
+uint32_t safeReport(char *message, char *FileName, int LineNumber,int errorCode,int Severity,int parameter1,int parameter2)
+{
+    if (isReportActive() == false)
+        return OK;
+    return (Report(message, FileName,  LineNumber, errorCode, Severity, parameter1, parameter2));
 
+}
 /***************************************************************************
  *
  *  Name        : Report
diff --git a/Software/Embedded_SW/Embedded/Common/report/report.h b/Software/Embedded_SW/Embedded/Common/report/report.h
index 84063fb0f..94017ff20 100644
--- a/Software/Embedded_SW/Embedded/Common/report/report.h
+++ b/Software/Embedded_SW/Embedded/Common/report/report.h
@@ -131,6 +131,8 @@ uint32_t OpenLogFile(void);
 uint32_t CloseLogFile(void);
 bool isReportActive(void);
 uint32_t LogToFile(char *message, char *FileName, int LineNumber,int errorCode,int Severity,int parameter);
+uint32_t safeReport(char *message, char *FileName, int LineNumber,int errorCode,int Severity,int parameter1,int parameter2);
+
 
 
 /***************************************************************************
diff --git a/Software/Embedded_SW/Embedded/Common/report/reportInit.c b/Software/Embedded_SW/Embedded/Common/report/reportInit.c
index 8292cdeda..4b056b0d8 100644
--- a/Software/Embedded_SW/Embedded/Common/report/reportInit.c
+++ b/Software/Embedded_SW/Embedded/Common/report/reportInit.c
@@ -101,7 +101,7 @@ uint32_t OpenLogFile(void)
                 f_lseek(LogFileHandle, 0);
                 f_truncate (LogFileHandle);
             }
-            len = usnprintf(RepMessage, 80, "\r\n*******\r\nLog File start %s %s",__DATE__, __TIME__);
+            len = usnprintf(RepMessage, 80, "\r\n*******\r\nLog File start %d/%d/%d %d:%d:%d",LocalTime.tm_mday,LocalTime.tm_mon+1,LocalTime.tm_year,LocalTime.tm_hour,LocalTime.tm_min,LocalTime.tm_sec);
             LogFresult = f_write(LogFileHandle,RepMessage,len,&Bytes );
             ReportResetReason();
         }
@@ -110,8 +110,9 @@ uint32_t OpenLogFile(void)
         LogFresult = FR_INT_ERR;
 
     return LogFresult;
-#endif	
+#else
     return OK;
+#endif
 }
 uint32_t CloseLogFile(void)
 {
@@ -119,13 +120,14 @@ uint32_t CloseLogFile(void)
 #ifdef STORE_DEBUG_LOGS
     int len;
     uint32_t Bytes = 0;
-    len = usnprintf(RepMessage, 80, "Closing Log File %s %s",__DATE__, __TIME__);
+    len = usnprintf(RepMessage, 80, "\r\n*******\r\nClosing Log File %d/%d/%d %d:%d:%d",LocalTime.tm_mday,LocalTime.tm_mon+1,LocalTime.tm_year,LocalTime.tm_hour,LocalTime.tm_min,LocalTime.tm_sec);
     LogFresult = f_write(LogFileHandle,RepMessage,len,&Bytes );
     LogFresult = f_close(LogFileHandle);
     LogFileHandle = NULL;
     return LogFresult;
-#endif	
+#else
     return OK;
+#endif
 
 }
 uint32_t LogToFile(char *message,       /* The formatted message                */
@@ -143,13 +145,13 @@ uint32_t LogToFile(char *message,       /* The formatted message
     if (LogFileHandle == NULL)
         return OK;
 
-    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);
+    len = usnprintf(RepMessage, 300, "\r\n %d:%d:%d %s ,file %s\t  line %d\t code %d\t sev %d,\tparam %d",LocalTime.tm_hour,LocalTime.tm_min,LocalTime.tm_sec,message,FileName, LineNumber,errorCode, Severity, parameter);
     LogFresult = f_write(LogFileHandle,RepMessage,len,&Bytes );
 
     return LogFresult;
-#endif	
+#else
     return OK;
-
+#endif
 }
 int ReportResponseFunc(char *message,       /* The formatted message                */
                        char *FileName,