Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango

1 files changed, 21 insertions, 2 deletions

diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c
index a6cb25c45..8ecb3f404 100644
--- a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c
+++ b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c
@@ -141,6 +141,25 @@ uint32_t InternalWindingConfigMessage(JobSpool* request)
  * report ready to the job STM
  */
 int Screw_wait_counter;
+uint32_t Winder_Check_Cone(void)
+{
+    if (FPGA_Read_limit_Switches(GPI_SW_SPOOL_EXISTS)==LIMIT)
+    {
+        REPORT_MSG(LIMIT, "No cone in winder");
+        if (Is_PP_Machine())
+        {
+            if (IgnoreConeMissing == false)
+            {
+                //JobEndReason = JOB_THREAD_BREAK;
+                usnprintf(AlarmReasonStr, 100, "No cone in winder");
+                //PrepareReady(Module_Winder,ModuleFail);
+                AlarmHandlingSetAlarm(EVENT_TYPE__WINDER_CONE_DOES_NOT_EXIST,true);
+                return JOB_THREAD_BREAK;
+            }
+        }
+    }
+    return JOB_OK;
+}
 uint32_t Winder_Prepare(void *JobDetails)
 {
     JobTicket* JobTicket = JobDetails;
@@ -159,7 +178,7 @@ uint32_t Winder_Prepare(void *JobDetails)
      * report ready to the job STM
      */
 
-    if (FPGA_Read_limit_Switches(GPI_SW_SPOOL_EXISTS)==LIMIT)
+    /*if (FPGA_Read_limit_Switches(GPI_SW_SPOOL_EXISTS)==LIMIT)
     {
         REPORT_MSG(LIMIT, "No cone in winder");
         if (Is_PP_Machine())
@@ -173,7 +192,7 @@ uint32_t Winder_Prepare(void *JobDetails)
                 return ERROR;
             }
         }
-    }
+    }*/
 
 #ifdef READ_SCREW_ENCODER
     ScrewLocationRun[0] = 0;