Job error message

1 files changed, 6 insertions, 0 deletions

diff --git a/Software/Embedded_SW/Embedded/StateMachines/Printing/JobSTM.c b/Software/Embedded_SW/Embedded/StateMachines/Printing/JobSTM.c
index ca859f390..39afcb954 100644
--- a/Software/Embedded_SW/Embedded/StateMachines/Printing/JobSTM.c
+++ b/Software/Embedded_SW/Embedded/StateMachines/Printing/JobSTM.c
@@ -1014,11 +1014,14 @@ void JobRequestFunc(MessageContainer* requestContainer)
         responseContainer = createContainer(MESSAGE_TYPE__JobResponse, JobToken, true, &response, &job_response__pack, &job_response__get_packed_size);
         responseContainer.has_error = true;
         responseContainer.error = error;
+        if (strlen(ErrorMsg))
+            responseContainer.errormessage = ErrorMsg;
         container_buffer = my_malloc(message_container__get_packed_size(&responseContainer));
     }
     if (container_buffer)
     {
         size_t container_size = message_container__pack(&responseContainer, container_buffer);
+        ErrorMsg[0] = 0;
         my_free(responseContainer.data.data);
         SendChars((char*)container_buffer, container_size);
         //We keep the job request until it is done
@@ -1158,6 +1161,8 @@ void SendJobProgress(double ProcessedLength, int SegmentId, bool done, char *Mes
                     JobAbortedByUser = false;
                     responseContainer.has_error = true;
                     responseContainer.error = ERROR_CODE__CONTINUOUS_RESPONSE_ABORTED;
+                    if (strlen(ErrorMsg))
+                        responseContainer.errormessage = ErrorMsg;
                 }
             }
             container_buffer = my_malloc(message_container__get_packed_size(&responseContainer));
@@ -1165,6 +1170,7 @@ void SendJobProgress(double ProcessedLength, int SegmentId, bool done, char *Mes
             {
                 size_t container_size = message_container__pack(&responseContainer, container_buffer);
                 //        if (SendChars(container_buffer, container_size) == false) //comm tx mailbox full
+                ErrorMsg[0] = 0;
                 if (SendCharsWithType(container_buffer, container_size,MESSAGE_TYPE__JobResponse) == false) //comm tx mailbox full
                 {
                     //AlarmHandlingToken[0] = 0;