winder calibration from main EEPROM (for #3782, #3761). waste prepare (#2995) increased suction after job (#2994)

1 files changed, 13 insertions, 19 deletions

diff --git a/Software/Embedded_SW/Embedded/StateMachines/Printing/JobSTM.c b/Software/Embedded_SW/Embedded/StateMachines/Printing/JobSTM.c
index c217a68b3..86c8ef7da 100644
--- a/Software/Embedded_SW/Embedded/StateMachines/Printing/JobSTM.c
+++ b/Software/Embedded_SW/Embedded/StateMachines/Printing/JobSTM.c
@@ -209,10 +209,10 @@ static ReturnCode PrepareState(void *JobDetails)
     {
         PrepareWaiting[Module_Thread] = ModuleWaiting;
     }
-    /*if (Configured[Module_Waste])
+    if (Configured[Module_Waste])
     {
         PrepareWaiting[Module_Waste] = ModuleWaiting;
-    }*/
+    }
     if (Configured[Module_Winder])
     {
         PrepareWaiting[Module_Winder] = ModuleWaiting;
@@ -245,8 +245,8 @@ static ReturnCode PrepareState(void *JobDetails)
            SendJobProgress(0.0, 0, false, "Winder prepare failed !!!!");
        }
     }
-    //if (Configured[Module_Waste])
-    //    Waste_Prepare();
+    if (Configured[Module_Waste])
+        Waste_Prepare();
 
 	return retcode;
 }
@@ -1406,12 +1406,10 @@ Void jobTask(UArg arg0, UArg arg1)
                 CurrentJob = NULL;
                 if (IFS_Clearing_SuctionWaiting == true)
                     WHS_Set_IFS_Clearing_Suction(NUM_OF_MIDTANKS);
-                  //if (CurrentRequest!= NULL)
-                  //    job_request__free_unpacked(CurrentRequest,NULL);
-                  //CurrentRequest = NULL;
-                  SuspendLargeMessages = false;
-                  LOG_ERROR(4,"ResumeLargeMessages PrintingResultsOk");
-                  //DiagnosticsStart();
+                WHS_Set_JobEndSuction();
+                SuspendLargeMessages = false;
+                Report("Job Ended PrintingResultsOk",__FILE__,__LINE__, 4,RpMessage,0,0);
+                 //DiagnosticsStart();
                 //CleanState(CurrentJob);
                 break;
             case PrintingResultsFail:
@@ -1422,15 +1420,11 @@ Void jobTask(UArg arg0, UArg arg1)
                 SetMachineStatus(MACHINE_STATE__Ready);
                 resetIdleCounter();
                 CurrentJob = NULL;
-                  //if (CurrentRequest!= NULL)
-                  //    job_request__free_unpacked(CurrentRequest,NULL);
-                  //CurrentRequest = NULL;
-                  SuspendLargeMessages = false;
-                  if (IFS_Clearing_SuctionWaiting == true)
-                      WHS_Set_IFS_Clearing_Suction(NUM_OF_MIDTANKS);
-                  LOG_ERROR(3,"ResumeLargeMessages PrintingResultsFail");
-                  //DiagnosticsStart();
-
+                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);
                 break;