diff options
| author | Shlomo Hecht <shlomo@twine-s.com> | 2018-10-09 16:42:08 +0300 |
|---|---|---|
| committer | Shlomo Hecht <shlomo@twine-s.com> | 2018-10-09 16:42:08 +0300 |
| commit | fc4f5af4307f2bc61adef181165cc611ee85aab8 (patch) | |
| tree | dffd43290c987905edcb911e34bd2d03b56f14d1 /Software/Embedded_SW/Embedded/Modules/Thread | |
| parent | 6235c6ff3684b836bf729bed6db04ddba597b7b0 (diff) | |
| parent | 0aadfb73cc2b2786514561c4578f4c2ba03bfcb6 (diff) | |
| download | Tango-fc4f5af4307f2bc61adef181165cc611ee85aab8.tar.gz Tango-fc4f5af4307f2bc61adef181165cc611ee85aab8.zip | |
merge conflict
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules/Thread')
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c | 4 |
1 files changed, 2 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 4b381e401..13dec3d40 100644 --- a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c +++ b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c @@ -211,7 +211,7 @@ uint32_t CalculateNumberOfSteps (uint32_t Counter, bool direction) uint32_t wtick=0,prevwtick = 0; uint32_t wgap[100]; uint32_t wgap_counter=0; -extern void ScrewReq(void); +//extern void ScrewReq(void); uint32_t ScrewDirectionChange(uint32_t deviceID, uint32_t BusyFlag) { uint32_t Steps; @@ -226,7 +226,7 @@ uint32_t ScrewDirectionChange(uint32_t deviceID, uint32_t BusyFlag) //ScrewCurrentDirection: false moves out, true moves home if (BusyFlag == NOTBUSY) { - ScrewReq(); + //ScrewReq(); if (wtick-prevwtick>10) { |