diff options
| author | Victoria Plitt <Victoria.Plitt@twine-s.com> | 2019-06-12 15:27:02 +0300 |
|---|---|---|
| committer | Victoria Plitt <Victoria.Plitt@twine-s.com> | 2019-06-12 15:27:02 +0300 |
| commit | 81063805332630c58ecd915a3d410ba28a0cd05e (patch) | |
| tree | a5c3c8173e6c799a2e2aa65925b5deac08b3314c /Software/Embedded_SW/Embedded/Modules/Thread | |
| parent | 0f77b7735d127d2bc29840296a462b58974b7fcf (diff) | |
| parent | 0cbf104a30c3f0c4e9dbbe9db47d6ad72df03655 (diff) | |
| download | Tango-81063805332630c58ecd915a3d410ba28a0cd05e.tar.gz Tango-81063805332630c58ecd915a3d410ba28a0cd05e.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules/Thread')
3 files changed, 6 insertions, 1 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c index 2bbc93523..297cea44b 100644 --- a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c +++ b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c @@ -441,6 +441,7 @@ uint32_t ScrewDTSControlId = 0xFF; uint32_t WinderDistanceToSpoolEnded(uint32_t deviceID, uint32_t ReadValue) { REPORT_MSG ((int)msec_millisecondCounter,"WinderDistanceToSpoolEnded called"); + return OK; } uint32_t ScrewDTSCallback(uint32_t deviceID, uint32_t BusyFlag) { @@ -459,7 +460,6 @@ uint32_t ScrewDTSCallback(uint32_t deviceID, uint32_t BusyFlag) MotorStop(HARDWARE_MOTOR_TYPE__MOTO_SCREW,Hard_Hiz); MotorMovetoLimitSwitch (HARDWARE_MOTOR_TYPE__MOTO_SCREW,MotorsCfg[HARDWARE_MOTOR_TYPE__MOTO_SCREW].directionthreadwize, ScrewSpeed, GPI_LS_SCREW_RIGHT, WinderDistanceToSpoolEnded,2000); - return OK; } uint32_t WinderDistanceToSpoolState(void ) diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_ex.h b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_ex.h index ead318758..9d773c1af 100644 --- a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_ex.h +++ b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_ex.h @@ -44,6 +44,7 @@ uint32_t LoadDancerConfigMessage(void); uint32_t Winder_Init(void); uint32_t Winder_Prepare(void); uint32_t Winder_Presegment(void *JobDetails, uint32_t SegmentId); +uint32_t WinderDistanceToSpoolState(void ); uint32_t Winder_End(void); typedef enum diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c index 4743008e5..b9a28fe57 100644 --- a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c +++ b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c @@ -939,6 +939,10 @@ char Endstr[150]; else LOG_ERROR (ControlIdtoMotorId[Motor_i],"Remove Control failed"); } + } + Task_sleep(10); + for ( Motor_i = 0;Motor_i <= WINDER_MOTOR;Motor_i++) + { MotorStop(ThreadMotorIdToMotorId[Motor_i],Hard_Hiz); } MotorStop(HARDWARE_MOTOR_TYPE__MOTO_RLOADING,Hard_Hiz); |