aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Embedded_SW/Embedded/Modules/Thread
diff options
context:
space:
mode:
authorShlomo Hecht <shlomo@twine-s.com>2018-11-19 10:59:09 +0200
committerShlomo Hecht <shlomo@twine-s.com>2018-11-19 10:59:09 +0200
commitd18cf51e1cc71c60ae08ab687613f24ada99599d (patch)
tree62e16cead37f3fe6c7305a96e470ce1d17873573 /Software/Embedded_SW/Embedded/Modules/Thread
parent666567691d90e6b44e093f6a1c2c397d0c92780f (diff)
downloadTango-d18cf51e1cc71c60ae08ab687613f24ada99599d.tar.gz
Tango-d18cf51e1cc71c60ae08ab687613f24ada99599d.zip
Version 1.1.4.3: Cart goes to the edge at job end to enable spool change
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules/Thread')
-rw-r--r--Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c5
-rw-r--r--Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c2
2 files changed, 4 insertions, 3 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c
index 0c4a3b80a..fd577311e 100644
--- a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c
+++ b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c
@@ -309,7 +309,6 @@ uint32_t Winder_Presegment(void *JobDetails, uint32_t SegmentId)
}
uint32_t Winder_End(void)
{
- int pend;
//stop screw
ScrewNumberOfSteps = 0;
if (ScrewControlId != 0xFF)
@@ -319,8 +318,10 @@ uint32_t Winder_End(void)
}
CurrentControlledSpeed[SCREW_MOTOR] = 0;
ScrewsStopControlTimer();
+ //move the cart to the edge so the spool can be easily replaced
+ MotorMovetoLimitSwitch (HARDWARE_MOTOR_TYPE__MOTO_SCREW,MotorsCfg[HARDWARE_MOTOR_TYPE__MOTO_SCREW].directionthreadwize, 1000, GPI_LS_SCREW_RIGHT, NULL);
- return MotorStop (HARDWARE_MOTOR_TYPE__MOTO_SCREW,Hard_Hiz);
+ return OK;
}
void Winder_ScrewHomeLimitSwitchInterrupt(void)
{
diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c
index ea86c2892..5390ed0a7 100644
--- a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c
+++ b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c
@@ -775,7 +775,7 @@ char Endstr[150];
PoolerSpeedControlId = 0xFF;
}
- for ( Motor_i = 0;Motor_i < MAX_THREAD_MOTORS_NUM;Motor_i++)
+ for ( Motor_i = 0;Motor_i <= WINDER_MOTOR;Motor_i++)
{
if (ControlIdtoMotorId[Motor_i] != 0xFF)
{