diff options
| author | Victoria Plitt <Victoria.Plitt@twine-s.com> | 2019-10-10 13:58:10 +0300 |
|---|---|---|
| committer | Victoria Plitt <Victoria.Plitt@twine-s.com> | 2019-10-10 13:58:10 +0300 |
| commit | 45b1cb49b93b81f3897bc88d8b4c32c974fd2cea (patch) | |
| tree | f458fb126ee34fc0a13b68832d620a63fa87a386 /Software/Embedded_SW/Embedded/Modules/Thread | |
| parent | f3feeac903885d92ea5828d68fc91654db62bea9 (diff) | |
| parent | 25590d26751fbc1d72575f35571f3f0a50da6113 (diff) | |
| download | Tango-45b1cb49b93b81f3897bc88d8b4c32c974fd2cea.tar.gz Tango-45b1cb49b93b81f3897bc88d8b4c32c974fd2cea.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 | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c index 50c1f6c33..fdd17fed4 100644 --- a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c +++ b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c @@ -331,13 +331,16 @@ uint32_t Screw100msecDirectionChange(uint32_t deviceID, uint32_t BusyFlag) if ((WinderRun < 30000)&&(WinderMotorSpeedRollOver == true)) { WinderRunSamples++; - WinderRunSum+=WinderRun; - WinderRunAverage = WinderRunSum/(WinderRunSamples); - if ((fabs(WinderRun-WinderRunAverage)>=30)||(WinderRunSamples%100 == 0)) + if (WinderRunSamples>10) { - usnprintf(ScrewStr, 150, "curr,sum,avg,samples {Winder Encoder:, %d, %d, %d, %d, %d}",WinderRun,(int)WinderRunSum,(int)WinderRunAverage,(int)WinderRunSamples, - (int)(100*WinderRun/ScrewNumberOfSteps)); - Report(ScrewStr,__FILE__,__LINE__,CalculationDirectionChangeCounter,RpWarning,ScrewLocationStart, 0); + WinderRunSum+=WinderRun; + WinderRunAverage = WinderRunSum/(WinderRunSamples); + if ((fabs(WinderRun-WinderRunAverage)>=30)||(WinderRunSamples%100 == 0)) + { + usnprintf(ScrewStr, 150, "curr,sum,avg,samples {Winder Encoder:, %d, %d, %d, %d, %d}",WinderRun,(int)WinderRunSum,(int)WinderRunAverage,(int)WinderRunSamples, + (int)(100*WinderRun/ScrewNumberOfSteps)); + Report(ScrewStr,__FILE__,__LINE__,CalculationDirectionChangeCounter,RpWarning,ScrewLocationStart, 0); + } } } else |