diff options
| author | Avi Levkovich <avi@twine-s.com> | 2018-08-05 11:20:36 +0300 |
|---|---|---|
| committer | Avi Levkovich <avi@twine-s.com> | 2018-08-05 11:20:36 +0300 |
| commit | 898213e7a5380bea18e5b45ef48b4d2d990b4832 (patch) | |
| tree | c0067b6a26ad3853681c9151e1fe9fc5ac5503c6 /Software/Embedded_SW/Embedded/Modules/Thread | |
| parent | 3f78570409abd79e46dcb0bfe8f8e2127cc7f67c (diff) | |
| parent | 9cdd202a86fec153935637fc43eef428fced2fd6 (diff) | |
| download | Tango-898213e7a5380bea18e5b45ef48b4d2d990b4832.tar.gz Tango-898213e7a5380bea18e5b45ef48b4d2d990b4832.zip | |
merge conflict
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules/Thread')
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c index 8d1ea20fa..75d54ef02 100644 --- a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c +++ b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c @@ -127,8 +127,8 @@ void ThreadUpdateProcessLength (double length, void *Funcptr) ProcessedLengthFuncPtr = (ProcessedLengthFunc)Funcptr; initialpos = 0xFFFF; } -double MotorSentData[102] = {0}; -uint32_t PosDif[102] = {0}; +double MotorSentData[100] = {0}; +uint32_t PosDif[100] = {0}; int MotorDataIndex = 0; @@ -181,7 +181,7 @@ uint32_t ThreadLengthCBFunction(uint32_t IfIndex, uint32_t ReadValue) //PosDif[MotorDataIndex] = positionDiff; MotorSentData[MotorDataIndex] = length; MotorDataIndex+=1; - if (MotorDataIndex >= 97) MotorDataIndex = 0; + if (MotorDataIndex == 99) MotorDataIndex = 0; static int pooler_counter = 0; pooler_counter++; TotalProcessedLength+= (length/100); |