diff options
| author | Roy Ben-Shabat <Roy@Twine-s.com> | 2020-08-03 18:40:35 +0300 |
|---|---|---|
| committer | Roy Ben-Shabat <Roy@Twine-s.com> | 2020-08-03 18:40:35 +0300 |
| commit | c270e28a9d1e5eb961b3c392be44188aa15d98cc (patch) | |
| tree | b8233f6628deeb76f68bff23e6c451084413a375 /Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c | |
| parent | 85ad98fe3e35b3cf5546f1bcb9f864533daf235e (diff) | |
| parent | a5c6a3baaf597ef58369192716ffe02d3af87ac2 (diff) | |
| download | Tango-c270e28a9d1e5eb961b3c392be44188aa15d98cc.tar.gz Tango-c270e28a9d1e5eb961b3c392be44188aa15d98cc.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/_git/Tango
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c')
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c b/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c index 376b5f4a0..25d97e39a 100644 --- a/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c +++ b/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c @@ -164,7 +164,7 @@ { if (Is_PP_Machine()) - kval_upperValue = 40; + kval_upperValue = MotorsCfg[HARDWARE_MOTOR_TYPE__MOTO_RLOADING].kvalrun; else kval_upperValue = 70; @@ -497,6 +497,13 @@ //Close Dyeing Head Cover And Dryer Lid //HARDWARE_MOTOR_TYPE__MOTO_DH_LID = 2, //HARDWARE_MOTOR_TYPE__MOTO_DRYER_LID = 4, + if (Head_Type == HEAD_TYPE_FLAT) + { + Report("Thread_Load_Close_actuators",__FILE__,__LINE__,LOW,RpMessage,true,0); + Trigger_Head_Actuators_Control(ACTOT, LOW,false); + //Trigger_Head_Actuators_Control(ACTIN, LOW,false); + HeadCard_Actuators_Relocate(); + } if (Head_Type != HEAD_TYPE_ARC) { CallbackCounter++; @@ -514,13 +521,6 @@ direction = DRIER_LID_CLOSE; } MotorGotoWithCallback(HARDWARE_MOTOR_TYPE__MOTO_DRYER_LID, direction, Motor_Id_to_LS_IdDown[HARDWARE_MOTOR_TYPE__MOTO_DRYER_LID], Thread_Load_HomingCallback,10000); - if (Head_Type == HEAD_TYPE_FLAT) - { - Report("Thread_Load_Close_actuators",__FILE__,__LINE__,LOW,RpMessage,true,0); - Trigger_Head_Actuators_Control(ACTOT, LOW,false); - //Trigger_Head_Actuators_Control(ACTIN, LOW,false); - HeadCard_Actuators_Relocate(); - } return OK; } uint32_t Thread_Load_Resume_Heating(void) |