fix dyeing head lid opening / closing. cancel load end after a long press due to bug

4 files changed, 27 insertions, 4 deletions

diff --git a/Software/Embedded_SW/Embedded/Drivers/Motors/MotorActions.c b/Software/Embedded_SW/Embedded/Drivers/Motors/MotorActions.c
index 4802c720e..0e3b48cd9 100644
--- a/Software/Embedded_SW/Embedded/Drivers/Motors/MotorActions.c
+++ b/Software/Embedded_SW/Embedded/Drivers/Motors/MotorActions.c
@@ -476,8 +476,9 @@ uint32_t MotorMoveToLimitSwitchCallBackFunction(uint32_t IfIndex, uint32_t Limit
        {
            if (CloseMagnet == true)
            {
-               ActivateHeadMagnet();
+               DeActivateHeadMagnet(); // close the lid magnet
                CloseMagnet=false;
+               LOG_ERROR(CloseMagnet,"DeActivateHeadMagnet");
            }
        }
        //call the module callback
@@ -503,11 +504,12 @@ uint32_t MotorMovetoLimitSwitch (TimerMotors_t MotorId,bool direction, uint32_t
     //SetMotorSpeed (deviceId, parameter);
     if (MotorId == HARDWARE_MOTOR_TYPE__MOTO_DH_LID)
     {
-        DeActivateHeadMagnet();
+        ActivateHeadMagnet(); //open the lid magnet
         if (direction == MotorsCfg[HARDWARE_MOTOR_TYPE__MOTO_DH_LID].directionthreadwize)
         {
             CloseMagnet = true;
         }
+        LOG_ERROR(CloseMagnet,"ActivateHeadMagnet");
     }
     if (MotorId == HARDWARE_MOTOR_TYPE__MOTO_RDANCER)
     {
diff --git a/Software/Embedded_SW/Embedded/Modules/General/buttons.c b/Software/Embedded_SW/Embedded/Modules/General/buttons.c
index b62b0116e..3cee7594d 100644
--- a/Software/Embedded_SW/Embedded/Modules/General/buttons.c
+++ b/Software/Embedded_SW/Embedded/Modules/General/buttons.c
@@ -670,7 +670,8 @@ void test_avi()
 
 uint32_t LoadLongPress( button *pBtn)
 {
-    Thread_Load_End();
+    REPORT_MSG(parameter," ------------ load.state = LoadLongPress    ----------------- ");
+    //Thread_Load_End();
     return OK;
 }
 
diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c b/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c
index 1575123e4..c59a95180 100644
--- a/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c
+++ b/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c
@@ -307,7 +307,7 @@
         //Open Dyeing Head Cover And Dryer Lid
         //HARDWARE_MOTOR_TYPE__MOTO_DH_LID = 2,
         //HARDWARE_MOTOR_TYPE__MOTO_DRYER_LID = 4,
-        DeActivateHeadMagnet();
+        //DeActivateHeadMagnet();
         CallbackCounter++;
         MotorMovetoLimitSwitch (HARDWARE_MOTOR_TYPE__MOTO_DH_LID,1-MotorsCfg[HARDWARE_MOTOR_TYPE__MOTO_DH_LID].directionthreadwize, 200,  Motor_Id_to_LS_IdUp[HARDWARE_MOTOR_TYPE__MOTO_DH_LID], Thread_Load_HomingCallback,10000);
         CallbackCounter++;
diff --git a/Software/Stubs Collection/stubs/ThreadLoad.cs b/Software/Stubs Collection/stubs/ThreadLoad.cs
index 1b6437304..5a9666411 100644
--- a/Software/Stubs Collection/stubs/ThreadLoad.cs
+++ b/Software/Stubs Collection/stubs/ThreadLoad.cs
@@ -12,6 +12,26 @@ using Tango.Stubs;
 
 public void OnExecute(StubManager stubManager)
 {
+/*    typedef enum
+    {
+        0 THREAD_LOAD_INIT,
+        1 THREAD_LOAD_REDUCE_HEAT,                           //HEATERS OFF, DRYER BLOWER OFF, BLOWER LOW,
+        2 THREAD_LOAD_SET_LOAD_ARM_TO_START_POSITION,        //USE NOTATION HOW MANY ROTATIONS IN THE DRYER, OR CHECK AGAINST STOPPER. MOVE SLOWLY
+        3 THREAD_LOAD_CENTER_HEAD_ROCKERS,                   //puthead cleaning rockers to middle position
+        4 THREAD_LOAD_OPEN_COVERS,                           //OPEN DYEING HEAD COVER AND DRYER LID
+        5 THREAD_LOAD_LIFT_DANCERS,
+        6 THREAD_LOAD_LIFT_ROCKERS,                          //MACHINE IS READY. SEND MESSAGE, START TIMER TO CLOSE LIDS, WAIT FOR OPERATOR RESPONSE
+        7 THREAD_LOAD_INITIAL_TENSION,                       //CHECK SPOOL PRESENCERUN WINDER UNTIL BREAK SENSOR IS IDENTIFIEING MOVEMENT FOR A SECOND
+        8 THREAD_LOAD_CLOSE_ROCKERS,
+        9 THREAD_LOAD_CLOSE_DANCERS,                         //SEND DANCER MOTORS TO PRESET LOCATION, CHECK THAT THE DANCERS ARE ON THE THREAD
+        10 THREAD_LOAD_CLOSE_LIDS,
+        11 THREAD_LOAD_JOG_FEEDER_TO_MIDDLE_POINT,           //JOG THE FEEDER MOTOR UNTIL THE FEEDER DANCER IS AT MIDDLE POSITION
+        12 THREAD_LOAD_DRYER_LOADING,                        //START FEEDER PID, ROTATE LOADING ARM COUNTER THREAD DIRECTION X CIRCLES ACCORDING TO RML. FEEDER SPEED IS 40
+                                                             //KEEP NOTATION HOW MANY ROTATIONS IN THE DRYER
+        13 THREAD_LOAD_RESUME_HEATING,
+        14 THREAD_LOAD_JOG_THREAD,                           //JOG THREAD SHORTLY TO MAKE SURE SPOOL IS RUNNING. REPORT END OF LOADING
+        15 THREAD_LOAD_END
+    }THREAD_LOAD_STAGES_ENUM;*/
 
 StubHeatingTestRequest stubHeatingTestRequest = new StubHeatingTestRequest();
 stubHeatingTestRequest.DryerZone1Temp = 2;