diff options
| author | Shlomo Hecht <shlomo@twine-s.com> | 2018-10-09 09:20:03 +0300 |
|---|---|---|
| committer | Shlomo Hecht <shlomo@twine-s.com> | 2018-10-09 09:20:03 +0300 |
| commit | f46208a0f7ec63f5435842a8023a7d3e4e0730f7 (patch) | |
| tree | 9a590b7d65a412a4853bf7bab8998e0fde04d9a9 /Software/Embedded_SW/Embedded/Modules/Thread | |
| parent | c4ec57d2f3b89c42f15195dd84d68e21899ecdbd (diff) | |
| parent | b4683a45ea100b02851a7a194b2d548f771a6ab9 (diff) | |
| download | Tango-f46208a0f7ec63f5435842a8023a7d3e4e0730f7.tar.gz Tango-f46208a0f7ec63f5435842a8023a7d3e4e0730f7.zip | |
merge
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules/Thread')
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c | 4 | ||||
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c | 2 |
2 files changed, 3 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 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) { diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c index c7d5998c6..77e1939f9 100644 --- a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c +++ b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c @@ -401,7 +401,7 @@ uint32_t ThreadControlCBFunction(uint32_t IfIndex, uint32_t ReadValue) usnprintf(Message, 60, "Dancer %d limit %d value %d Zero %d",DancerId,DancerStopActivityLimit[index],avreageSampleValue,DancersCfg[DancerId].zeropoint); //JobAbortedByUser = true; ThreadControlActive = false; - JobEndReason = JOB_DANCER_FAIL; + JobEndReason = JOB_WINDER_DANCER_FAIL+index; SendJobProgress(0.0,0,false, Message); //EndState(CurrentJob,Message ); SegmentReady(Module_Thread,ModuleFail); |