preparation for persistant alarms, handle temperature spike, handle voltage hystersis

1 files changed, 5 insertions, 4 deletions

diff --git a/Software/Embedded_SW/Embedded/StateMachines/Printing/JobSTM.c b/Software/Embedded_SW/Embedded/StateMachines/Printing/JobSTM.c
index 7a8265cbb..155d84fdb 100644
--- a/Software/Embedded_SW/Embedded/StateMachines/Printing/JobSTM.c
+++ b/Software/Embedded_SW/Embedded/StateMachines/Printing/JobSTM.c
@@ -1042,10 +1042,6 @@ void SendCleaningJobProgress(double ProcessedLength, int SegmentId, bool done, c
     double totlen = ProcessedLength;
     if (ProcessedLength>job_length)
         totlen = job_length;
-    if (Message)
-    {
-        response.status = Message;
-    }
     response.has_progress = true;
     response.progress = totlen;
     response.has_total = true;
@@ -1060,6 +1056,11 @@ void SendCleaningJobProgress(double ProcessedLength, int SegmentId, bool done, c
         {
             responseContainer.has_error = true;
             responseContainer.error = JobError_to_ErrorCode[JobEndReason];
+            responseContainer.errormessage = Message;
+            if (Message)  //moved - bug #3867
+            {
+                response.status = Message;
+            }
         }
         if (JobAbortedByUser == true)
         {