diff options
| author | Victoria Plitt <Victoria.Plitt@twine-s.com> | 2019-05-27 16:46:30 +0300 |
|---|---|---|
| committer | Victoria Plitt <Victoria.Plitt@twine-s.com> | 2019-05-27 16:46:30 +0300 |
| commit | 8fefb650921f35b2b72ae5d49d7adefe30bd8a6c (patch) | |
| tree | 0a0525e9865473f8b571390f9e7531df9acb9af4 /Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c | |
| parent | ea1a4d93784b5110a59a3acbece767fd1e9078d8 (diff) | |
| parent | 56c56d443d7ebd5a9fbab098e8500390bfc0c7cc (diff) | |
| download | Tango-8fefb650921f35b2b72ae5d49d7adefe30bd8a6c.tar.gz Tango-8fefb650921f35b2b72ae5d49d7adefe30bd8a6c.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c')
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c b/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c index ab5075ab9..66d6baed5 100644 --- a/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c +++ b/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c @@ -594,7 +594,7 @@ uint32_t ThreadLoadControlCBFunction(uint32_t IfIndex, uint32_t ReadValue) MotorControlConfig[index].m_calculatedError = (-1*MotorControlConfig[index].m_calculatedError); }*/ calculated_speed = (1-MotorControlConfig[index].m_calculatedError)*OriginalMotorSpd_2PPS[index]; - if (abs(calculated_speed-CurrentControlledSpeed[index])> MotorControlConfig[index].m_ingnoreValue) + if (fabs(calculated_speed-CurrentControlledSpeed[index])> MotorControlConfig[index].m_ingnoreValue) { CurrentControlledSpeed[index] = calculated_speed; MotorSetSpeed(ThreadMotorIdToMotorId[index], calculated_speed); |