improve sublimation handling (set length, cancel, prevent on jogging/cleaning)

2 files changed, 4 insertions, 2 deletions

diff --git a/Software/Embedded_SW/Embedded/StateMachines/Printing/JobSTM.c b/Software/Embedded_SW/Embedded/StateMachines/Printing/JobSTM.c
index 8d11b75a3..ca859f390 100644
--- a/Software/Embedded_SW/Embedded/StateMachines/Printing/JobSTM.c
+++ b/Software/Embedded_SW/Embedded/StateMachines/Printing/JobSTM.c
@@ -1413,7 +1413,6 @@ Void jobTask(UArg arg0, UArg arg1)
                 CurrentJob = NULL;
                 if (IFS_Clearing_SuctionWaiting == true)
                     WHS_Set_IFS_Clearing_Suction(NUM_OF_MIDTANKS);
-                WHS_Set_JobEndSuction();
                 SuspendLargeMessages = false;
                 Report("Job Ended PrintingResultsOk",__FILE__,__LINE__, 4,RpMessage,0,0);
                  //DiagnosticsStart();
@@ -1430,7 +1429,6 @@ Void jobTask(UArg arg0, UArg arg1)
                 SuspendLargeMessages = false;
                 if (IFS_Clearing_SuctionWaiting == true)
                    WHS_Set_IFS_Clearing_Suction(NUM_OF_MIDTANKS);
-                WHS_Set_JobEndSuction();
                 Report("Job Ended PrintingResultsFail",__FILE__,__LINE__, 4,RpError,JobEndReason,0);
                 //send message data as a validation error message to host
                 ExitState(Message.messageData);
diff --git a/Software/Embedded_SW/Embedded/StateMachines/Printing/PrintingSTM.c b/Software/Embedded_SW/Embedded/StateMachines/Printing/PrintingSTM.c
index d65dbadd9..3b0844934 100644
--- a/Software/Embedded_SW/Embedded/StateMachines/Printing/PrintingSTM.c
+++ b/Software/Embedded_SW/Embedded/StateMachines/Printing/PrintingSTM.c
@@ -645,6 +645,10 @@ uint32_t EndState(void *JobDetails, char *Message)
     CloseJobFile();
     //ROM_IntMasterEnable();
     SendJobProgress(0.0,0,true,Message);
+    if ((JoggingJobActive==false)&&(CleaningJobActive == false))
+    {
+        WHS_Set_JobEndSuction();
+    }
     if (JoggingJobActive == true)
     {
         JoggingJobActive = false;