diff options
| author | Shlomo Hecht <shlomo@twine-s.com> | 2018-05-03 10:32:13 +0300 |
|---|---|---|
| committer | Shlomo Hecht <shlomo@twine-s.com> | 2018-05-03 10:32:13 +0300 |
| commit | df70ac229e3cbbe1859627e6dcf738c22ee27217 (patch) | |
| tree | bb8b770b9772344713ef6d8e9e20faf17015bebf /Software/Embedded_SW/Embedded/Modules | |
| parent | ee697f7a3350d0a97bddee4de3a2ae4f9d285052 (diff) | |
| parent | 5ee4696c9a82fa23ec477c28b725af104abe90ef (diff) | |
| download | Tango-df70ac229e3cbbe1859627e6dcf738c22ee27217.tar.gz Tango-df70ac229e3cbbe1859627e6dcf738c22ee27217.zip | |
MERGE!
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules')
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_Motor.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_Motor.c b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_Motor.c index 6a174055b..ac1563cd5 100644 --- a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_Motor.c +++ b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_Motor.c @@ -82,8 +82,8 @@ void Stub_MotorInitRequest(MessageContainer* requestContainer) uint16_t ConfigWord; //set }MotorDriverConfigStruc; * */ -/* MotorsConfigMessage already calls setup!!!!!!!!! - * MotorDriverConfigStruc MotorDriverConfig; +// MotorsConfigMessage already calls setup!!!!!!!!! + MotorDriverConfigStruc MotorDriverConfig; MotorDriverConfig.ACC = request->acc; MotorDriverConfig.DEC = request->dec; MotorDriverConfig.MaxSpeed = request->max_speed; @@ -91,9 +91,9 @@ void Stub_MotorInitRequest(MessageContainer* requestContainer) MotorDriverConfig.HasConfigWord = false; if ( MotorDriverConfig.HasMicroStep) MotorDriverConfig.Microstep = request->micro_steps; - else - MotorDriverConfig.Microstep = 2; - setup(&MotorDriverConfig);*/ +// else +// MotorDriverConfig.Microstep = 2; + setup(&MotorDriverConfig); //setup(); |