diff options
| author | Avi Levkovich <avi@twine-s.com> | 2018-07-18 17:52:17 +0300 |
|---|---|---|
| committer | Avi Levkovich <avi@twine-s.com> | 2018-07-18 17:52:17 +0300 |
| commit | e0d570b8994b5d8ac3733075df9aa4d25e723131 (patch) | |
| tree | 261ebcd32f07ec43cf29030036c077258d8c03a7 /Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c | |
| parent | e0c19a620f338848b130ad6d2bd0ce8d5a52ca93 (diff) | |
| parent | df566bfe8b0f5ab0978dc3fa600052cd300fc577 (diff) | |
| download | Tango-e0d570b8994b5d8ac3733075df9aa4d25e723131.tar.gz Tango-e0d570b8994b5d8ac3733075df9aa4d25e723131.zip | |
merge build date
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c')
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c index a8ca46574..0ec10a072 100644 --- a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c +++ b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c @@ -183,7 +183,7 @@ uint32_t CalculateNumberOfSteps (uint32_t Counter, bool direction) } } - return CalculateNumberOfSteps; + return NumberOfSteps; } uint32_t ScrewDirectionChange(uint32_t deviceID, uint32_t BusyFlag) @@ -225,7 +225,7 @@ uint32_t WinderPresegmentReady(uint32_t deviceID, uint32_t ReadValue) uint32_t Winder_Presegment(void *JobDetails, uint32_t SegmentId) { - JobTicket* JobTicket = JobDetails; + //JobTicket* JobTicket = JobDetails; float screw_speed = 0; float RotationsPerSecond; @@ -280,18 +280,18 @@ uint32_t Winder_End(void) } void Winder_ScrewHomeLimitSwitchInterrupt(void) { - uint32_t status; + //uint32_t status; //handle glitch - send information to the next time that the motor stops if (Winder_ScrewHoming) { MotorStop(HARDWARE_MOTOR_TYPE__MOTO_SCREW,Hard_Hiz); //stop ASAP } - status = MotorSetDirection(HARDWARE_MOTOR_TYPE__MOTO_SCREW,MotorsCfg[HARDWARE_MOTOR_TYPE__MOTO_SCREW].directionthreadwize);//make sure to move the cart out + MotorSetDirection(HARDWARE_MOTOR_TYPE__MOTO_SCREW,MotorsCfg[HARDWARE_MOTOR_TYPE__MOTO_SCREW].directionthreadwize);//make sure to move the cart out } void Winder_ScrewOutLimitSwitchInterrupt(void) { //handle glitch - send information to the next time that the motor stops - uint32_t status; - status = MotorSetDirection(HARDWARE_MOTOR_TYPE__MOTO_SCREW,1-MotorsCfg[HARDWARE_MOTOR_TYPE__MOTO_SCREW].directionthreadwize);//make sure to move the cart out + //uint32_t status; + MotorSetDirection(HARDWARE_MOTOR_TYPE__MOTO_SCREW,1-MotorsCfg[HARDWARE_MOTOR_TYPE__MOTO_SCREW].directionthreadwize);//make sure to move the cart out } |
