From 9b3914f2aa4bb0dc50ee27321f7fa9caec8d05be Mon Sep 17 00:00:00 2001 From: Shlomo Hecht Date: Mon, 2 Nov 2020 16:38:19 +0200 Subject: preparation for persistant alarms, handle temperature spike, handle voltage hystersis --- Software/Embedded_SW/Embedded/StateMachines/Printing/JobSTM.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'Software/Embedded_SW/Embedded/StateMachines') 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) { -- cgit v1.3.1