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

2 files changed, 32 insertions, 11 deletions

diff --git a/Software/Embedded_SW/Embedded/Common/report/distributor.c b/Software/Embedded_SW/Embedded/Common/report/distributor.c
index ee55c3bc9..a9ebb5c13 100644
--- a/Software/Embedded_SW/Embedded/Common/report/distributor.c
+++ b/Software/Embedded_SW/Embedded/Common/report/distributor.c
@@ -270,7 +270,7 @@ Void reportService(UArg arg0, UArg arg1)
 //            par2 = 0;
 //        }*/
         /* send message to subscribers */
-        messageDistribute( msg.message, DistTableEntry,msg.FileName, msg.LineNumber,msg.errorCode,msg.severity,msg.parameter2);
+        messageDistribute( msg.message, DistTableEntry,msg.FileName, msg.LineNumber,msg.errorCode,msg.severity,msg.parameter1);
     }
 }
 
@@ -704,8 +704,8 @@ static void messageDistribute(char *msg,
                               char *FileName,
                                int LineNumber,
                               int errorCode,
-                              int parameter1,
-                              int parameter2)
+                              int Severity,
+                              int parameter)
 {
     int index;
 
@@ -718,12 +718,13 @@ static void messageDistribute(char *msg,
     {
         if (Dist_Table[DistTableEntry].dest[index].function != NULL)
             Dist_Table[DistTableEntry].dest[index].function(msg,FileName,LineNumber,errorCode,parameter1,parameter2);
-    }*/
+    }
+    */
 
     if (ReportFunc1 != NULL)
-        ReportFunc1(msg,  FileName,LineNumber,errorCode,parameter1, parameter2);
+        ReportFunc1(msg,  FileName,LineNumber,errorCode,Severity, parameter);
     if (ReportFunc2 != NULL)
-        ReportFunc2(msg,  FileName,LineNumber,errorCode,parameter1, parameter2);
+        ReportFunc2(msg,  FileName,LineNumber,errorCode,Severity, parameter);
 
 }
 
diff --git a/Software/Embedded_SW/Embedded/Common/report/reportInit.c b/Software/Embedded_SW/Embedded/Common/report/reportInit.c
index b9f676d3a..28df4846d 100644
--- a/Software/Embedded_SW/Embedded/Common/report/reportInit.c
+++ b/Software/Embedded_SW/Embedded/Common/report/reportInit.c
@@ -64,8 +64,8 @@ int ReportResponseFunc(char *message,       /* The formatted message
                        char *FileName,
                        int LineNumber,
                            int errorCode,       /* error code that caused the report    */
-                           int parameter1,      /* user parameter no. 1                 */
-                           int parameter2)     /* user parameter no. 2                 */
+                           int Severity,      /* user parameter no. 1                 */
+                           int parameter)     /* user parameter no. 2                 */
 {
     MessageContainer responseContainer;
     if (protobufToken[0] == 0)
@@ -79,10 +79,30 @@ int ReportResponseFunc(char *message,       /* The formatted message
     response.errorcode = (ErrorCode)errorCode;
     response.has_severity = true;
     response.severity = (Severity)parameter1;*/
-    response.has_filter = true;
+    response.has_filter = false;
     response.has_category = true;
-    response.category = (DebugLogCategory)parameter1;
-    response.filter = parameter2;
+    switch (Severity)
+    {
+        case RpMessage:
+            response.category = DEBUG_LOG_CATEGORY__Info;
+            break;
+        case RpWarning:
+            response.category = DEBUG_LOG_CATEGORY__Warning;
+            break;
+        case RpError:
+            response.category = DEBUG_LOG_CATEGORY__Error;
+            break;
+        case RpFatalError:
+            response.category = DEBUG_LOG_CATEGORY__Critical;
+            break;
+        case RpPrivate:
+            response.category = DEBUG_LOG_CATEGORY__Debug;
+            break;
+        default:
+            response.category = DEBUG_LOG_CATEGORY__Info;
+            break;
+    }
+    response.filter = parameter;
     response.message = message;
         responseContainer = createContainer(MESSAGE_TYPE__StartDebugLogResponse, protobufToken, false, &response, &start_debug_log_response__pack, &start_debug_log_response__get_packed_size);
         responseContainer.continuous = true;