diff options
| author | Shlomo Hecht <shlomo@twine-s.com> | 2019-09-26 17:36:59 +0300 |
|---|---|---|
| committer | Shlomo Hecht <shlomo@twine-s.com> | 2019-09-26 17:36:59 +0300 |
| commit | e1b742ad33023fa79dd5e327e738ba67e2bef372 (patch) | |
| tree | dc2758456e4b01099bbc94aa4531ea0fa71c8fbf /Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c | |
| parent | 5e36d3c4ea6a4b70cdadcabd1f9f3733d479f23d (diff) | |
| download | Tango-e1b742ad33023fa79dd5e327e738ba67e2bef372.tar.gz Tango-e1b742ad33023fa79dd5e327e738ba67e2bef372.zip | |
fix winder average calc
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c')
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c index 46ecb1d46..32dea353a 100644 --- a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c +++ b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c @@ -329,16 +329,13 @@ uint32_t Screw100msecDirectionChange(uint32_t deviceID, uint32_t BusyFlag) if ((WinderRun < 30000)&&(WinderMotorSpeedRollOver == true)) { WinderRunSamples++; - if (WinderRunSamples>10) + WinderRunSum+=WinderRun; + WinderRunAverage = WinderRunSum/(WinderRunSamples); + if ((fabs(WinderRun-WinderRunAverage)>=30)||(WinderRunSamples%100 == 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); - } + 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 |