diff options
| author | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2020-10-18 19:29:34 +0300 |
|---|---|---|
| committer | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2020-10-18 19:29:34 +0300 |
| commit | 36ece3538d92bb3b5534fa72f7dbddca11e0b78c (patch) | |
| tree | 61cfd640d183e65355a90b346c24d6d2a8817bc3 /Software/Embedded_SW/Embedded/Modules/Thread | |
| parent | e02200b716c3c83bdd95e202c0d1bcae56882037 (diff) | |
| parent | 06281bbe29ec2f84a2cf3a838bd0316ec3e24749 (diff) | |
| download | Tango-36ece3538d92bb3b5534fa72f7dbddca11e0b78c.tar.gz Tango-36ece3538d92bb3b5534fa72f7dbddca11e0b78c.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 | 3 | ||||
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c | 4 |
2 files changed, 4 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 c37617037..0440d2241 100644 --- a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c +++ b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c @@ -120,7 +120,7 @@ uint32_t InternalWindingConfigMessage(JobSpool* request) InternalWinderCfg.SpoolBottomBackingRate = request->bottombackingrate; InternalWinderCfg.NumberOfRotationPerPassage = 3.1415926*3;//request->rotationsperpassage; - if (request->rotationsperpassage > 6.1) + if (request->rotationsperpassage > 5.1) InternalWinderCfg.NumberOfRotationPerPassage = request->rotationsperpassage; if (NumberOfRotationPerPassage > 1) { @@ -248,6 +248,7 @@ uint32_t Winder_PrepareStage2(uint32_t deviceID, uint32_t ReadValue) LOG_ERROR(deviceID,"Screw failed to reach the limit switch!!"); //returned with a timeout Winder_ScrewAtOffsetCallback(0,0); + PrepareReady(Module_Winder, ModuleFail); } else //short jog, etc { diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c index 25f322b2e..88241ecb1 100644 --- a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c +++ b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c @@ -167,7 +167,7 @@ void ThreadUpdateProcessLength (double length, void *Funcptr) CurrentProcessedLength = 0; ProcessedLengthFuncPtr = (ProcessedLengthFunc)Funcptr; } -char Lenstr[160]; +char Lenstr[190]; uint32_t ThreadLengthCBFunction(uint32_t IfIndex, uint32_t ReadValue) { uint32_t positionDiff = 0,prevprev; @@ -1306,7 +1306,7 @@ uint32_t ThreadPrepareState(void *JobDetails) if (PrepareWaitCount == 0) PrepareReady(Module_Thread,ModuleDone); //set 3 dancers to the profile positions - return OK; + return status; } uint32_t UpdatePidDuringRun(HardwarePidControl *request) { |