merge conflicts

1 files changed, 4 insertions, 3 deletions

diff --git a/Software/Embedded_SW/Embedded/Common/report/reportInit.c b/Software/Embedded_SW/Embedded/Common/report/reportInit.c
index 29728f6f2..1f955e23f 100644
--- a/Software/Embedded_SW/Embedded/Common/report/reportInit.c
+++ b/Software/Embedded_SW/Embedded/Common/report/reportInit.c
@@ -75,9 +75,9 @@ int ReportResponseFunc(char *message,       /* The formatted message
     response.filename = FileName;
     response.has_linenumber = true;
     response.linenumber = LineNumber;
-    /*response.has_errorcode = true;
-    response.errorcode = (ErrorCode)errorCode;
-    response.has_severity = true;
+    response.has_moduleid = true;
+    response.moduleid = errorCode;
+    /*response.has_severity = true;
     response.severity = (Severity)parameter1;*/
     response.has_filter = true;
     response.filter = parameter;
@@ -149,6 +149,7 @@ uint32_t StopReportInitMessage(MessageContainer* requestContainer)
     StopDebugLogResponse response = STOP_DEBUG_LOG_RESPONSE__INIT;
 
 //TODO Handle the request!!!!
+    protobufToken[0] = 0;
     responseContainer = createContainer(MESSAGE_TYPE__StopDebugLogResponse, protobufToken, false, &response, &stop_debug_log_response__pack, &stop_debug_log_response__get_packed_size);
     responseContainer.continuous = true;
     uint8_t* container_buffer = malloc(message_container__get_packed_size(&responseContainer));