diff options
| author | Avi Levkovich <avi@twine-s.com> | 2020-08-04 11:50:28 +0300 |
|---|---|---|
| committer | Avi Levkovich <avi@twine-s.com> | 2020-08-04 11:50:28 +0300 |
| commit | 527347ce120d98da31805688f06f763f18264171 (patch) | |
| tree | 7b80a8f7e3a4c1bf38536227b89df6802dd99110 /Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c | |
| parent | 5d44359e9e8df1991402d90266bf78c00963a3fb (diff) | |
| parent | aea9556ed31c0ad0161103ebc28af55c914ccc51 (diff) | |
| download | Tango-527347ce120d98da31805688f06f763f18264171.tar.gz Tango-527347ce120d98da31805688f06f763f18264171.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) |