diff options
| author | Mirta <mirta@twine-s.com> | 2019-06-05 10:51:23 +0300 |
|---|---|---|
| committer | Mirta <mirta@twine-s.com> | 2019-06-05 10:51:23 +0300 |
| commit | 6effa882fd25b0b4f9d44d143a0e66f04ae075fc (patch) | |
| tree | e3c9e80815ac77436deefa52e5f06d3100a5f268 /Software/Embedded_SW/Embedded/Modules/Thread/Thread_init.c | |
| parent | f2b43686dc1dae61fbb053e31928712d9805194c (diff) | |
| parent | f9567b74a6fa6db7b4203dac0f79ebb7555f1512 (diff) | |
| download | Tango-6effa882fd25b0b4f9d44d143a0e66f04ae075fc.tar.gz Tango-6effa882fd25b0b4f9d44d143a0e66f04ae075fc.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules/Thread/Thread_init.c')
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/Thread/Thread_init.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_init.c b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_init.c index 265c751c6..b741f33f3 100644 --- a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_init.c +++ b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_init.c @@ -22,7 +22,7 @@ MotorDriverConfigStruc MotorsCfg[NUM_OF_MOTORS]={0}; HardwarePidControl MotorsControl[MAX_THREAD_MOTORS_NUM] = {0}; -int32_t MotorSpeedSamples[MAX_THREAD_MOTORS_NUM][MAX_CONTROL_SAMPLES] = {0}; +double MotorSpeedSamples[MAX_THREAD_MOTORS_NUM][MAX_CONTROL_SAMPLES] = {0}; int MotorSpeedSamplePointer[MAX_THREAD_MOTORS_NUM] = {0}; int32_t MotorSamples[MAX_THREAD_MOTORS_NUM][MAX_CONTROL_SAMPLES] = {0}; @@ -56,7 +56,7 @@ uint32_t MotorsConfigMessage(HardwareMotor * request) MotorsCfg[Motor_i].pulseperround = request->pulseperround; MotorsCfg[Motor_i].pulleyradius = request->pulleyradius; MotorsCfg[Motor_i].configword = request->configword; - if(MotorDriverResponse[Motor_i].DriverType == VoltageCombinedMotDriver) + if(MotorDriverResponse[Motor_i].DriverType == CombinrdMotDriver) { MotorsCfg[Motor_i].directionthreadwize = !(request->directionthreadwize);//PowerSTEP01 } |