From bfc8d0cc2055b7fa5171aeace011435e23f71359 Mon Sep 17 00:00:00 2001
From: Shlomo Hecht <shlomo@twine-s.com>
Date: Tue, 9 Jun 2020 15:56:31 +0300
Subject: fixing some bugs in version 30

---
 .../Embedded/Modules/Thread/Thread_print.c            | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

(limited to 'Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c')

diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c
index 545fb40e6..efcbd5030 100644
--- a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c
+++ b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c
@@ -217,6 +217,7 @@ uint32_t ThreadLengthCBFunction(uint32_t IfIndex, uint32_t ReadValue)
     if (FeederSpeedIndex>=SPEED_STORE_SIZE)
     {
         FeederSpeedIndex = 0;
+        FeederSpeedAverage = 0;
         for (Speed_i = 0;Speed_i<SPEED_STORE_SIZE;Speed_i++)
             FeederSpeedAverage+=FeederSpeedStore[Speed_i];
         FeederSpeedAverage = FeederSpeedAverage/SPEED_STORE_SIZE;
@@ -316,6 +317,7 @@ uint32_t PoolerThreadLengthCBFunction(uint32_t IfIndex, uint32_t ReadValue)
         if (PullerSpeedIndex>=SPEED_STORE_SIZE)
         {
             PullerSpeedIndex = 0;
+            PullerSpeedAverage = 0;
             for (Speed_i = 0;Speed_i<SPEED_STORE_SIZE;Speed_i++)
                 PullerSpeedAverage+=PullerSpeedStore[Speed_i];
             PullerSpeedAverage = PullerSpeedAverage/SPEED_STORE_SIZE;
@@ -976,16 +978,19 @@ uint32_t ThreadPrepare_Tension (int DancerId, double tension)
         //return ERROR;
     }*/
 
-    if (FPGA_Read_limit_Switches(Motor_Id_to_LS_IdUp[HARDWARE_MOTOR_TYPE__MOTO_DH_LID]) == LIMIT)
+    if ((FPGA_Read_limit_Switches(Motor_Id_to_LS_IdUp[HARDWARE_MOTOR_TYPE__MOTO_DH_LID]) == LIMIT)&&(JoggingJobActive == false))
     {
-        ReportWithPackageFilter(ThreadFilter,"Dyeing head is wide open!!!",__FILE__,__LINE__,HARDWARE_MOTOR_TYPE__MOTO_DH_LID,RpFatalError,LIMIT,0);
-        JobEndReason = JOB_LIDS_OPEN;
-        PrepareReady(Module_Thread,ModuleFail);
-        return ERROR;
+        if(Head_Type != HEAD_TYPE_STAPLE_SPUN)
+        {
+            ReportWithPackageFilter(ThreadFilter,"Dyeing head is wide open!!!",__FILE__,__LINE__,HARDWARE_MOTOR_TYPE__MOTO_DH_LID,RpError,LIMIT,0);
+            JobEndReason = JOB_LIDS_OPEN;
+            PrepareReady(Module_Thread,ModuleFail);
+            return ERROR;
+        }
     }
-    if (FPGA_Read_limit_Switches(Motor_Id_to_LS_IdUp[HARDWARE_MOTOR_TYPE__MOTO_DRYER_LID]) == LIMIT)
+    if ((FPGA_Read_limit_Switches(Motor_Id_to_LS_IdUp[HARDWARE_MOTOR_TYPE__MOTO_DRYER_LID]) == LIMIT)&&(JoggingJobActive == false))
     {
-        ReportWithPackageFilter(ThreadFilter,"Dryer lid is wide open!!!",__FILE__,__LINE__,HARDWARE_MOTOR_TYPE__MOTO_DRYER_LID,RpFatalError,LIMIT,0);
+        ReportWithPackageFilter(ThreadFilter,"Dryer lid is wide open!!!",__FILE__,__LINE__,HARDWARE_MOTOR_TYPE__MOTO_DRYER_LID,RpError,LIMIT,0);
         JobEndReason = JOB_LIDS_OPEN;
         PrepareReady(Module_Thread,ModuleFail);
         return ERROR;
-- 
cgit v1.3.1