aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c
diff options
context:
space:
mode:
authorVictoria Plitt <Victoria.Plitt@twine-s.com>2020-02-02 14:02:29 +0200
committerVictoria Plitt <Victoria.Plitt@twine-s.com>2020-02-02 14:02:29 +0200
commitc266100a10772e4c0f9df8e90cad60f3cef049bc (patch)
tree3cdf670cd14a248639c4c5903d85111afa32bd1e /Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c
parentcf81fa5d4c4927858f312cfa520f2acd58a2e2e3 (diff)
parentad179a57384aeb2e2f1e8913a393ed6b470a5328 (diff)
downloadTango-c266100a10772e4c0f9df8e90cad60f3cef049bc.tar.gz
Tango-c266100a10772e4c0f9df8e90cad60f3cef049bc.zip
Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c')
-rw-r--r--Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c b/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c
index b9bbf3aab..bac3ba1d0 100644
--- a/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c
+++ b/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c
@@ -401,8 +401,9 @@
CallbackCounter++;
//MotorMovetoLimitSwitch (HARDWARE_MOTOR_TYPE__MOTO_DRYER_LID,1-MotorsCfg[HARDWARE_MOTOR_TYPE__MOTO_DRYER_LID].directionthreadwize, 200, Motor_Id_to_LS_IdUp[HARDWARE_MOTOR_TYPE__MOTO_DRYER_LID], Thread_Load_HomingCallback,10000);
MotorGotoWithCallback(HARDWARE_MOTOR_TYPE__MOTO_DRYER_LID, 0, Motor_Id_to_LS_IdUp[HARDWARE_MOTOR_TYPE__MOTO_DRYER_LID], Thread_Load_HomingCallback,10000);
+#ifdef Use_Head_Card
HeadCard_Actuators_Control(ACTOT, LOW,true);
-
+#endif
return OK;
}
uint32_t Thread_Load_Lift_Dancers(void)
@@ -510,8 +511,9 @@
CallbackCounter++;
// MotorMovetoLimitSwitch (HARDWARE_MOTOR_TYPE__MOTO_DRYER_LID,MotorsCfg[HARDWARE_MOTOR_TYPE__MOTO_DRYER_LID].directionthreadwize, 200, Motor_Id_to_LS_IdDown[HARDWARE_MOTOR_TYPE__MOTO_DRYER_LID], Thread_Load_HomingCallback,10000);
MotorGotoWithCallback(HARDWARE_MOTOR_TYPE__MOTO_DRYER_LID, 2, Motor_Id_to_LS_IdDown[HARDWARE_MOTOR_TYPE__MOTO_DRYER_LID], Thread_Load_HomingCallback,10000);
+#ifdef Use_Head_Card
HeadCard_Actuators_Control(ACTOT, LOW,false);
-
+#endif
return OK;
}
uint32_t Thread_Load_Resume_Heating(void)