diff options
| author | Victoria Plitt <Victoria.Plitt@twine-s.com> | 2020-04-27 18:35:37 +0200 |
|---|---|---|
| committer | Victoria Plitt <Victoria.Plitt@twine-s.com> | 2020-04-27 18:35:37 +0200 |
| commit | ef6dc2511590085b7aed10b0a37631ce93a3fa00 (patch) | |
| tree | b1683631405a870b194a4659bd56f8a39ce8bce7 /Software/Embedded_SW/Embedded/Modules/Thread | |
| parent | 737ff8b9f3cb72220bce50a44013a5aedd58efd1 (diff) | |
| parent | cacee21679368330dfbdbeb973fe9cec9e0aae8e (diff) | |
| download | Tango-ef6dc2511590085b7aed10b0a37631ce93a3fa00.tar.gz Tango-ef6dc2511590085b7aed10b0a37631ce93a3fa00.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules/Thread')
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c index 3b97e9eb7..9698f1ea3 100644 --- a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c +++ b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c @@ -59,7 +59,7 @@ uint32_t ScrewControlId = 0xFF; static bool KeepWindingCone = false; static uint32_t WindingConeLocation; -static uint32_t WinderBackToBaseTime = 800; +static uint32_t WinderBackToBaseTime = 1500; float NumberOfRotationPerPassage = 0.0; InternalWinderConfigStruc InternalWinderCfg = {0}; @@ -580,7 +580,8 @@ uint32_t Winder_End(void) 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,0); - MotorStop(HARDWARE_MOTOR_TYPE__MOTO_SCREW,Hard_Hiz); + //MotorStop(HARDWARE_MOTOR_TYPE__MOTO_SCREW,Hard_Hiz); + MotorAbortMovetoLimitSwitch(HARDWARE_MOTOR_TYPE__MOTO_SCREW); //bug #2709 return OK; } void Winder_ScrewHomeLimitSwitchInterrupt(void) |