diff options
| author | Roy Ben-Shabat <Roy@Twine-s.com> | 2018-06-18 16:52:16 +0300 |
|---|---|---|
| committer | Roy Ben-Shabat <Roy@Twine-s.com> | 2018-06-18 16:52:16 +0300 |
| commit | 2baa6b0a84284804c699c48b0bbbde85cd8d3975 (patch) | |
| tree | d2b789c59521c2a7e7fe331c9ebb9b58a1e9da68 /Software/Embedded_SW/Embedded/Modules/Thread | |
| parent | 054debe0f90ef6312f669963c2c62810fc766a8d (diff) | |
| parent | 0bd5bb08169bf0c72dc686b48b12499f61122958 (diff) | |
| download | Tango-2baa6b0a84284804c699c48b0bbbde85cd8d3975.tar.gz Tango-2baa6b0a84284804c699c48b0bbbde85cd8d3975.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/_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 e99d3df0b..3505ff3c6 100644 --- a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c +++ b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c @@ -111,7 +111,7 @@ uint32_t ScrewDirectionChange(uint32_t deviceID, uint32_t BusyFlag) if (BusyfirstCall) { BusyfirstCall = false; - return; + return OK; } //ScrewCurrentDirection: false moves out, true moves home if (BusyFlag == NOTBUSY) @@ -182,7 +182,8 @@ uint32_t Winder_End(void) { //stop screw ScrewNumberOfSteps = 0; - RemoveControlCallback(ScrewControlId,ScrewDirectionChange); + if (ScrewControlId != 0xFF) + RemoveControlCallback(ScrewControlId,ScrewDirectionChange); return MotorStop (HARDWARE_MOTOR_TYPE__MOTO_SCREW,Hard_Hiz); } void Winder_ScrewHomeLimitSwitchInterrupt(void) |