diff options
| author | Avi Levkovich <avi@twine-s.com> | 2020-04-23 18:24:10 +0300 |
|---|---|---|
| committer | Avi Levkovich <avi@twine-s.com> | 2020-04-23 18:24:10 +0300 |
| commit | 8438e5447b6bed6ed97f2e3fda6977ce4bf74d0c (patch) | |
| tree | 4efca7fbcdbb241ac3760e372dda75f99638dde0 /Software/Embedded_SW/Embedded/Modules/Thread | |
| parent | f48d6b6714c3115c3b2031e84b85a9fa7442c40f (diff) | |
| parent | 5627d88d6dec269a0b2dcc4538773fe6bbfc767d (diff) | |
| download | Tango-8438e5447b6bed6ed97f2e3fda6977ce4bf74d0c.tar.gz Tango-8438e5447b6bed6ed97f2e3fda6977ce4bf74d0c.zip | |
merge conflict
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules/Thread')
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c index a6a8314ab..3187e2568 100644 --- a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c +++ b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c @@ -184,9 +184,9 @@ uint32_t ThreadLengthCBFunction(uint32_t IfIndex, uint32_t ReadValue) } prevprev = PreviousPosition; if (Extended_Motor_Param[ThreadMotorIdToMotorId[index]] == true) //powerstep driver reverses the direction - positionDiff = Control_Delta_Position_Pass(PoolerPreviousPosition,PoolerCurrentPosition); + positionDiff = Control_Delta_Position_Pass(PreviousPosition,CurrentPosition); else - positionDiff = Control_Delta_Position_Pass(PoolerCurrentPosition,PoolerPreviousPosition); + positionDiff = Control_Delta_Position_Pass(CurrentPosition,PreviousPosition); //positionDiff = positionDiff / MotorsCfg[ThreadMotorIdToMotorId[index]].microstep; PreviousPosition = CurrentPosition; |